[gwt-contrib] Update Maven deployment re. JSON dependency. (issue1737805)

[t . broyer]

Reviewers: cromwellian, skybrian,

Message:
This is a follow up to http://gwt-code-reviews.appspot.com/1732804/
It unbundles org/json from gwt-dev before deploying to Maven Central,
and adds it as a dependency instead (as we did for requestfactory-*).

org.json is also added as a dependency to gwt-user as it's needed in
DevMode for AutoBeans. This isn't technically necessary since it already
is a dependency of gwt-dev so it'll be in the classpath when running
DevMode, but because gwt-user has no declared dependency on gwt-dev
(this might be a mistake, or not), I'd rather add it here anyway. It's
totally harmless anyway.

Description:
Update Maven deployment re. JSON dependency.


Please review this at https://gwt-code-reviews.appspot.com/1737805/

Affected files:
  M maven/lib-gwt.sh
  M maven/poms/gwt/gwt-dev/pom-template.xml
  M maven/poms/gwt/gwt-user/pom-template.xml


Index: maven/lib-gwt.sh
diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh
index  
c8f54124c7beaa8da412cf00ffdfbf6464dc5e03..cdccbb3b0d76096d84fc973032314c0d576df578  
100644
--- a/maven/lib-gwt.sh
+++ b/maven/lib-gwt.sh
@@ -93,6 +93,10 @@ function maven-gwt() {
     zip -d $GWT_EXTRACT_DIR/requestfactory-${i}.jar org/json/*
   done

+  # Remove bundled org/json classes from gwt-dev
+  echo "Removing org.json classes from gwt-dev"
+  zip -d $GWT_EXTRACT_DIR/gwt-dev.jar org/json/*
+
   for i in dev user servlet codeserver
   do
     CUR_FILE=`ls $GWT_EXTRACT_DIR/gwt-${i}.jar`
Index: maven/poms/gwt/gwt-dev/pom-template.xml
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml  
b/maven/poms/gwt/gwt-dev/pom-template.xml
index  
b58d3cd6356ce21b241d7610edf38ab185497a8b..38955ff61e69d28b281f1b162e5556bbd30f6918  
100644
--- a/maven/poms/gwt/gwt-dev/pom-template.xml
+++ b/maven/poms/gwt/gwt-dev/pom-template.xml
@@ -12,4 +12,12 @@
     <artifactId>gwt-dev</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20090211</version>
+        </dependency>
+    </dependencies>
 </project>
Index: maven/poms/gwt/gwt-user/pom-template.xml
diff --git a/maven/poms/gwt/gwt-user/pom-template.xml  
b/maven/poms/gwt/gwt-user/pom-template.xml
index  
83167d23209f20a0ea40e8d16a70369f2fd0dcf4..2e69c5d42265161ef0bd060476edebd3ebe10725  
100644
--- a/maven/poms/gwt/gwt-user/pom-template.xml
+++ b/maven/poms/gwt/gwt-user/pom-template.xml
@@ -24,5 +24,10 @@
             <version>1.0.0.GA</version>
             <classifier>sources</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20090211</version>
+        </dependency>
     </dependencies>
 </project>


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors