From c1863abae8e9f92b9b8c3922e2c79da0274b1ca3 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Wed, 15 Nov 2023 10:39:07 +0100
Subject: [PATCH] HTTP/2 Jetty 11 support removed (to be re-worked for Jetty
 12)

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 bom/pom.xml                         | 10 +++++-----
 bundles/apidocs/pom.xml             |  8 ++++----
 connectors/pom.xml                  |  2 +-
 containers/pom.xml                  |  4 ++--
 docs/src/main/docbook/migration.xml | 23 +++++++++++------------
 docs/src/main/docbook/modules.xml   | 20 +++-----------------
 ext/bean-validation/pom.xml         | 15 +--------------
 inject/cdi2-se/pom.xml              | 13 +------------
 test-framework/providers/pom.xml    |  2 +-
 tests/e2e/pom.xml                   |  9 ---------
 10 files changed, 29 insertions(+), 77 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 5a76942983..91d9535e32 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml
index cf07a8f9ed..1e50cb75e2 100644
--- a/bundles/apidocs/pom.xml
+++ b/bundles/apidocs/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index ad4afa3153..2e78dedc6f 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -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>
diff --git a/containers/pom.xml b/containers/pom.xml
index 2196acb74b..18f56d3559 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -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>
diff --git a/docs/src/main/docbook/migration.xml b/docs/src/main/docbook/migration.xml
index a20c235258..03f7b61350 100644
--- a/docs/src/main/docbook/migration.xml
+++ b/docs/src/main/docbook/migration.xml
@@ -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">
@@ -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>
diff --git a/docs/src/main/docbook/modules.xml b/docs/src/main/docbook/modules.xml
index e2e14943ec..fb549497ae 100644
--- a/docs/src/main/docbook/modules.xml
+++ b/docs/src/main/docbook/modules.xml
@@ -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">
@@ -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
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index 0378140565..17ff4f31da 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -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>
\ No newline at end of file
diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml
index 46029a1592..44d5eed8c7 100644
--- a/inject/cdi2-se/pom.xml
+++ b/inject/cdi2-se/pom.xml
@@ -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>
\ No newline at end of file
diff --git a/test-framework/providers/pom.xml b/test-framework/providers/pom.xml
index 06d2d7ac24..1231da4cf1 100644
--- a/test-framework/providers/pom.xml
+++ b/test-framework/providers/pom.xml
@@ -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>
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index e6368cce54..2871c03035 100644
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -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>