upgrade

Author: jrhee17

client/java-armeria-xds/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/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java

@@ -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(

dependencies.toml

@@ -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,33 +40,34 @@ 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"
+owasp = "1.4.0"
 proguard = "7.4.2"
-protobuf = "3.25.5"
+protobuf = "3.25.8"
 protobuf-gradle-plugin = "0.9.5"
-quartz = "2.3.2"
+protoc-gen-validate = "1.2.1"
+quartz = "2.5.1"
 reflections = "0.9.11"
-rocksdb = "10.2.1"
+rocksdb = "10.4.2"
 shadow-gradle-plugin = "8.3.9"
 # Don't update `shiro` version
 shiro = "1.3.2"
@@ -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"

server/build.gradle

@@ -41,7 +41,13 @@ dependencies {
     implementation libs.micrometer.core
     implementation libs.micrometer.prometheus
 
-    implementation libs.rocksdbjni
+    if (OperatingSystem.current().isWindows()) {
+        implementation(variantOf(libs.rocksdbjni) { classifier('win64') })
+    } else if (OperatingSystem.current().isMacOsX()) {
+        implementation(variantOf(libs.rocksdbjni) { classifier('osx') })
+    } else {
+        implementation(variantOf(libs.rocksdbjni) { classifier('linux64') })
+    }
 
     // Quartz
     implementation libs.quartz

xds/build.gradle

@@ -5,14 +5,15 @@ dependencies {
     implementation libs.kubernetes.client.impl
 
     implementation libs.armeria.grpc
-    implementation libs.controlplane.api
     implementation libs.controlplane.cache
     implementation libs.controlplane.server
 
     implementation libs.reflections
 
     testImplementation libs.armeria.junit5
-    testImplementation libs.armeria.xds
+    testImplementation (libs.armeria.xds) {
+        exclude group: 'com.linecorp.armeria', module: 'armeria-xds-api'
+    }
     testImplementation libs.kubernetes.server.mock
     testImplementation libs.kubernetes.junit.jupiter
     testImplementation libs.logback15

xds/src/test/java/com/linecorp/centraldogma/xds/internal/CdsStreamingMultipleClientsTest.java

@@ -76,13 +76,14 @@ void updateClusterRootWithCorrespondingResource() throws Exception {
 
             final ClusterLoadAssignment fooEndpoint = loadAssignment(fooClusterName, "127.0.0.1", 8080);
             createEndpoint(fooGroupName, fooClusterId, fooEndpoint, webClient);
-            Cluster fooCluster = cluster(fooClusterName, 1);
+            final Cluster fooCluster = cluster(fooClusterName, 1);
             createCluster(fooGroupName, fooClusterId, fooCluster, webClient);
 
-            await().until(() -> fooSnapshotCaptor.get() != null);
-            ClusterSnapshot fooClusterSnapshot = fooSnapshotCaptor.getAndSet(null);
-            assertThat(fooClusterSnapshot.xdsResource().resource()).isEqualTo(fooCluster);
-            assertThat(fooClusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(fooEndpoint);
+            await().untilAsserted(() -> {
+                final ClusterSnapshot fooClusterSnapshot = fooSnapshotCaptor.get();
+                assertThat(fooClusterSnapshot.xdsResource().resource()).isEqualTo(fooCluster);
+                assertThat(fooClusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(fooEndpoint);
+            });
 
             // bar is not updated.
             await().pollDelay(200, TimeUnit.MILLISECONDS).until(() -> barSnapshotCaptor.get() == null);
@@ -91,24 +92,20 @@ void updateClusterRootWithCorrespondingResource() throws Exception {
             createEndpoint(barGroupName, barClusterId, barEndpoint, webClient);
             final Cluster barCluster = cluster(barClusterName, 1);
             createCluster(barGroupName, barClusterId, barCluster, webClient);
-            await().until(() -> barSnapshotCaptor.get() != null);
-            final ClusterSnapshot barClusterSnapshot = barSnapshotCaptor.getAndSet(null);
-            assertThat(barClusterSnapshot.xdsResource().resource()).isEqualTo(barCluster);
-            assertThat(barClusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(barEndpoint);
-
-            // foo is not updated.
-            await().pollDelay(200, TimeUnit.MILLISECONDS).until(() -> fooSnapshotCaptor.get() == null);
+            await().untilAsserted(() -> {
+                final ClusterSnapshot barClusterSnapshot = barSnapshotCaptor.get();
+                assertThat(barClusterSnapshot.xdsResource().resource()).isEqualTo(barCluster);
+                assertThat(barClusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(barEndpoint);
+            });
 
             // Change the configuration.
-            fooCluster = cluster(fooClusterName, 2);
-            updateCluster(fooGroupName, fooClusterId, fooCluster, webClient);
-            await().until(() -> fooSnapshotCaptor.get() != null);
-            fooClusterSnapshot = fooSnapshotCaptor.getAndSet(null);
-            assertThat(fooClusterSnapshot.xdsResource().resource()).isEqualTo(fooCluster);
-            assertThat(fooClusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(fooEndpoint);
-
-            // bar is not updated.
-            await().pollDelay(200, TimeUnit.MILLISECONDS).until(() -> barSnapshotCaptor.get() == null);
+            final Cluster fooCluster2 = cluster(fooClusterName, 2);
+            updateCluster(fooGroupName, fooClusterId, fooCluster2, webClient);
+            await().untilAsserted(() -> {
+                final ClusterSnapshot clusterSnapshot = fooSnapshotCaptor.get();
+                assertThat(clusterSnapshot.xdsResource().resource()).isEqualTo(fooCluster2);
+                assertThat(clusterSnapshot.endpointSnapshot().xdsResource().resource()).isEqualTo(fooEndpoint);
+            });
         }
     }
 }

xds/src/test/java/com/linecorp/centraldogma/xds/internal/LdsStreamingMultipleClientsTest.java

@@ -122,9 +122,6 @@ void updateListenerRootWithCorrespondingResource() throws Exception {
             await().until(() -> fooSnapshotCaptor.get() != null);
             fooListenerSnapshot = fooSnapshotCaptor.getAndSet(null);
             assertThat(fooListenerSnapshot.xdsResource().resource()).isEqualTo(fooListener);
-
-            // bar is not updated.
-            await().pollDelay(200, TimeUnit.MILLISECONDS).until(() -> barSnapshotCaptor.get() == null);
         }
     }
 }