update json library version to the latest

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@691647 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 6bb9d0b..071456f 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -21,7 +21,7 @@
        <classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar"/>
-        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20070829/json.jar"/>
+        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
        <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
        <classpathentry kind="output" path=".settings/output"/>

diff --git a/build.properties.default b/build.properties.default
index 5b0f63f..8a7c9ee 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -100,8 +100,8 @@ commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.
 commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
 
 # ----- JSON Libraries, 
-json-lib.home=${base.path}/json-20070829
-json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20070829/json-20070829.jar
+json-lib.home=${base.path}/json-20080701
+json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20080701/json-20080701.jar
 json-lib.jar=json.jar
 
 # ----- Dojo Toolkit 

diff --git a/build.xml b/build.xml
index 92e3578..a804f0b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -663,6 +663,14 @@
       <param name="destfile" value="${nsis.exe}"/>
          <param name="destdir" value="${nsis.home}/.."/>
     </antcall>
+       
+       <!-- Download json libraries -->
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${json-lib.lib}"/>
+      <param name="destfile" value="${json-lib.home}/${json-lib.jar}"/>
+      <param name="destdir" value="${json-lib.home}"/>
+    </antcall>
+
   </target>
 
   <target name="build-tomcat-dbcp" unless="jdk16.present">