Merge branch '4.1' into reentrant-close

netty · Apr 27, 2024 · d47da3c · d47da3c
2 parents b6dcda3 + a300058
commit d47da3c
Show file tree

Hide file tree

Showing 277 changed files with 10,473 additions and 1,827 deletions.
diff --git a/.devcontainer/alpine/Dockerfile b/.devcontainer/alpine/Dockerfile
@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine
+RUN apk -U upgrade && apk add \
+    autoconf automake linux-headers libtool make tar libaio-dev openssl-dev apr-dev gcc \
+    mandoc man-pages autoconf-doc automake-doc libtool-doc make-doc tar-doc gcc-doc \
+    perf perf-bash-completion htop htop-doc strace strace-doc ripgrep ripgrep-doc \
+    openjdk21-jdk openjdk21-doc openjdk21-src maven
diff --git a/.devcontainer/alpine/devcontainer.json b/.devcontainer/alpine/devcontainer.json
@@ -0,0 +1,10 @@
+{
+  name: "netty-on-alpine",
+  containerEnv: {
+    JAVA_HOME: "/usr/lib/jvm/default-jvm",
+    CPATH: "/usr/lib/jvm/default-jvm/include/:/usr/lib/jvm/default-jvm/include/linux/"
+  },
+  build: {
+    dockerfile: "Dockerfile",
+  }
+}
diff --git a/.devcontainer/ubuntu/Dockerfile b/.devcontainer/ubuntu/Dockerfile
@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu
+RUN apt-get update && apt-get install -y \
+    autotools-dev autoconf automake libtool make tar libaio-dev libssl-dev libapr1-dev lksctp-tools gcc \
+    htop strace \
+    openjdk-21-jdk-headless openjdk-21-source
diff --git a/.devcontainer/ubuntu/devcontainer.json b/.devcontainer/ubuntu/devcontainer.json
@@ -0,0 +1,9 @@
+{
+  name: "netty-on-ubuntu",
+  containerEnv: {
+    CPATH: "/usr/lib/jvm/java-21-openjdk-arm64/include/:/usr/lib/jvm/java-21-openjdk-arm64/include/linux/"
+  },
+  build: {
+    dockerfile: "Dockerfile"
+  }
+}
diff --git a/.github/scripts/check_bom_dependencies.sh b/.github/scripts/check_bom_dependencies.sh
@@ -16,7 +16,7 @@
 # ----------------------------------------------------------------------------
 set -e
 
-PARENT_TCNATIVE_VERSION=$(grep "<tcnative.version>" pom.xml | sed -n  's/.*<tcnative.version>\(.*\)<\/tcnative.version>/\1/p')
+PARENT_TCNATIVE_VERSION=$(grep "<tcnative.version>" pom.xml | tail -n1 | sed -n  's/.*<tcnative.version>\(.*\)<\/tcnative.version>/\1/p')
 BOM_TCNATIVE_VERSION=$(grep "<tcnative.version>" bom/pom.xml | sed -n  's/.*<tcnative.version>\(.*\)<\/tcnative.version>/\1/p')
 
 if [ "$PARENT_TCNATIVE_VERSION" != "$BOM_TCNATIVE_VERSION" ]; then

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -40,14 +40,17 @@ jobs:
           - setup: linux-x86_64-java11
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build"
+          - setup: linux-x86_64-java11-boringssl-snapshot
+            docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-boringssl-snapshot"
 
     name: ${{ matrix.setup }}
     steps:
       - uses: actions/checkout@v4
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -72,7 +75,7 @@ jobs:
         uses: ./.github/actions/thread-dump-jvms
         if: cancelled()
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: target

diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -71,7 +71,7 @@ jobs:
         run: docker-compose ${{ matrix.docker-compose-run }}
 
       - name: Upload local staging directory
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.setup }}-local-staging
           path: ~/local-staging
@@ -85,14 +85,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -109,19 +109,19 @@ jobs:
       # Hardcode the staging artifacts that need to be downloaded.
       # These must match the matrix setups. There is currently no way to pull this out of the config.
       - name: Download linux-aarch64 staging directory
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: linux-aarch64-local-staging
           path: ~/linux-aarch64-local-staging
 
       - name: Download linux-riscv64 staging directory
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: linux-riscv64-local-staging
           path: ~/linux-riscv64-local-staging
 
       - name: Download linux-x86_64-java8 staging directory
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: linux-x86_64-java8-local-staging
           path: ~/linux-x86_64-java8-local-staging
@@ -136,7 +136,7 @@ jobs:
           cat ~/linux-x86_64-java8-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
           cp -r ~/linux-x86_64-java8-local-staging/deferred/* ~/local-staging/deferred/
 
-      - uses: s4u/maven-settings-action@v2.8.0
+      - uses: s4u/maven-settings-action@v3.0.0
         with:
           servers: |
             [{

diff --git a/.github/workflows/ci-pr-reports.yml b/.github/workflows/ci-pr-reports.yml
@@ -42,11 +42,13 @@ jobs:
           - setup: linux-x86_64-java11-boringssl
           - setup: linux-x86_64-java17
           - setup: linux-x86_64-java18
+          - setup: linux-x86_64-java21
+          - setup: linux-x86_64-java22
           - setup: windows-x86_64-java11-boringssl
     continue-on-error: ${{ matrix.ignore-if-missing }}
     steps:
       - name: Download Artifacts
-        uses: dawidd6/action-download-artifact@v2.28.0
+        uses: dawidd6/action-download-artifact@v3.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: ${{ github.event.workflow_run.workflow_id }}
@@ -55,7 +57,7 @@ jobs:
           # File location set in ci-pr.yml and must be coordinated.
           name: test-results-${{ matrix.setup }}
       - name: Publish Test Report
-        uses: scacap/action-surefire-report@v1.7.2
+        uses: scacap/action-surefire-report@v1.7.3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           report_paths: '**/target/surefire-reports/TEST-*.xml'

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -34,14 +34,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -67,14 +67,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '11'
 
       # Cache .m2/repository
       # Caching of maven dependencies
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -91,12 +91,12 @@ jobs:
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-windows-x86_64-java11-boringssl
           path: '**/target/surefire-reports/TEST-*.xml'
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: build-pr-windows-target
@@ -108,6 +108,7 @@ jobs:
     # The host should always be Linux
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
           - arch: aarch64
@@ -124,7 +125,7 @@ jobs:
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -133,7 +134,7 @@ jobs:
             ${{ runner.os }}-maven-build-pr-${{ matrix.arch }}-
             ${{ runner.os }}-maven-
 
-      - uses: uraimo/run-on-arch-action@v2.5.1
+      - uses: uraimo/run-on-arch-action@v2
         name: Run commands
         id: runcmd
         with:
@@ -163,6 +164,7 @@ jobs:
   build-pr:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         include:
           - setup: linux-x86_64-java8
@@ -180,9 +182,15 @@ jobs:
           - setup: linux-x86_64-java21
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.21.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.21.yaml run build-leak"
+          - setup: linux-x86_64-java22
+            docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.22.yaml build"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.22.yaml run build-leak"
           - setup: linux-x86_64-java11-boringssl
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static"
+          - setup: linux-x86_64-java11-adaptive
+            docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-adaptive"
 
     name: ${{ matrix.setup }} build
     needs: verify-pr
@@ -191,7 +199,7 @@ jobs:
 
       # Cache .m2/repository
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         continue-on-error: true
         with:
           path: ~/.m2/repository
@@ -218,12 +226,12 @@ jobs:
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.setup }}
           path: '**/target/surefire-reports/TEST-*.xml'
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: build-${{ matrix.setup }}-target