Merge pull request sakaiproject#1732 from axxter99/SAK-30342

SAK- 30342 Joda 2.9.2
EnterStudios · Feb 16, 2016 · a350711 · a350711
2 parents 3015b84 + 7a97805
commit a350711
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/master/pom.xml b/master/pom.xml
@@ -123,7 +123,7 @@
     <sakai.slf4j.version>1.7.5</sakai.slf4j.version>
     <sakai.poi.version>3.13</sakai.poi.version>
     <sakai.okiosid.version>2.0</sakai.okiosid.version>
-    <joda.time.version>2.9</joda.time.version>
+    <joda.time.version>2.9.2</joda.time.version>
     <sakai.genericdao.version>0.10.0</sakai.genericdao.version>
     <reflectutils.version>0.9.20</reflectutils.version>
     <!-- Sakai modules that are versioned separately -->

diff --git a/oauth/pom.xml b/oauth/pom.xml
@@ -71,7 +71,6 @@
 
         <!-- dependencies versions -->
         <oauth.version>20100527</oauth.version>
-        <joda-time.version>2.2</joda-time.version>
         <commons-logging.version>1.1.1</commons-logging.version>
         <servlet-api.version>2.5</servlet-api.version>
         <wicket.version>1.4.23</wicket.version>
@@ -123,7 +122,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>${joda-time.version}</version>
+                <version>${joda.time.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.oauth.core</groupId>