Update Maven deployment re. JSON dependency.
Contributed by tbroyer.
Review at https://gwt-code-reviews.appspot.com/1737805/
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11060 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh
index c8f5412..cdccbb3 100644
--- a/maven/lib-gwt.sh
+++ b/maven/lib-gwt.sh
@@ -93,6 +93,10 @@
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`
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
index b58d3cd..38955ff 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>
diff --git a/maven/poms/gwt/gwt-user/pom-template.xml b/maven/poms/gwt/gwt-user/pom-template.xml
index 83167d2..2e69c5d 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>
