From 025a5abe6076ebe2463f293f8b62e2a6913df1a9 Mon Sep 17 00:00:00 2001
From: Colin Alworth <colin@vertispan.com>
Date: Sun, 7 Jun 2026 15:19:15 -0500
Subject: [PATCH 1/2] Remove commons-collections from classpath

Only seems to be used for testing GWT's own collection types.
---
 dev/build.xml                           | 6 +-----
 maven/poms/gwt/gwt-dev/pom-template.xml | 4 ----
 maven/poms/gwt/pom-template.xml         | 5 -----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dev/build.xml b/dev/build.xml
index 39da43bbe1..f773e00bc1 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -29,6 +29,7 @@
         <pathelement location="${javac.out}"/>
         <pathelement location="${alldeps.jar}"/>
         <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+        <pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
       </classpath>
     </gwt.javac>
     <gwt.javac srcdir="" destdir="${javac.junit.out}"
@@ -83,7 +84,6 @@
           <include name="tomcat/tomcat-servlet-api-8.0.28.jar"/>
           <include name="tomcat/tomcat-websocket-api-8.0.28.jar"/>
           <include name="tomcat/tomcat-annotations-api-8.0.28.jar"/>
-          <include name="apache/commons/commons-collections-3.2.2.jar"/>
           <!-- htmlunit dependencies not already included: BEGIN -->
           <include name="apache/http/httpclient-4.5.13.jar"/>
           <include name="apache/http/httpcore-4.4.13.jar"/>
@@ -152,8 +152,6 @@
           <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-servlet-api-8.0.28.jar"/>
           <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-websocket-api-8.0.28.jar"/>
           <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-annotations-api-8.0.28.jar"/>
-          <zipfileset
-              src="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
           <!-- htmlunit dependencies not already included: BEGIN -->
           <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.5.13.jar"/>
           <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.4.13.jar"/>
@@ -220,8 +218,6 @@
         <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-9.6.jar"/>
         <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-commons-9.6.jar"/>
         <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-util-9.6.jar"/>
-        <pathelement
-            location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
         <fileset dir="${gwt.tools.lib}/eclipse/3.33.0">
           <include name="**/*.jar"/>
         </fileset>
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
index 34722fe04d..c211fecb6e 100644
--- a/maven/poms/gwt/gwt-dev/pom-template.xml
+++ b/maven/poms/gwt/gwt-dev/pom-template.xml
@@ -45,10 +45,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index fc88ac5033..663ea77227 100644
--- a/maven/poms/gwt/pom-template.xml
+++ b/maven/poms/gwt/pom-template.xml
@@ -137,11 +137,6 @@
                 <artifactId>colt</artifactId>
                 <version>1.2.0</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>

From 51d842f1c157dd8199f6b009c74a91713d0770fc Mon Sep 17 00:00:00 2001
From: Colin Alworth <colin@vertispan.com>
Date: Sun, 7 Jun 2026 18:34:51 -0500
Subject: [PATCH 2/2] Restore common-collections for test runtime classpath

---
 dev/build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/build.xml b/dev/build.xml
index f773e00bc1..17acfe9767 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -322,10 +322,11 @@
         <pathelement location="${gwt.root}/user/super/"/>
         <!-- CompilerTest compiles the hello sample. -->
         <pathelement location="${gwt.root}/samples/hello/src/main/java"/>
-        <!-- CompilerTest needs the dependecies to compile a project that uses UiBinder. -->
-	<pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+        <!-- CompilerTest needs the dependencies to compile a project that uses UiBinder. -->
+        <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/gss/2015-11-04/closure-stylesheets-library-20151104-rebased.jar"/>
-       <pathelement  location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/>
+        <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/>
+        <pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
       </extraclasspaths>
     </gwt.junit>
   </target>