shade commons-codec also (issue #6)

Author: rbri

.classpath

@@ -3,30 +3,30 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.56.0/htmlunit-2.56.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.56.0/htmlunit-2.56.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.63.0-SNAPSHOT/htmlunit-2.63.0-SNAPSHOT.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.63.0-SNAPSHOT/htmlunit-2.63.0-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.2/xalan-2.7.2.jar" sourcepath="M2_REPO/xalan/xalan/2.7.2/xalan-2.7.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.2/serializer-2.7.2.jar" sourcepath="M2_REPO/xalan/serializer/2.7.2/serializer-2.7.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-text/1.9/commons-text-1.9.jar" sourcepath="M2_REPO/org/apache/commons/commons-text/1.9/commons-text-1.9-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5.13/httpmime-4.5.13.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.5.13/httpmime-4.5.13-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.56.0/htmlunit-core-js-2.56.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.56.0/htmlunit-core-js-2.56.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.56.0/neko-htmlunit-2.56.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.56.0/neko-htmlunit-2.56.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.63.0-SNAPSHOT/htmlunit-core-js-2.63.0-SNAPSHOT.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.63.0-SNAPSHOT/htmlunit-core-js-2.63.0-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.63.0-SNAPSHOT/neko-htmlunit-2.63.0-SNAPSHOT.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.63.0-SNAPSHOT/neko-htmlunit-2.63.0-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.12.2/xercesImpl-2.12.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-cssparser/1.11.0/htmlunit-cssparser-1.11.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-cssparser/1.11.0/htmlunit-cssparser-1.11.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-cssparser/1.12.0/htmlunit-cssparser-1.12.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-cssparser/1.12.0/htmlunit-cssparser-1.12.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-text/1.9/commons-text-1.9.jar" sourcepath="M2_REPO/org/apache/commons/commons-text/1.9/commons-text-1.9-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.10.0/commons-io-2.10.0.jar" sourcepath="M2_REPO/commons-io/commons-io/2.10.0/commons-io-2.10.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/3.8.0/commons-net-3.8.0.jar" sourcepath="M2_REPO/commons-net/commons-net/3.8.0/commons-net-3.8.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.15/commons-codec-1.15.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.15/commons-codec-1.15-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/brotli/dec/0.1.2/dec-0.1.2.jar" sourcepath="M2_REPO/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/shapesecurity/salvation2/3.0.0/salvation2-3.0.0.jar" sourcepath="M2_REPO/com/shapesecurity/salvation2/3.0.0/salvation2-3.0.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-client/9.4.44.v20210927/websocket-client-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-client/9.4.44.v20210927/websocket-client-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-client/9.4.44.v20210927/jetty-client-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-client/9.4.44.v20210927/jetty-client-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.4.44.v20210927/jetty-http-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.4.44.v20210927/jetty-http-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.4.44.v20210927/jetty-util-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.4.44.v20210927/jetty-util-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.4.44.v20210927/jetty-io-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.4.44.v20210927/jetty-io-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-common/9.4.44.v20210927/websocket-common-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-common/9.4.44.v20210927/websocket-common-9.4.44.v20210927-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-api/9.4.44.v20210927/websocket-api-9.4.44.v20210927.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-api/9.4.44.v20210927/websocket-api-9.4.44.v20210927-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-client/9.4.46.v20220331/websocket-client-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-client/9.4.46.v20220331/websocket-client-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-client/9.4.46.v20220331/jetty-client-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-client/9.4.46.v20220331/jetty-client-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.4.46.v20220331/jetty-http-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.4.46.v20220331/jetty-http-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.4.46.v20220331/jetty-util-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.4.46.v20220331/jetty-util-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.4.46.v20220331/jetty-io-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.4.46.v20220331/jetty-io-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-common/9.4.46.v20220331/websocket-common-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-common/9.4.46.v20220331/websocket-common-9.4.46.v20220331-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-api/9.4.46.v20220331/websocket-api-9.4.46.v20220331.jar" sourcepath="M2_REPO/org/eclipse/jetty/websocket/websocket-api/9.4.46.v20220331/websocket-api-9.4.46.v20220331-sources.jar"/>
 </classpath>

README.md

@@ -47,6 +47,7 @@ Or to be more detailed, this packages includes
 * httpcomponents/httpmime:jar (shaded)
 * httpcomponents/httpclient (shaded)
 * httpcomponents/httpcore (shaded)
+* commons-codec/commons-codec (shaded)
 
 All the other dependencies are still dependencies of this package (see the pom.xml for more).
 
@@ -66,7 +67,7 @@ If you use maven please add:
     <dependency>
         <groupId>net.sourceforge.htmlunit</groupId>
         <artifactId>htmlunit-android</artifactId>
-        <version>2.60.0-SNAPSHOT</version>
+        <version>2.63.0-SNAPSHOT</version>
     </dependency>
 
 You have to add the sonatype snapshot repository to your pom distributionManagement section also:

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>net.sourceforge.htmlunit</groupId>
   <artifactId>htmlunit-android</artifactId>
   <name>HtmlUnitAndroid</name>
-  <version>2.62.0-SNAPSHOT</version>
+  <version>2.63.0-SNAPSHOT</version>
   <description>A headless browser intended for use in testing web-based applications packaged for android.</description>
   <url>http://htmlunit.sourceforge.net</url>
   <issueManagement>
@@ -93,6 +93,10 @@
                   <pattern>org.apache.http</pattern>
                   <shadedPattern>org.htmlunit.org.apache.http</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.codec</pattern>
+                  <shadedPattern>org.htmlunit.org.apache.commons.codec</shadedPattern>
+                </relocation>
               </relocations>
               <transformers>
                 <transformer />
@@ -231,12 +235,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-client</artifactId>
-      <version>9.4.46.v20220331</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
   <distributionManagement>
     <repository>
@@ -255,7 +253,7 @@
   </distributionManagement>
   <properties>
     <jetty.version>9.4.46.v20220331</jetty.version>
-    <htmlunit.version>2.62.0</htmlunit.version>
+    <htmlunit.version>2.63.0-SNAPSHOT</htmlunit.version>
     <maven.compiler.source>8</maven.compiler.source>
     <additionalparam>-Xdoclint:none</additionalparam>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.sourceforge.htmlunit</groupId>
     <artifactId>htmlunit-android</artifactId>
-    <version>2.62.0-SNAPSHOT</version>
+    <version>2.63.0-SNAPSHOT</version>
 
     <name>HtmlUnitAndroid</name>
     <organization>
@@ -26,7 +26,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <htmlunit.version>2.62.0</htmlunit.version>
+        <htmlunit.version>2.63.0-SNAPSHOT</htmlunit.version>
         <jetty.version>9.4.46.v20220331</jetty.version>
     </properties>
 
@@ -88,6 +88,10 @@
                                     <pattern>org.apache.http</pattern>
                                     <shadedPattern>org.htmlunit.org.apache.http</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.codec</pattern>
+                                    <shadedPattern>org.htmlunit.org.apache.commons.codec</shadedPattern>
+                                </relocation>
                             </relocations>
 
                             <transformers>
@@ -240,11 +244,6 @@
             <artifactId>commons-net</artifactId>
             <version>3.8.0</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-        </dependency>
         <dependency>
             <groupId>org.brotli</groupId>
             <artifactId>dec</artifactId>