update joda-time from 2.3 to 2.9.1

wocommunity · Dec 12, 2015 · aea41f5 · aea41f5
1 parent 3b5c2a0
commit aea41f5
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 3 deletions.
diff --git a/Build/build/build.xml b/Build/build/build.xml
@@ -30,7 +30,7 @@
     <property name="framework.erjars.httpcore" value="httpcore-4.3.3.jar" />
     <property name="framework.erjars.httpmime" value="httpmime-4.3.6.jar" />
     <property name="framework.erjars.icu4j" value="icu4j-3_8_1.jar" />
-    <property name="framework.erjars.joda" value="joda-time-2.3.jar" />
+    <property name="framework.erjars.joda" value="joda-time-2.9.1.jar" />
     <property name="framework.erjars.junit" value="junit-4.10.jar" />
     <property name="framework.erjars.log4j" value="log4j-1.2.17.jar" />
     <property name="framework.erjars.ognl" value="ognl-2.6.7.jar" />

diff --git a/Frameworks/Core/ERJars/.classpath b/Frameworks/Core/ERJars/.classpath
@@ -3,7 +3,11 @@
 	<classpathentry exported="true" kind="lib" path="Libraries/ERFoundation.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/ERWebObjects.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/commons-lang-2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/joda-time-2.3.jar" sourcepath="LibrarySources/joda-time-2.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="Libraries/joda-time-2.9.1.jar" sourcepath="LibrarySources/joda-time-2.9.1-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/joda-time-2.9.1-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="Libraries/junit-4.10.jar" sourcepath="LibrarySources/junit-4.10-src.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/icu4j-3_8_1.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/ognl-2.6.7.jar"/>

diff --git a/Frameworks/Core/ERJars/Libraries/joda-time-2.3.jar b/Frameworks/Core/ERJars/Libraries/joda-time-2.3.jar
diff --git a/Frameworks/Core/ERJars/Libraries/joda-time-2.9.1.jar b/Frameworks/Core/ERJars/Libraries/joda-time-2.9.1.jar
diff --git a/Frameworks/Core/ERJars/LibraryJavadocs/joda-time-2.9.1-javadoc.jar b/Frameworks/Core/ERJars/LibraryJavadocs/joda-time-2.9.1-javadoc.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/joda-time-2.3-sources.jar b/Frameworks/Core/ERJars/LibrarySources/joda-time-2.3-sources.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/joda-time-2.9.1-sources.jar b/Frameworks/Core/ERJars/LibrarySources/joda-time-2.9.1-sources.jar
diff --git a/pom.xml b/pom.xml
@@ -725,7 +725,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.3</version>
+                <version>2.9.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>