Make GWT depend on json-1.5.jar that contains 1.5 compatible bytecode instead
of json.jar that only contains 1.6 compatible bytecode.
Patch by: amitmanjhi
Review by: fabbott, rjrjr
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8325 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/bikeshed/build.xml b/bikeshed/build.xml
index 089532d..f0e5521 100644
--- a/bikeshed/build.xml
+++ b/bikeshed/build.xml
@@ -52,8 +52,6 @@
<mkdir dir="${javac.out}" />
<gwt.javac excludes="**/sample/**">
<classpath>
- <pathelement location="${gwt.tools.redist}/json/r2_20080312/json.jar" />
- <pathelement location="${gwt.root}/bikeshed/war/temp-libs/validation-api-1.0.0.GA.jar" />
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.user.jar}" />
</classpath>
diff --git a/dev/build.xml b/dev/build.xml
index bcd6228..77a71d7 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -38,7 +38,7 @@
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
<pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
- <pathelement location="${gwt.tools}/redist/json/r2_20080312/json.jar" />
+ <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />
<pathelement location="${alldeps.jar}" />
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index c7cc918..3e36c26 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -33,7 +33,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-7.0.2.v20100331/jetty-7.0.2.v20100331.jar" sourcepath="GWT_TOOLS/lib/jetty/jetty-7.0.2.v20100331/jetty-7.0.2.v20100331-src.zip"/>
- <classpathentry kind="var" path="GWT_TOOLS/redist/json/r2_20080312/json.jar" sourcepath="/GWT_TOOLS/redist/json/r2_20080312/json-src.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/redist/json/r2_20080312/json-1.5.jar" sourcepath="/GWT_TOOLS/redist/json/r2_20080312/json-src.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA.jar" sourcepath="/GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/user/build.xml b/user/build.xml
index b9dc219..19366da 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -73,7 +73,7 @@
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
<pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
- <pathelement location="${gwt.tools}/redist/json/r2_20080312/json.jar" />
+ <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<pathelement location="${gwt.dev.jar}" />
</classpath>
@@ -106,7 +106,7 @@
<pathelement location="${javac.out}" />
<pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.tools}/redist/json/r2_20080312/json.jar" />
+ <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<path refid="test.extraclasspath" />
</classpath>
