update deps

Author: jrhee17

.github/workflows/actions_build.yml

@@ -16,7 +16,7 @@ concurrency:
 
 env:
   LC_ALL: "en_US.UTF-8"
-  BUILD_JDK_VERSION: "21"
+  BUILD_JDK_VERSION: "25"
 
 jobs:
   build:
@@ -53,21 +53,21 @@ jobs:
       shell: bash
     - uses: actions/checkout@v4
 
-    - id: setup-build-jdk
-      name: Set up build JDK ${{ env.BUILD_JDK_VERSION }}
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: ${{ env.BUILD_JDK_VERSION }}
-
     - id: setup-test-jdk
       if: ${{ matrix.java != env.BUILD_JDK_VERSION }}
       name: Set up test JDK ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
-        distribution: 'temurin'
+        distribution: 'zulu'
         java-version: ${{ matrix.java }}
 
+    - id: setup-build-jdk
+      name: Set up build JDK ${{ env.BUILD_JDK_VERSION }}
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: ${{ env.BUILD_JDK_VERSION }}
+
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v5
 
@@ -156,7 +156,7 @@ jobs:
         name: Set up JDK ${{ env.BUILD_JDK_VERSION }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle
@@ -180,7 +180,7 @@ jobs:
         name: Set up JDK ${{ env.BUILD_JDK_VERSION }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle
@@ -204,7 +204,7 @@ jobs:
         name: Set up JDK ${{ env.BUILD_JDK_VERSION }}
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle

.github/workflows/publish-release.yml

@@ -16,12 +16,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - id: setup-jdk-21
-        name: Set up JDK 21
+      - id: setup-jdk-25
+        name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: 'zulu'
+          java-version: '25'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5

.github/workflows/publish-site.yml

@@ -19,12 +19,12 @@ jobs:
         run: |
           sudo apt-get -y install graphviz
 
-      - id: setup-jdk-21
-        name: Set up JDK 21
+      - id: setup-jdk-25
+        name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: 'zulu'
+          java-version: '25'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5

.github/workflows/tag-new-release.yml

@@ -49,12 +49,12 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - id: setup-jdk-21
-        name: Set up JDK 21
+      - id: setup-jdk-25
+        name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: 'zulu'
+          java-version: '25'
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v5

bom/build.gradle

@@ -108,15 +108,6 @@ configure(projectsWithFlags('java')) {
         testRuntimeOnly libs.junit5.vintage.engine
     }
 
-    // Target Java 8 except for spring-boot3
-    if (!project.name.startsWith("java-spring-boot3")) {
-        tasks.withType(JavaCompile) {
-            if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
-                options.release = 8
-            }
-        }
-    }
-
     // Add common JVM options such as max memory and leak detection.
     tasks.withType(JavaForkOptions) {
         // Use larger heap when test coverage is enabled.

build.gradle

@@ -4,8 +4,13 @@ dependencies {
     // Armeria
     api libs.armeria.xds
 
-    testImplementation libs.controlplane.server
-    testImplementation libs.controlplane.cache
+    testImplementation (libs.controlplane.server) {
+        exclude group: "io.envoyproxy.controlplane"
+    }
+    testImplementation (libs.controlplane.cache) {
+        exclude group: "io.envoyproxy.controlplane"
+    }
+
     testImplementation libs.armeria.junit5
     testImplementation libs.jackson.dataformat.yaml
 }

client/java-armeria-xds/build.gradle

@@ -57,8 +57,10 @@
 import io.envoyproxy.envoy.config.cluster.v3.Cluster;
 import io.envoyproxy.envoy.config.cluster.v3.Cluster.DiscoveryType;
 import io.envoyproxy.envoy.config.core.v3.Address;
+import io.envoyproxy.envoy.config.core.v3.AggregatedConfigSource;
 import io.envoyproxy.envoy.config.core.v3.ApiConfigSource;
 import io.envoyproxy.envoy.config.core.v3.ApiConfigSource.ApiType;
+import io.envoyproxy.envoy.config.core.v3.ConfigSource;
 import io.envoyproxy.envoy.config.core.v3.GrpcService;
 import io.envoyproxy.envoy.config.core.v3.GrpcService.EnvoyGrpc;
 import io.envoyproxy.envoy.config.core.v3.HeaderValue;
@@ -269,8 +271,13 @@ private XdsBootstrap xdsBootstrap() {
                 .addGrpcServices(grpcService)
                 .setApiType(ApiType.AGGREGATED_GRPC)
                 .build();
+        final AggregatedConfigSource ads = AggregatedConfigSource.getDefaultInstance();
         final DynamicResources dynamicResources =
-                DynamicResources.newBuilder().setAdsConfig(apiConfigSource).build();
+                DynamicResources.newBuilder()
+                                .setLdsConfig(ConfigSource.newBuilder().setAds(ads))
+                                .setCdsConfig(ConfigSource.newBuilder().setAds(ads))
+                                .setAdsConfig(apiConfigSource)
+                                .build();
         final Bootstrap bootstrap =
                 Bootstrap.newBuilder()
                          .setClusterManager(ClusterManager.newBuilder()
@@ -300,7 +307,9 @@ private Cluster bootstrapCluster() {
             localityLbEndpointsBuilder.addLbEndpoints(lbEndpoint);
         }
         final ClusterLoadAssignment clusterLoadAssignment =
-                ClusterLoadAssignment.newBuilder().addEndpoints(localityLbEndpointsBuilder.build()).build();
+                ClusterLoadAssignment.newBuilder()
+                                     .setClusterName(BOOTSTRAP_CLUSTER_NAME)
+                                     .addEndpoints(localityLbEndpointsBuilder.build()).build();
 
         if (isUseTls()) {
             clusterBuilder.setTransportSocket(

client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java

@@ -3,11 +3,11 @@
 #     If its classes are exposed in Javadoc, update offline links as well.
 #
 [versions]
-armeria = "1.33.4"
-assertj = "3.27.4"
+armeria = "1.34.0"
+assertj = "3.27.6"
 awaitility = "4.3.0"
-bouncycastle = "1.81"
-caffeine = "3.2.2"
+bouncycastle = "1.83"
+caffeine = "3.2.3"
 checkstyle = "10.3.3"
 conscrypt = "2.5.2"
 controlplane = "1.0.49"
@@ -19,17 +19,17 @@ curator = "5.9.0"
 cron-utils = "9.2.0"
 diffutils = "1.3.0"
 download = "5.6.0"
-dropwizard-metrics = "4.2.33"
+dropwizard-metrics = "4.2.37"
 eddsa = "0.3.0"
 findbugs = "3.0.2"
 futures-completable = "0.3.6"
-grpc-java = "1.74.0"
-guava = "33.4.8-jre"
+grpc-java = "1.77.0"
+guava = "33.5.0-jre"
 guava-failureaccess = "1.0.1"
-hamcrest-library = "2.2"
+hamcrest-library = "3.0"
 hibernate-validator6 = "6.2.5.Final"
-hibernate-validator8 = "8.0.1.Final"
-jackson = "2.19.2"
+hibernate-validator8 = "8.0.3.Final"
+jackson = "2.20.1"
 javassist = "3.30.2-GA"
 javax-annotation = "1.3.2"
 javax-inject = "1"
@@ -40,34 +40,35 @@ jetty-alpn-agent = "2.0.10"
 # JGit 7.x.x requires Java 17
 jgit6 = "6.10.0.202406032230-r"
 junit4 = "4.13.2"
-junit5 = "5.13.4"
+junit5 = "5.14.1"
 junit-pioneer = "2.3.0"
 jsch = "0.1.55"
 # Don't update `json-path` version
 json-path = "2.2.0"
 # 3.0.0 requires java 17
 json-unit = "2.38.0"
-jsoup = "1.21.1" # JSoup is only used for Gradle script.
+jsoup = "1.21.2" # JSoup is only used for Gradle script.
 jmh-core = "1.37"
 jmh-gradle-plugin = "0.7.3"
 jxr = "0.2.1"
-kubernetes-client = "7.3.1"
+kubernetes-client = "7.4.0"
 logback15 = "1.5.7"
-micrometer = "1.15.2"
-mina-sshd = "2.15.0"
-mockito = "5.18.0"
-nimbus-jose-jwt = "10.5"
+micrometer = "1.16.0"
+mina-sshd = "2.16.0"
+mockito = "5.20.0"
+nimbus-jose-jwt = "10.6"
 nexus-publish-plugin = "2.0.0"
 node-gradle-plugin = "7.1.0"
 osdetector = "1.7.3"
-owasp = "1.3.1"
-proguard = "7.4.2"
-protobuf = "3.25.5"
-protobuf-gradle-plugin = "0.8.19"
-quartz = "2.3.2"
+owasp = "1.4.0"
+proguard = "7.8.1"
+protobuf = "3.25.8"
+protobuf-gradle-plugin = "0.9.5"
+protoc-gen-validate = "1.2.1"
+quartz = "2.5.1"
 reflections = "0.9.11"
-rocksdb = "10.2.1"
-shadow-gradle-plugin = "7.1.2"
+rocksdb = "10.4.2"
+shadow-gradle-plugin = "8.3.9"
 # Don't update `shiro` version
 shiro = "1.3.2"
 slf4j2 = "2.0.17"
@@ -76,15 +77,15 @@ slf4j2 = "2.0.17"
 snappy = "1.1.10.5"
 sphinx = "2.10.1"
 spring-boot2 = "2.7.18"
-spring-boot3 = "3.5.4"
+spring-boot3 = "3.5.8"
 spring-test-junit5 = "1.5.0"
 testcontainers = "1.21.3"
 thrift09 = { strictly = "0.9.3-1" }
 # Ensure that we use the same ZooKeeper version as what Curator depends on.
 # See: https://github.com/apache/curator/blob/master/pom.xml
 #      (Switch to the right tag to find out the right version.)
 zookeeper = "3.9.3"
-zstd = "1.5.7-4"
+zstd = "1.5.7-6"
 
 [boms]
 armeria = { module = "com.linecorp.armeria:armeria-bom", version.ref = "armeria" }
@@ -109,6 +110,8 @@ module = "com.linecorp.armeria:armeria-saml"
 module = "com.linecorp.armeria:armeria-thrift0.9"
 [libraries.armeria-xds]
 module = "com.linecorp.armeria:armeria-xds"
+[libraries.armeria-xds-api]
+module = "com.linecorp.armeria:armeria-xds-api"
 
 [libraries.assertj]
 module = "org.assertj:assertj-core"
@@ -378,6 +381,9 @@ version.ref = "protobuf"
 [libraries.protobuf-gradle-plugin]
 module = "com.google.protobuf:protobuf-gradle-plugin"
 version.ref = "protobuf-gradle-plugin"
+[libraries.pgv-java-stub]
+module = "build.buf.protoc-gen-validate:pgv-java-stub"
+version.ref = "protoc-gen-validate"
 
 [libraries.quartz]
 module = "org.quartz-scheduler:quartz"
@@ -396,7 +402,7 @@ module = "org.rocksdb:rocksdbjni"
 version.ref = "rocksdb"
 
 [libraries.shadow-gradle-plugin]
-module = "gradle.plugin.com.github.johnrengelman:shadow"
+module = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin"
 version.ref = "shadow-gradle-plugin"
 
 [libraries.shiro-core]

dependencies.toml

@@ -136,7 +136,9 @@ task copyClientBinaries(group: 'Build',
                 from sourceFile
                 into nativeDir
                 rename { targetFileName }
-                fileMode 0755
+                filePermissions { permissions ->
+                    permissions.unix('rwxr-xr-x')
+                }
             }
         }
     }