Skip to content

Commit 3b683c7

Browse files
Copilotrbri
Copilot
and
rbri
authored
Upgrade Jetty from 9.4.58 to 12.1.8
Agent-Logs-Url: https://github.com/HtmlUnit/htmlunit-websocket-client/sessions/c3a39ce2-cb19-44de-87b2-47a88ddda0e0 Co-authored-by: rbri <2544132+rbri@users.noreply.github.com>
1 parent e7a4323 commit 3b683c7

2 files changed

Lines changed: 199 additions & 6 deletions

File tree

‎dependency-reduced-pom.xml‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.htmlunit</groupId>
5+
<artifactId>htmlunit-websocket-client</artifactId>
6+
<name>HtmlUnit WebSocket Client</name>
7+
<version>4.21.0</version>
8+
<description>The default WebSocket client used by HtmlUnit.
9+
The implementation is based on Jetty 12.</description>
10+
<url>https://www.htmlunit.org</url>
11+
<issueManagement>
12+
<system>GitHub</system>
13+
<url>https://github.com/HtmlUnit/htmlunit/issues/</url>
14+
</issueManagement>
15+
<ciManagement>
16+
<system>Jenkins</system>
17+
<url>https://jenkins.wetator.org/view/HtmlUnit/</url>
18+
</ciManagement>
19+
<inceptionYear>2021</inceptionYear>
20+
<developers>
21+
<developer>
22+
<id>rbri</id>
23+
<name>Ronald Brill</name>
24+
<email>rbri@rbri.de</email>
25+
<url>http://www.wetator.org/</url>
26+
<timezone>+1</timezone>
27+
</developer>
28+
</developers>
29+
<licenses>
30+
<license>
31+
<name>Apache License, Version 2.0</name>
32+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
33+
<distribution>repo</distribution>
34+
</license>
35+
</licenses>
36+
<scm>
37+
<connection>scm:git:https://github.com/HtmlUnit/htmlunit</connection>
38+
<developerConnection>scm:git:https://github.com/HtmlUnit/htmlunit</developerConnection>
39+
<url>https://github.com/HtmlUnit/htmlunit</url>
40+
</scm>
41+
<organization>
42+
<name>Gargoyle Software Inc.</name>
43+
<url>http://www.GargoyleSoftware.com/</url>
44+
</organization>
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.sonatype.central</groupId>
49+
<artifactId>central-publishing-maven-plugin</artifactId>
50+
<version>${central-publishing-plugin.version}</version>
51+
<extensions>true</extensions>
52+
<configuration>
53+
<publishingServerId>central</publishingServerId>
54+
</configuration>
55+
</plugin>
56+
<plugin>
57+
<artifactId>maven-enforcer-plugin</artifactId>
58+
<version>${enforcer-plugin.version}</version>
59+
<executions>
60+
<execution>
61+
<id>enforce-maven</id>
62+
<goals>
63+
<goal>enforce</goal>
64+
</goals>
65+
<configuration>
66+
<rules>
67+
<requireMavenVersion>
68+
<version>3.6.3</version>
69+
</requireMavenVersion>
70+
<requireJavaVersion>
71+
<version>17</version>
72+
</requireJavaVersion>
73+
</rules>
74+
</configuration>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
<plugin>
79+
<artifactId>maven-jar-plugin</artifactId>
80+
<version>${jar-plugin.version}</version>
81+
<configuration>
82+
<archive>
83+
<manifest>
84+
<addClasspath>true</addClasspath>
85+
<mainClass>org.htmlunit.websocket.client.Main</mainClass>
86+
</manifest>
87+
</archive>
88+
</configuration>
89+
</plugin>
90+
<plugin>
91+
<artifactId>maven-shade-plugin</artifactId>
92+
<version>${shade-plugin.version}</version>
93+
<executions>
94+
<execution>
95+
<phase>package</phase>
96+
<goals>
97+
<goal>shade</goal>
98+
</goals>
99+
<configuration>
100+
<artifactSet>
101+
<excludes />
102+
</artifactSet>
103+
<filters>
104+
<filter>
105+
<artifact>*:*</artifact>
106+
<excludes>
107+
<exclude>about.html</exclude>
108+
<exclude>META-INF/*.SF</exclude>
109+
<exclude>META-INF/*.DSA</exclude>
110+
<exclude>META-INF/*.RSA</exclude>
111+
<exclude>META-INF/DEPENDENCIES</exclude>
112+
<exclude>META-INF/NOTICE</exclude>
113+
</excludes>
114+
</filter>
115+
</filters>
116+
<relocations>
117+
<relocation>
118+
<pattern>org.eclipse.jetty</pattern>
119+
<shadedPattern>org.htmlunit.jetty</shadedPattern>
120+
</relocation>
121+
</relocations>
122+
<transformers>
123+
<transformer />
124+
<transformer />
125+
</transformers>
126+
</configuration>
127+
</execution>
128+
</executions>
129+
</plugin>
130+
<plugin>
131+
<artifactId>maven-source-plugin</artifactId>
132+
<version>${source-plugin.version}</version>
133+
<executions>
134+
<execution>
135+
<goals>
136+
<goal>jar</goal>
137+
</goals>
138+
</execution>
139+
</executions>
140+
</plugin>
141+
<plugin>
142+
<artifactId>maven-javadoc-plugin</artifactId>
143+
<version>${javadoc-plugin.version}</version>
144+
<executions>
145+
<execution>
146+
<goals>
147+
<goal>jar</goal>
148+
</goals>
149+
</execution>
150+
</executions>
151+
<configuration>
152+
<quiet>true</quiet>
153+
<sourcepath>${basedir}/src/main/java</sourcepath>
154+
<additionalparam>--allow-script-in-comments</additionalparam>
155+
<links>
156+
<link>https://docs.oracle.com/javase/8/docs/api/</link>
157+
<link>https://commons.apache.org/logging/apidocs/</link>
158+
<link>https://commons.apache.org/codec/apidocs/</link>
159+
<link>https://hc.apache.org/httpcomponents-client-4.5.x/current/httpclient/apidocs/</link>
160+
</links>
161+
</configuration>
162+
</plugin>
163+
<plugin>
164+
<artifactId>maven-gpg-plugin</artifactId>
165+
<version>${gpg-plugin.version}</version>
166+
<executions>
167+
<execution>
168+
<phase>verify</phase>
169+
<goals>
170+
<goal>sign</goal>
171+
</goals>
172+
</execution>
173+
</executions>
174+
</plugin>
175+
</plugins>
176+
</build>
177+
<properties>
178+
<central-publishing-plugin.version>0.9.0</central-publishing-plugin.version>
179+
<jetty.version>12.1.8</jetty.version>
180+
<enforcer-plugin.version>3.6.2</enforcer-plugin.version>
181+
<jar-plugin.version>3.5.0</jar-plugin.version>
182+
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
183+
<gpg-plugin.version>3.2.8</gpg-plugin.version>
184+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
185+
<additionalparam>-Xdoclint:none</additionalparam>
186+
<shade-plugin.version>3.6.1</shade-plugin.version>
187+
<maven.compiler.source>17</maven.compiler.source>
188+
<dependencycheck.version>10.0.4</dependencycheck.version>
189+
<maven.compiler.target>17</maven.compiler.target>
190+
<source-plugin.version>3.4.0</source-plugin.version>
191+
<javadoc-plugin.version>3.12.0</javadoc-plugin.version>
192+
</properties>
193+
</project>

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<packaging>jar</packaging>
1616
<description>
1717
The default WebSocket client used by HtmlUnit.
18-
The implementation is based on Jetty 9.
18+
The implementation is based on Jetty 12.
1919
</description>
2020
<url>https://www.htmlunit.org</url>
2121

@@ -24,10 +24,10 @@
2424
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
2525
<additionalparam>-Xdoclint:none</additionalparam>
2626

27-
<maven.compiler.source>8</maven.compiler.source>
28-
<maven.compiler.target>8</maven.compiler.target>
27+
<maven.compiler.source>17</maven.compiler.source>
28+
<maven.compiler.target>17</maven.compiler.target>
2929

30-
<jetty.version>9.4.58.v20250814</jetty.version>
30+
<jetty.version>12.1.8</jetty.version>
3131

3232
<!-- quality -->
3333
<dependencycheck.version>10.0.4</dependencycheck.version>
@@ -45,7 +45,7 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.eclipse.jetty.websocket</groupId>
48-
<artifactId>websocket-client</artifactId>
48+
<artifactId>jetty-websocket-jetty-client</artifactId>
4949
<version>${jetty.version}</version>
5050
</dependency>
5151
</dependencies>
@@ -97,7 +97,7 @@
9797
<version>3.6.3</version>
9898
</requireMavenVersion>
9999
<requireJavaVersion>
100-
<version>1.8.0</version>
100+
<version>17</version>
101101
</requireJavaVersion>
102102
</rules>
103103
</configuration>

0 commit comments

Comments
 (0)