Upgrade to Jetty 12

.github/workflows/bk-ci.yml

@@ -78,7 +78,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: Validate pull request
         if: steps.check_changes.outputs.docs_only != 'true'
@@ -156,7 +156,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: Build
         run: |
@@ -230,7 +230,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: Pick ubuntu mirror for the docker image build
         run: |
@@ -315,7 +315,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 17
 
       - name: Pick ubuntu mirror for the docker image build
         run: |
@@ -397,7 +397,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: mvn package
         run: mvn -B -nsu clean package -DskipTests
@@ -429,7 +429,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: mvn package
         run: mvn -B -nsu clean package -DskipTests
@@ -444,10 +444,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - step_name: Compatibility Check Java8
-            jdk_version: 8
-          - step_name: Compatibility Check Java11
-            jdk_version: 11
           - step_name: Compatibility Check Java17
             jdk_version: 17
           - step_name: Compatibility Check Java21

.github/workflows/bk-streamstorage-python.yml

@@ -70,7 +70,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Build
         run: mvn -q -T 1C -B -nsu clean install -DskipTests -Dcheckstyle.skip -Dspotbugs.skip -Drat.skip -Dmaven.javadoc.skip
       - name: Pick ubuntu mirror for the docker image build

.github/workflows/codeql.yml

@@ -83,7 +83,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
 
     - name: Validate pull request
       if: steps.check_changes.outputs.docs_only != 'true'

.github/workflows/website-deploy.yaml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
 
       - name: Setup NodeJS

.github/workflows/website-pr-validation.yml

@@ -41,7 +41,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
 
       - name: Setup NodeJS

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

@@ -264,13 +264,16 @@ Apache Software License, Version 2.
 - lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
 - lib/org.apache.zookeeper-zookeeper-jute-3.8.4.jar [21]
 - lib/org.apache.zookeeper-zookeeper-3.8.4-tests.jar [21]
-- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22]
+- lib/org.eclipse.jetty-jetty-http-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-io-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-security-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-server-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-session-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-util-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.0.10.jar [22]
+- lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.6.jar [22]
 - lib/org.rocksdb-rocksdbjni-7.10.2.jar [23]
 - lib/com.beust-jcommander-1.82.jar [24]
 - lib/com.yahoo.datasketches-memory-0.8.3.jar [25]

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

@@ -264,13 +264,16 @@ Apache Software License, Version 2.
 - lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
 - lib/org.apache.zookeeper-zookeeper-jute-3.8.4.jar [21]
 - lib/org.apache.zookeeper-zookeeper-3.8.4-tests.jar [21]
-- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22]
-- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22]
+- lib/org.eclipse.jetty-jetty-http-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-io-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-security-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-server-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-session-12.0.10.jar [22]
+- lib/org.eclipse.jetty-jetty-util-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.0.10.jar [22]
+- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.0.10.jar [22]
+- lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.6.jar [22]
 - lib/org.rocksdb-rocksdbjni-7.10.2.jar [23]
 - lib/com.beust-jcommander-1.82.jar [24]
 - lib/com.yahoo.datasketches-memory-0.8.3.jar [25]

bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt

@@ -93,13 +93,15 @@ SoundCloud Ltd. (http://soundcloud.com/).
 This product includes software developed as part of the
 Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
 ------------------------------------------------------------------------------------
-- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar
+- lib/org.eclipse.jetty-jetty-http-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-io-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-security-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-server-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-session-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.0.10.jar
+- lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.6.jar
 
 ==============================================================
  Jetty Web Container
@@ -121,7 +123,7 @@ Jetty is dual licensed under both
 
 Jetty may be distributed under either license.
 
-lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt
+lib/org.eclipse.jetty-jetty-util-12.0.10.jar bundles UnixCrypt
 
 The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,

bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt

@@ -75,13 +75,15 @@ SoundCloud Ltd. (http://soundcloud.com/).
 This product includes software developed as part of the
 Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
 ------------------------------------------------------------------------------------
-- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar
-- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar
+- lib/org.eclipse.jetty-jetty-http-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-io-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-security-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-server-12.0.10.jar
+- lib/org.eclipse.jetty-jetty-session-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-nested-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-security-12.0.10.jar
+- lib/org.eclipse.jetty.ee8-jetty-ee8-servlet-12.0.10.jar
+- lib/org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.6.jar
 
 ==============================================================
  Jetty Web Container
@@ -103,7 +105,7 @@ Jetty is dual licensed under both
 
 Jetty may be distributed under either license.
 
-lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar bundles UnixCrypt
+lib/org.eclipse.jetty-jetty-util-12.0.10.jar bundles UnixCrypt
 
 The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,

bookkeeper-http/servlet-http-server/pom.xml

@@ -48,8 +48,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee8</groupId>
+            <artifactId>jetty-ee8-webapp</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

bookkeeper-http/servlet-http-server/src/test/java/org/apache/bookkeeper/http/servlet/JettyHttpServer.java

@@ -27,10 +27,10 @@
 import java.nio.file.Files;
 import java.util.List;
 import javax.servlet.Servlet;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.webapp.WebAppContext;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
 
 /**
  * Jetty based http server.

circe-checksum/pom.xml

@@ -63,6 +63,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <!-- keep Java 8 compatibility for circe-checksum -->
+          <release>8</release>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.github.maven-nar</groupId>
@@ -111,6 +115,36 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${maven-enforcer-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>8</maxJdkVersion>
+                  <ignoredScopes>
+                    <ignoreScope>test</ignoreScope>
+                  </ignoredScopes>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>${extra-enforcer-rules.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 

cpu-affinity/pom.xml

@@ -48,6 +48,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <!-- keep Java 8 compatibility for cpu-affinity -->
+          <release>8</release>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.github.maven-nar</groupId>
@@ -87,6 +91,36 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${maven-enforcer-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>8</maxJdkVersion>
+                  <ignoredScopes>
+                    <ignoreScope>test</ignoreScope>
+                  </ignoredScopes>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>${extra-enforcer-rules.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>