Merge pull request sakaiproject#636 from ottenhoff/SAK-29467

SAK-29467 SAM-2576 use joda-time 2.8
bot2012 · Jun 9, 2015 · 5d45c5b · 5d45c5b
2 parents aff7505 + da5b964
commit 5d45c5b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/calendar/calendar-summary-tool/tool/pom.xml b/calendar/calendar-summary-tool/tool/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.7</version>
+            <version>${joda.time.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/calendar/calendar-util/util/pom.xml b/calendar/calendar-util/util/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
         	<groupId>joda-time</groupId>
         	<artifactId>joda-time</artifactId>
-        	<version>2.7</version>
+        	<version>${joda.time.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/gradebook/grades-rest/pom.xml b/gradebook/grades-rest/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.7</version>
+            <version>${joda.time.version}</version>
         </dependency>
 
         <!-- Sakai uses apache commons logging -->

diff --git a/master/pom.xml b/master/pom.xml
@@ -117,6 +117,7 @@
     <sakairsf.components.version>11-SNAPSHOT</sakairsf.components.version>
     <sakairsf.version>11-SNAPSHOT</sakairsf.version>
     <generic-dao.version>0.9.18</generic-dao.version>
+    <joda.time.version>2.8</joda.time.version>
     <reflectutils.version>0.9.20</reflectutils.version>
     <!-- Sakai modules that are versioned separately -->
     <!-- lessonbuilder tool pom depends on msgcntr ver prop. Need to add a profile to the LB tool pom to mark change between 10.x master and earlier versions -->

diff --git a/reference/library/pom.xml b/reference/library/pom.xml
@@ -81,7 +81,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.7</version>
+						<version>${joda.time.version}</version>
 						<executions>
 							<execution>
 								<id>copy-images</id>

diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.7</version>
+			<version>${joda.time.version}</version>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/reset-pass/account-validator-tool/pom.xml b/reset-pass/account-validator-tool/pom.xml
@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.7</version>
+			<version>${joda.time.version}</version>
 		</dependency>
    </dependencies>
 

diff --git a/reset-pass/reset-pass/pom.xml b/reset-pass/reset-pass/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.7</version>
+        <version>${joda.time.version}</version>
     </dependency>
 <!-- RSF dependencies -->
     <dependency>

diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
@@ -275,7 +275,7 @@
         <dependency>
         	<groupId>joda-time</groupId>
         	<artifactId>joda-time</artifactId>
-        	<version>2.7</version>
+        	<version>${joda.time.version}</version>
         	<type>jar</type>
         	<scope>compile</scope>
         </dependency>

diff --git a/site/admin-perms-tool/pom.xml b/site/admin-perms-tool/pom.xml
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.7</version>
+      <version>${joda.time.version}</version>
     </dependency>
     <!-- JSP and standard tag libraries -->
     <dependency>