update to htmlunit 3.1.0

Author: rbri

.classpath

@@ -3,19 +3,17 @@
   <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.65.1/htmlunit-2.65.1.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.65.1/htmlunit-2.65.1-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/org/htmlunit/htmlunit/3.1.0/htmlunit-3.1.0.jar" sourcepath="M2_REPO/org/htmlunit/htmlunit/3.1.0/htmlunit-3.1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5.14/httpmime-4.5.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16-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/net/sourceforge/htmlunit/htmlunit-core-js/2.65.0/htmlunit-core-js-2.65.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.65.0/htmlunit-core-js-2.65.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.65.0/neko-htmlunit-2.65.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/neko-htmlunit/2.65.0/neko-htmlunit-2.65.0-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.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/net/sourceforge/htmlunit/htmlunit-xpath/2.65.0/htmlunit-xpath-2.65.0.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-xpath/2.65.0/htmlunit-xpath-2.65.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/htmlunit/htmlunit-core-js/3.1.0/htmlunit-core-js-3.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/htmlunit/neko-htmlunit/3.1.0/neko-htmlunit-3.1.0.jar" sourcepath="M2_REPO/org/htmlunit/neko-htmlunit/3.1.0/neko-htmlunit-3.1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/htmlunit/htmlunit-cssparser/3.1.0/htmlunit-cssparser-3.1.0.jar" sourcepath="M2_REPO/org/htmlunit/htmlunit-cssparser/3.1.0/htmlunit-cssparser-3.1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/htmlunit/htmlunit-xpath/3.1.0/htmlunit-xpath-3.1.0.jar" sourcepath="M2_REPO/org/htmlunit/htmlunit-xpath/3.1.0/htmlunit-xpath-3.1.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/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.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"/>

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>htmlunit-android</name>
+  <name>htmlunit3-android</name>
   <comment>A headless browser intended for use in testing web-based applications packaged for android. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects/>
   <buildSpec>

README.md

@@ -1,14 +1,14 @@
 # HtmlUnit Android package
 
-Version 2.67.0 / November 20, 2022
+Version 3.1.0 / April 17, 2023
 
 :heart: [Sponsor](https://github.com/sponsors/rbri)
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.htmlunit/htmlunit-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.htmlunit/htmlunit-android)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.htmlunit/htmlunit3-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.htmlunit/htmlunit3-android)
 
 **Homepage**
 
-[htmlunit.sourceforge.io](https://github.com/HtmlUnit/htmlunit-android)
+[https://github.com/HtmlUnit/htmlunit-android](https://github.com/HtmlUnit/htmlunit-android)
 
 **News**
 
@@ -22,9 +22,9 @@ Add to your `pom.xml`:
 
 ```xml
 <dependency>
-    <groupId>net.sourceforge.htmlunit</groupId>
-    <artifactId>htmlunit-android</artifactId>
-    <version>2.67.0</version>
+    <groupId>org.htmlunit</groupId>
+    <artifactId>htmlunit3-android</artifactId>
+    <version>3.1.0</version>
 </dependency>
 ```
 
@@ -33,7 +33,7 @@ Add to your `pom.xml`:
 Add to your `build.gradle`:
 
 ```groovy
-implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit-android', version: '2.67.0'
+implementation group: 'org.htmlunit', name: 'htmlunit3-android', version: '3.1.0'
 ```
 
 Overview
@@ -44,22 +44,21 @@ But Android is a bit different because the Android SDK already includes some (ol
 HtmlUnit uses a more recent version HttpClient; and this is where the problem begins.
 
 To solve the conflicts, this package uses [shading](https://maven.apache.org/plugins/maven-shade-plugin/) and
-includes the HttpClient in the jar file itself but with a modified package name. There are no changes done
-to the implementation.
+includes the HttpClient and apache commons-codec in the jar file itself but with a modified package name.
+There are no changes done to the implementation.
 
 Or to be more detailed, this packages includes
-* HtmlUnit itself
-* htmlunit-core-js
-* htmlunit-cssparser
+* HtmlUnit itself (org.htmlunit, netscape.javascript)
+* htmlunit-core-js (org.htmlunit.corejs)
+* htmlunit-cssparser (org.htmlunit.cssparser)
+* htmlunit-xpath (org.htmlunit.xpath)
+* neko-htmlunit (org.htmlunit.cyberneko)
 
-* neko-htmlunit
-* xml-apis/xml-apis:jar
-* xerces/xercesImpl
+* httpcomponents/httpmime:jar (shaded org.apache.http -> org.htmlunit.org.apache.http)
+* httpcomponents/httpclient (shaded org.apache.http -> org.htmlunit.org.apache.http)
+* httpcomponents/httpcore (shaded org.apache.http -> org.htmlunit.org.apache.http)
 
-* httpcomponents/httpmime:jar (shaded)
-* httpcomponents/httpclient (shaded)
-* httpcomponents/httpcore (shaded)
-* commons-codec/commons-codec (shaded)
+* commons-codec/commons-codec (shaded org.apache.commons.codec -> org.htmlunit.org.apache.commons.codec)
 
 All the other dependencies are still dependencies of this package (see the pom.xml for more).
 
@@ -88,7 +87,7 @@ Add the snapshot repository and dependency to your `pom.xml`:
     <!-- ... --> 
     <repository>
       <id>OSS Sonatype snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
       <snapshots>
         <enabled>true</enabled>
         <updatePolicy>always</updatePolicy>
@@ -102,8 +101,8 @@ Add the snapshot repository and dependency to your `pom.xml`:
     <dependencies>
       <dependency>
           <groupId>net.sourceforge.htmlunit</groupId>
-          <artifactId>htmlunit-android</artifactId>
-          <version>2.68.0-SNAPSHOT</version>
+          <artifactId>htmlunit3-android</artifactId>
+          <version>3.2.0-SNAPSHOT</version>
       </dependency>
       <!-- ... -->
     </dependencies>
@@ -117,12 +116,12 @@ Add the snapshot repository and dependency to your `build.gradle`:
 
 ```groovy
 repositories {
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+  maven { url "https://os1.oss.sonatype.org/content/repositories/snapshots" }
   // ...
 }
 // ...
 dependencies {
-    implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit-android', version: '2.68.0-SNAPSHOT'
+    implementation group: 'org.htmlunit', name: 'htmlunit3-android', version: '3.2.0-SNAPSHOT'
   // ...
 }
 ```

pom.xml

@@ -3,9 +3,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.sourceforge.htmlunit</groupId>
-    <artifactId>htmlunit-android</artifactId>
-    <version>2.67.0</version>
+    <groupId>org.htmlunit</groupId>
+    <artifactId>htmlunit3-android</artifactId>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>HtmlUnitAndroid</name>
     <organization>
@@ -16,7 +16,7 @@
     <description>
         A headless browser intended for use in testing web-based applications packaged for android.
     </description>
-    <url>http://htmlunit.sourceforge.net</url>
+    <url>https://www.htmlunit.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,7 +26,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <htmlunit.version>2.67.0</htmlunit.version>
+        <htmlunit.version>3.1.0</htmlunit.version>
         <!-- overwrite the jetty version to be compatible with older android api's -->
         <!-- see https://github.com/HtmlUnit/htmlunit-android/issues/5 -->
         <jetty.version>9.4.19.v20190610</jetty.version>
@@ -42,7 +42,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>com.gargoylesoftware.htmlunit.android.Main</mainClass>
+                            <mainClass>org.htmlunit.android.Main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
@@ -196,7 +196,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
+            <groupId>org.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>${htmlunit.version}</version>
         </dependency>
@@ -256,18 +256,13 @@
     </dependencies>
 
     <distributionManagement>
-        <site>
-            <id>htmlunit-website</id>
-            <name>HtmlUnit WebSite - Sourceforge</name>
-            <url>scp://shell.sourceforge.net/home/project-web/htmlunit/htdocs/</url>
-        </site>
         <snapshotRepository>
             <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
         <repository>
             <id>sonatype-nexus-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
     </distributionManagement>
 

src/main/java/com/gargoylesoftware/htmlunit/android/Main.java renamed to src/main/java/org/htmlunit/android/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022 Gargoyle Software Inc.
+ * Copyright (c) 2002-2023 Gargoyle Software Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,13 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gargoylesoftware.htmlunit.android;
+package org.htmlunit.android;
 
-import java.util.Set;
-
-import com.gargoylesoftware.htmlunit.SilentCssErrorHandler;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.SilentCssErrorHandler;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 
 /**
  * Just a simple main class.
@@ -27,10 +25,11 @@
  */
 public class Main {
     public static void main(String[] args) {
-        final String[] tmpClassNames = { "com.gargoylesoftware.htmlunit.WebClient",
-            "net.sourceforge.htmlunit.corejs.javascript.Function",
-            "net.sourceforge.htmlunit.cyberneko.HTMLElements",
-            "com.gargoylesoftware.css.parser.CSSOMParser",
+        final String[] tmpClassNames = { "org.htmlunit.WebClient",
+            "org.htmlunit.corejs.javascript.Function",
+            "org.htmlunit.cyberneko.HTMLElements",
+            "org.htmlunit.xpath.XPath",
+            "org.htmlunit.cssparser.parser.CSSOMParser",
             "",
 
             "org.htmlunit.org.apache.http.client.HttpClient",
@@ -79,11 +78,7 @@ public static void main(String[] args) {
 //            // @formatter:on
 //            System.out.println(info.toString());
 //        }
-//
-//        System.out.println(org.apache.xmlcommons.Version.getVersion());
-//        System.out.println(org.apache.xml.serializer.Version.getVersion());
-//        System.out.println(org.apache.xerces.impl.Version.getVersion());
-//
+
         System.out.println();
         System.out.println();
         System.out.println("Reading https://www.wetator.org/testform/");

src/main/java/com/gargoylesoftware/htmlunit/android/VersionUtil.java renamed to src/main/java/org/htmlunit/android/VersionUtil.java

@@ -14,7 +14,7 @@
  */
 
 
-package com.gargoylesoftware.htmlunit.android;
+package org.htmlunit.android;
 
 import java.io.InputStream;
 import java.net.URL;