Skip to content

Commit bfdd346

Browse files
committed
use jetty 9.4.19.v20190610 to support older android version (issue #5)
1 parent a785a96 commit bfdd346

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.classpath

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
<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"/>
2323
<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"/>
2424
<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"/>
25-
<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"/>
26-
<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"/>
27-
<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"/>
28-
<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"/>
29-
<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"/>
30-
<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"/>
31-
<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"/>
25+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-client/9.4.19.v20190610/websocket-client-9.4.19.v20190610.jar"/>
26+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-client/9.4.19.v20190610/jetty-client-9.4.19.v20190610.jar"/>
27+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.4.19.v20190610/jetty-http-9.4.19.v20190610.jar"/>
28+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.4.19.v20190610/jetty-util-9.4.19.v20190610.jar"/>
29+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.4.19.v20190610/jetty-io-9.4.19.v20190610.jar"/>
30+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-common/9.4.19.v20190610/websocket-common-9.4.19.v20190610.jar"/>
31+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/websocket/websocket-api/9.4.19.v20190610/websocket-api-9.4.19.v20190610.jar"/>
32+
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/9.4.19.v20190610/jetty-xml-9.4.19.v20190610.jar"/>
3233
</classpath>

dependency-reduced-pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,6 @@
217217
<version>3.8.0</version>
218218
<scope>compile</scope>
219219
</dependency>
220-
<dependency>
221-
<groupId>org.brotli</groupId>
222-
<artifactId>dec</artifactId>
223-
<version>0.1.2</version>
224-
<scope>compile</scope>
225-
</dependency>
226220
<dependency>
227221
<groupId>com.shapesecurity</groupId>
228222
<artifactId>salvation2</artifactId>
@@ -235,6 +229,12 @@
235229
</exclusion>
236230
</exclusions>
237231
</dependency>
232+
<dependency>
233+
<groupId>org.eclipse.jetty.websocket</groupId>
234+
<artifactId>websocket-client</artifactId>
235+
<version>9.4.46.v20220331</version>
236+
<scope>compile</scope>
237+
</dependency>
238238
</dependencies>
239239
<distributionManagement>
240240
<repository>

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
<maven.compiler.target>8</maven.compiler.target>
2828

2929
<htmlunit.version>2.63.0-SNAPSHOT</htmlunit.version>
30-
<jetty.version>9.4.46.v20220331</jetty.version>
30+
<!-- overwrite the jetty version to be compatible with older android api's -->
31+
<!-- see https://github.com/HtmlUnit/htmlunit-android/issues/5 -->
32+
<jetty.version>9.4.19.v20190610</jetty.version>
3133
</properties>
3234

3335
<build>

0 commit comments

Comments
 (0)