Skip to content
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

HTTP/2 Jetty 11 support removed (to be re-worked for Jetty 12) #5462

Merged
merged 1 commit into from
Nov 15, 2023
Merged

HTTP/2 Jetty 11 support removed (to be re-worked for Jetty 12) #5462

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
10 changes: 5 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@
<artifactId>jersey-jetty11-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty11-http2-connector</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jdk-connector</artifactId>
Expand All @@ -113,7 +113,7 @@
<artifactId>jersey-container-jetty-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty11-http</artifactId>
<version>${project.version}</version>
Expand All @@ -122,7 +122,7 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty11-http2</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
Expand Down Expand Up @@ -433,7 +433,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<version>3.9.1</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions bundles/apidocs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<artifactId>jersey-jetty11-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty11-http2-connector</artifactId>
<version>${project.version}</version>
Expand All @@ -359,7 +359,7 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty11-http2</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
</dependencies>
</dependencyManagement>
<dependencies>
Expand All @@ -368,7 +368,7 @@
<artifactId>jersey-jetty11-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty11-http2-connector</artifactId>
<version>${project.version}</version>
Expand All @@ -382,7 +382,7 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty11-http2</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
</dependencies>
</profile>
</profiles>
Expand Down
2 changes: 1 addition & 1 deletion connectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<module>helidon-connector</module>
<module>jdk-connector</module>
<module>jetty-connector</module>
<module>jetty11-http2-connector</module>
<!-- <module>jetty11-http2-connector</module>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
<module>jetty11-connector</module>
<module>jnh-connector</module>
<module>netty-connector</module>
Expand Down
4 changes: 2 additions & 2 deletions containers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<module>jdk-http</module>
<module>jersey-servlet-core</module>
<module>jersey-servlet</module>
<module>jetty11-http</module>
<!-- <module>jetty11-http</module>-->
<module>jetty-http</module>
<module>jetty11-http2</module>
<!-- <module>jetty11-http2</module>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
<module>jetty-servlet</module>
<module>netty-http</module>
<module>simple-http</module>
Expand Down
23 changes: 11 additions & 12 deletions docs/src/main/docbook/migration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,6 @@
xml:id="migration">
<title>Migration Guide</title>

<section xml:id="mig-3.0.11">
<title>Migrating from Jersey 3.0.11 to 3.0.12</title>
<section xml:id="mig-3.0.11-jackson-changes">
<title>Changes in Jackson</title>
<para>
Jersey 3.0.12 starts to support Jackson 2.15 which comes with default limitations for the length of parsed text,
numbers, and nesting depth. Jersey keeps the Jackson default value, but it allows to override the maximum
length of parsed text using the &jersey.message.MessageProperties.JSON_MAX_STRING_LENGTH; property if needed.
</para>
</section>
</section>

<section xml:id="mig-3.0.0">
<title>Migrating from Jersey 2.32+ to 3.0.x.</title>
<section xml:id="mig-3.0.0-breaking-changes">
Expand Down Expand Up @@ -150,6 +138,17 @@
</listitem>
</itemizedlist>
</section>
<section xml:id="mig-3.1.4">
<title>Migrating from Jersey 3.1.3 to 3.1.4</title>
<section xml:id="mig-3.1.4-jackson-changes">
<title>Changes in Jackson</title>
<para>
Jersey 3.1.4 starts to support Jackson 2.15 which comes with default limitations for the length of parsed text,
numbers, and nesting depth. Jersey keeps the Jackson default value, but it allows to override the maximum
length of parsed text using the &jersey.message.MessageProperties.JSON_MAX_STRING_LENGTH; property if needed.
</para>
</section>
</section>
</section>

</chapter>
20 changes: 3 additions & 17 deletions docs/src/main/docbook/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,9 @@
jersey-container-jetty-http
</link>
</entry>
<entry>Jetty Http Container (for JDK 11+)</entry>
</row>
<row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-container-jetty-http2/dependencies.html">
jersey-container-jetty-http2
</link>
</entry>
<entry>Jetty HTTP/2 Container</entry>
<entry>Jetty Http Container (for JDK 17+)</entry>
</row>
<!-- TODO - HTTP/2 support for Jetty 12 container -->
<row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-container-jetty-servlet/dependencies.html">
Expand Down Expand Up @@ -240,15 +233,8 @@
</entry>
<entry>Jersey Client Transport via Jetty 11.x</entry>
</row>
<!-- TODO - HTTP/2 support for Jetty 12 container -->
<row>
<row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-jetty-http2-connector/dependencies.html">
jersey-jetty-http2-connector
</link>
</entry>
<entry>Jersey Client Transport via Jetty (for JDK 11+) with HTTP/2 support</entry>
</row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-netty-connector/dependencies.html">
jersey-netty-connector
Expand Down
15 changes: 1 addition & 14 deletions ext/bean-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
</profiles>

</project>
</project>
13 changes: 1 addition & 12 deletions inject/cdi2-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion test-framework/providers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<module>inmemory</module>
<module>jdk-http</module>
<module>jetty</module>
<module>jetty11-http2</module>
<!-- <module>jetty11-http2</module>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
<module>netty</module>
<module>simple</module>
</modules>
Expand Down
9 changes: 0 additions & 9 deletions tests/e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,6 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
<profile>
<id>sonar</id>
<build>
Expand Down