Merge branch 'master' into tls-psk

.github/workflows/branch_snapshot.yml

@@ -0,0 +1,35 @@
+name: Branch Snapshot
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to publish snapshot of'
+        required: true
+        default: 'master'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Git
+        run: |
+          git config --global user.name 'Zuul Build'
+          git config --global user.email '[email protected]'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.branch }}
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'gradle'
+      - name: Build snapshot
+        run: ./gradlew build snapshot
+        env:
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

.github/workflows/gradle-wrapper-validation.yml

@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3

.github/workflows/pr.yml

@@ -27,4 +27,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
           git config --global user.name 'Zuul Build'
           git config --global user.email '[email protected]'
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: "*/10 5 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.36.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.49.0'
     }
 }
 
@@ -77,7 +77,7 @@ subprojects {
 
     ext {
         libraries = [
-                guava: "com.google.guava:guava:31.1-jre",
+                guava: "com.google.guava:guava:33.3.0-jre",
                 okhttp: 'com.squareup.okhttp3:okhttp:4.12.0',
                 jupiterApi: 'org.junit.jupiter:junit-jupiter-api:5.+',
                 jupiterParams: 'org.junit.jupiter:junit-jupiter-params:5.+',

dependencies.lock

@@ -133,15 +133,15 @@
     },
     "palantirJavaFormat": {
         "com.fasterxml.jackson.core:jackson-annotations": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson.core:jackson-databind",
                 "com.fasterxml.jackson:jackson-bom",
                 "com.palantir.javaformat:palantir-java-format-spi"
             ]
         },
         "com.fasterxml.jackson.core:jackson-core": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson.core:jackson-databind",
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
@@ -152,7 +152,7 @@
             ]
         },
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
@@ -162,28 +162,28 @@
             ]
         },
         "com.fasterxml.jackson.datatype:jackson-datatype-guava": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson:jackson-bom",
                 "com.palantir.javaformat:palantir-java-format-spi"
             ]
         },
         "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson:jackson-bom",
                 "com.palantir.javaformat:palantir-java-format"
             ]
         },
         "com.fasterxml.jackson.module:jackson-module-parameter-names": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson:jackson-bom",
                 "com.palantir.javaformat:palantir-java-format"
             ]
         },
         "com.fasterxml.jackson:jackson-bom": {
-            "locked": "2.15.2",
+            "locked": "2.17.2",
             "transitive": [
                 "com.fasterxml.jackson.core:jackson-annotations",
                 "com.fasterxml.jackson.core:jackson-core",
@@ -196,57 +196,48 @@
         "com.google.code.findbugs:jsr305": {
             "locked": "3.0.2",
             "transitive": [
-                "com.google.guava:guava",
-                "com.google.guava:guava-parent"
+                "com.google.guava:guava"
             ]
         },
         "com.google.errorprone:error_prone_annotations": {
-            "locked": "2.18.0",
+            "locked": "2.23.0",
             "transitive": [
-                "com.google.guava:guava",
-                "com.google.guava:guava-parent"
+                "com.google.guava:guava"
             ]
         },
         "com.google.guava:failureaccess": {
-            "locked": "1.0.1",
+            "locked": "1.0.2",
             "transitive": [
                 "com.google.guava:guava"
             ]
         },
         "com.google.guava:guava": {
-            "locked": "32.1.2-jre",
+            "locked": "33.0.0-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.javaformat:palantir-java-format",
                 "com.palantir.javaformat:palantir-java-format-spi"
             ]
         },
-        "com.google.guava:guava-parent": {
-            "locked": "32.1.2-jre",
-            "transitive": [
-                "com.google.guava:guava"
-            ]
-        },
         "com.google.guava:listenablefuture": {
             "locked": "9999.0-empty-to-avoid-conflict-with-guava",
             "transitive": [
                 "com.google.guava:guava"
             ]
         },
         "com.palantir.javaformat:palantir-java-format": {
-            "locked": "2.36.0"
+            "locked": "2.49.0"
         },
         "com.palantir.javaformat:palantir-java-format-spi": {
-            "locked": "2.36.0",
+            "locked": "2.49.0",
             "transitive": [
                 "com.palantir.javaformat:palantir-java-format"
             ]
         },
         "org.checkerframework:checker-qual": {
-            "locked": "3.33.0",
+            "locked": "3.41.0",
             "transitive": [
-                "com.google.guava:guava",
-                "com.google.guava:guava-parent"
+                "com.google.guava:guava"
             ]
         },
         "org.functionaljava:functionaljava": {

gradle.properties

@@ -1,8 +1,8 @@
 versions_groovy=3.0.19
 versions_ribbon=2.4.4
-versions_netty=4.1.109.Final
+versions_netty=4.1.113.Final
 versions_netty_io_uring=0.0.25.Final
 versions_brotli4j=1.16.0
 release.scope=patch
-release.version=2.5.0-SNAPSHOT
+release.version=2.5.10-SNAPSHOT
 org.gradle.jvmargs=-Xms1g -Xmx2g

zuul-core/build.gradle

@@ -9,13 +9,15 @@ dependencies {
     implementation libraries.guava
     // TODO(carl-mastrangelo): this can be implementation; remove Logger from public api points.
     api libraries.slf4j
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.78'
-    implementation 'org.bouncycastle:bcpkix-jdk18on:1.78'
-    implementation 'org.bouncycastle:bctls-jdk18on:1.78'
+
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
+    implementation 'org.bouncycastle:bctls-jdk18on:1.78.1'
+
     implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
     api 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
 
-    api "com.netflix.archaius:archaius-core:0.7.7"
+    api "com.netflix.archaius:archaius-core:0.7.12"
     api "com.netflix.spectator:spectator-api:latest.release"
     api "com.netflix.netflix-commons:netflix-commons-util:0.3.0"
 
@@ -61,7 +63,7 @@ dependencies {
 
     testImplementation 'commons-configuration:commons-configuration:1.10'
 
-    testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.36'
+    testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.13'
 
     jmh 'org.openjdk.jmh:jmh-core:1.+'
     jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.+'