Skip to content

Upgrade Jetty WebSocket client from 9.4.58 to 12.1.8 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 1 commit into from
Closed

Upgrade Jetty WebSocket client from 9.4.58 to 12.1.8 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 193 additions & 0 deletions dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.htmlunit</groupId>
<artifactId>htmlunit-websocket-client</artifactId>
<name>HtmlUnit WebSocket Client</name>
<version>4.21.0</version>
<description>The default WebSocket client used by HtmlUnit.
The implementation is based on Jetty 12.</description>
<url>https://www.htmlunit.org</url>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/HtmlUnit/htmlunit/issues/</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://jenkins.wetator.org/view/HtmlUnit/</url>
</ciManagement>
<inceptionYear>2021</inceptionYear>
<developers>
<developer>
<id>rbri</id>
<name>Ronald Brill</name>
<email>rbri@rbri.de</email>
<url>http://www.wetator.org/</url>
<timezone>+1</timezone>
</developer>
</developers>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/HtmlUnit/htmlunit</connection>
<developerConnection>scm:git:https://github.com/HtmlUnit/htmlunit</developerConnection>
<url>https://github.com/HtmlUnit/htmlunit</url>
</scm>
<organization>
<name>Gargoyle Software Inc.</name>
<url>http://www.GargoyleSoftware.com/</url>
</organization>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
<requireJavaVersion>
<version>17</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>org.htmlunit.websocket.client.Main</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>${shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes />
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>about.html</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/DEPENDENCIES</exclude>
<exclude>META-INF/NOTICE</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.eclipse.jetty</pattern>
<shadedPattern>org.htmlunit.jetty</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer />
<transformer />
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>${source-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<quiet>true</quiet>
<sourcepath>${basedir}/src/main/java</sourcepath>
<additionalparam>--allow-script-in-comments</additionalparam>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://commons.apache.org/logging/apidocs/</link>
<link>https://commons.apache.org/codec/apidocs/</link>
<link>https://hc.apache.org/httpcomponents-client-4.5.x/current/httpclient/apidocs/</link>
</links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>${gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<central-publishing-plugin.version>0.9.0</central-publishing-plugin.version>
<jetty.version>12.1.8</jetty.version>
<enforcer-plugin.version>3.6.2</enforcer-plugin.version>
<jar-plugin.version>3.5.0</jar-plugin.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<gpg-plugin.version>3.2.8</gpg-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<additionalparam>-Xdoclint:none</additionalparam>
<shade-plugin.version>3.6.1</shade-plugin.version>
<maven.compiler.source>17</maven.compiler.source>
<dependencycheck.version>10.0.4</dependencycheck.version>
<maven.compiler.target>17</maven.compiler.target>
<source-plugin.version>3.4.0</source-plugin.version>
<javadoc-plugin.version>3.12.0</javadoc-plugin.version>
</properties>
</project>
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<packaging>jar</packaging>
<description>
The default WebSocket client used by HtmlUnit.
The implementation is based on Jetty 9.
The implementation is based on Jetty 12.
</description>
<url>https://www.htmlunit.org</url>

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

<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<jetty.version>9.4.58.v20250814</jetty.version>
<jetty.version>12.1.8</jetty.version>

<!-- quality -->
<dependencycheck.version>10.0.4</dependencycheck.version>
Expand All @@ -45,7 +45,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<artifactId>jetty-websocket-jetty-client</artifactId>
<version>${jetty.version}</version>
</dependency>
</dependencies>
Expand Down Expand Up @@ -97,7 +97,7 @@
<version>3.6.3</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.8.0</version>
<version>17</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down