Revert "Unbundle more dependencies when deploying to Maven"
This reverts commit b4b8e7c56210bf49e676f713c4f999a4fd8e0b0d.
Change-Id: I6d22863fde51a78800707b2bd3967ef0a2f13c23
diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh
index e2b1c63..8e9e00c 100644
--- a/maven/lib-gwt.sh
+++ b/maven/lib-gwt.sh
@@ -101,9 +101,6 @@
zip -d $GWT_EXTRACT_DIR/gwt-dev.jar \
"META-INF/services/javax.servlet.*" "META-INF/services/javax.websocket.*" "META-INF/services/org.eclipse.jetty.*" "META-INF/services/org.apache.juli.*" \
"org/eclipse/jetty/*" "javax/servlet/*" "javax/el/*" "org/apache/jasper/*" "org/apache/el/*" "org/apache/juli/*" "org/apache/tomcat/*"
- echo "Removing more dependencies from gwt-dev"
- zip -d $GWT_EXTRACT_DIR/gwt-dev.jar \
- "cern/*" "org/apache/tools/*" "org/apache/commons/*" "com/ibm/icu/*"
# Silently skip Elemental if it doesn't exist
gwtLibs='dev user servlet codeserver'
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
index 8c991ac..d096b7e 100644
--- a/maven/poms/gwt/gwt-dev/pom-template.xml
+++ b/maven/poms/gwt/gwt-dev/pom-template.xml
@@ -31,32 +31,6 @@
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
- <groupId>colt</groupId>
- <artifactId>colt</artifactId>
- <exclusions>
- <exclusion>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
</dependency>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index 5460d0e..cb06038 100644
--- a/maven/poms/gwt/pom-template.xml
+++ b/maven/poms/gwt/pom-template.xml
@@ -88,41 +88,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>colt</groupId>
- <artifactId>colt</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>50.1.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.19</version>
- </dependency>
- <dependency>
- <groupId>org.w3c.css</groupId>
- <artifactId>sac</artifactId>
- <version>1.3</version>
- </dependency>
<!-- Dependency of HtmlUnit -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
