Update dependencies (#961)

- Armeria 1.28.4 -> 1.29.0
- Control Plane 1.0.44 -> 1.0.45
- Guava 33.1.0-jre -> 33.2.1-jre
- Jackson 2.17.0 -> 2.17.1
- Micrometer 1.12.4 -> 1.13.0
- SLF4J 2.0.7 -> 2.0.12
- Spring Boot 3.2.4 -> 3.3.0
- Build and Test
  - AssertJ 3.25.3 -> 3.26.0
  - Logback 1.4.14 -> 1.5.5
  - TestContainers 1.19.7 -> 1.19.8

build.gradle

@@ -71,14 +71,14 @@ configure(projectsWithFlags('java')) {
  testImplementation libs.slf4j2.jul.to.slf4j
  testImplementation libs.slf4j2.jcl.over.slf4j
  testImplementation libs.slf4j2.log4j.over.slf4j
- testRuntimeOnly libs.logback14
+ testRuntimeOnly libs.logback15
  configurations.configureEach {
  resolutionStrategy {
  force libs.slf4j2.api.get()
  force libs.slf4j2.jul.to.slf4j.get()
  force libs.slf4j2.jcl.over.slf4j.get()
  force libs.slf4j2.log4j.over.slf4j.get()
- force libs.logback14.get()
+ force libs.logback15.get()
  }
  }
  } else {

dependencies.toml

@@ -3,13 +3,13 @@
 # If its classes are exposed in Javadoc, update offline links as well.
 #
 [versions]
-armeria = "1.28.4"
-assertj = "3.25.3"
+armeria = "1.29.0"
+assertj = "3.26.0"
 awaitility = "4.2.1"
 bouncycastle = "1.78.1"
 caffeine = "2.9.3"
 checkstyle = "10.3.3"
-controlplane = "1.0.44"
+controlplane = "1.0.45"
 curator = "5.6.0"
 # Do not upgrade cron-utils until there's another CVE or Armeria's SLF4J and Logback are upgraded.
 cron-utils = "9.2.0"
@@ -19,12 +19,12 @@ download = "5.6.0"
 eddsa = "0.3.0"
 findbugs = "3.0.2"
 futures-completable = "0.3.6"
-guava = "33.1.0-jre"
+guava = "33.2.1-jre"
 guava-failureaccess = "1.0.1"
 hamcrest-library = "2.2"
 hibernate-validator6 = "6.2.5.Final"
 hibernate-validator8 = "8.0.1.Final"
-jackson = "2.17.0"
+jackson = "2.17.1"
 javassist = "3.30.2-GA"
 javax-annotation = "1.3.2"
 javax-inject = "1"
@@ -43,9 +43,9 @@ jmh-core = "1.37"
 jmh-gradle-plugin = "0.7.2"
 jxr = "0.2.1"
 logback12 = { strictly = "1.2.13" }
-logback14 = { strictly = "1.4.14" }
+logback15 = { strictly = "1.5.5" }
 logback = "1.2.13"
-micrometer = "1.12.4"
+micrometer = "1.13.0"
 mina-sshd = "2.12.1"
 mockito = "4.11.0"
 nexus-publish-plugin = "2.0.0"
@@ -56,15 +56,15 @@ quartz = "2.3.2"
 shadow-gradle-plugin = "7.1.2"
 shiro = "1.3.2"
 slf4j1 = { strictly = "1.7.36" }
-slf4j2 = { strictly = "2.0.7" }
+slf4j2 = { strictly = "2.0.12" }
 # Ensure that we use the same Snappy version as what Curator depends on.
 # See: https://github.com/apache/curator/blob/master/pom.xml
 snappy = "1.1.10.4"
 sphinx = "2.10.1"
 spring-boot2 = "2.7.18"
-spring-boot3 = "3.2.4"
+spring-boot3 = "3.3.0"
 spring-test-junit5 = "1.5.0"
-testcontainers = "1.19.7"
+testcontainers = "1.19.8"
 thrift09 = { strictly = "0.9.3-1" }
 zookeeper = "3.7.2"
 
@@ -80,14 +80,15 @@ javadocs = "https://www.javadoc.io/doc/com.linecorp.armeria/armeria-javadoc/1.27
 module = "com.linecorp.armeria:armeria-grpc"
 [libraries.armeria-junit5]
 module = "com.linecorp.armeria:armeria-junit5"
+[libraries.armeria-prometheus1]
+module = "com.linecorp.armeria:armeria-prometheus1"
 [libraries.armeria-saml]
 module = "com.linecorp.armeria:armeria-saml"
 [libraries.armeria-thrift09]
 module = "com.linecorp.armeria:armeria-thrift0.9"
 [libraries.armeria-xds]
 module = "com.linecorp.armeria:armeria-xds"
 
-
 [libraries.assertj]
 module = "org.assertj:assertj-core"
 version.ref = "assertj"
@@ -282,10 +283,10 @@ module = "org.junit.platform:junit-platform-launcher"
 module = "ch.qos.logback:logback-classic"
 version.ref = "logback12"
 javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.2.12/"
-[libraries.logback14]
+[libraries.logback15]
 module = "ch.qos.logback:logback-classic"
-version.ref = "logback14"
-javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.4.11/"
+version.ref = "logback15"
+javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.4/"
 
 [libraries.controlplane-cache]
 module = "io.envoyproxy.controlplane:cache"
@@ -297,11 +298,11 @@ version.ref = "controlplane"
 [libraries.micrometer-core]
 module = "io.micrometer:micrometer-core"
 version.ref = "micrometer"
-javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.11.3/"
+javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.13.0/"
 [libraries.micrometer-prometheus]
 module = "io.micrometer:micrometer-registry-prometheus"
 version.ref = "micrometer"
-javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.11.3/"
+javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.13.0/"
 
 [libraries.mina-sshd-core]
 module = "org.apache.sshd:sshd-core"

server/build.gradle

@@ -23,6 +23,7 @@ dependencies {
 
  // Armeria
  api libs.armeria
+ api libs.armeria.prometheus1
  api libs.armeria.thrift09
  testImplementation libs.armeria.junit5
 

server/src/main/java/com/linecorp/centraldogma/server/CentralDogma.java

@@ -79,7 +79,7 @@
 import com.linecorp.armeria.common.MediaType;
 import com.linecorp.armeria.common.ServerCacheControl;
 import com.linecorp.armeria.common.metric.MeterIdPrefixFunction;
-import com.linecorp.armeria.common.metric.PrometheusMeterRegistries;
+import com.linecorp.armeria.common.prometheus.PrometheusMeterRegistries;
 import com.linecorp.armeria.common.util.EventLoopGroups;
 import com.linecorp.armeria.common.util.Exceptions;
 import com.linecorp.armeria.common.util.StartStopSupport;
@@ -105,7 +105,7 @@
 import com.linecorp.armeria.server.healthcheck.SettableHealthChecker;
 import com.linecorp.armeria.server.logging.AccessLogWriter;
 import com.linecorp.armeria.server.metric.MetricCollectingService;
-import com.linecorp.armeria.server.metric.PrometheusExpositionService;
+import com.linecorp.armeria.server.prometheus.PrometheusExpositionService;
 import com.linecorp.armeria.server.thrift.THttpService;
 import com.linecorp.armeria.server.thrift.ThriftCallService;
 import com.linecorp.centraldogma.common.ShuttingDownException;
@@ -169,7 +169,7 @@
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import io.netty.util.concurrent.GlobalEventExecutor;
 

server/src/main/java/com/linecorp/centraldogma/server/internal/api/GitHttpService.java

@@ -65,7 +65,7 @@ public final class GitHttpService {
  // TODO(minwoox): Add the headers in this class to Armeria.
  private static final AggregatedHttpResponse CAPABILITY_ADVERTISEMENT_RESPONSE = AggregatedHttpResponse.of(
  ResponseHeaders.builder(200)
- .add(HttpHeaderNames.CONTENT_TYPE, "application/x-git-upload-pack-advertisement")
+ .contentType(MediaType.GIT_UPLOAD_PACK_ADVERTISEMENT)
  .add(HttpHeaderNames.CACHE_CONTROL, ServerCacheControl.REVALIDATED.asHeaderValue())
  .build(),
  HttpData.ofUtf8(capabilityAdvertisement()));
@@ -132,14 +132,14 @@ private static String maybeRemoveGitSuffix(String repoName) {
  public HttpResponse gitUploadPack(AggregatedHttpRequest req,
  @Param String projectName, @Param String repoName) {
  repoName = maybeRemoveGitSuffix(repoName);
- final String gitProtocol = req.headers().get("git-protocol");
+ final String gitProtocol = req.headers().get(HttpHeaderNames.GIT_PROTOCOL);
  if (gitProtocol == null || !gitProtocol.contains(VERSION_2_REQUEST)) {
  return HttpResponse.of(HttpStatus.BAD_REQUEST, MediaType.PLAIN_TEXT_UTF_8,
  "Unsupported git-protocol: " + gitProtocol);
  }
 
  final MediaType contentType = req.headers().contentType();
- if (contentType == null || !"application/x-git-upload-pack-request".equals(contentType.toString())) {
+ if (MediaType.GIT_UPLOAD_PACK_REQUEST != contentType) {
  return HttpResponse.of(HttpStatus.BAD_REQUEST, MediaType.PLAIN_TEXT_UTF_8,
  "Unsupported content-type: " + contentType);
  }
@@ -182,7 +182,7 @@ public HttpResponse gitUploadPack(AggregatedHttpRequest req,
  });
  return HttpResponse.of(
  ResponseHeaders.builder(200)
- .add(HttpHeaderNames.CONTENT_TYPE, "application/x-git-upload-pack-result")
+ .contentType(MediaType.GIT_UPLOAD_PACK_RESULT)
  .add(HttpHeaderNames.CACHE_CONTROL,
  ServerCacheControl.REVALIDATED.asHeaderValue())
  .build(), body);

server/src/test/java/com/linecorp/centraldogma/server/MetricsTest.java

@@ -37,8 +37,7 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.prometheus.client.exporter.common.TextFormat;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 
 @FlakyTest
 @Timeout(30)
@@ -67,7 +66,7 @@ void metrics() {
  final AggregatedHttpResponse res = dogma.httpClient().get("/monitor/metrics").aggregate().join();
  String content = res.contentUtf8();
  assertThat(res.status()).isEqualTo(HttpStatus.OK);
- assertThat(res.contentType()).isEqualTo(MediaType.parse(TextFormat.CONTENT_TYPE_004));
+ assertThat(res.contentType()).isEqualTo(MediaType.parse("text/plain; version=0.0.4; charset=utf-8"));
  assertThat(content).isNotEmpty();
  assertThat(content).doesNotContain(
  "com.linecorp.centraldogma.server.internal.api.WatchContentServiceV1");

server/src/test/java/com/linecorp/centraldogma/server/internal/api/GitHttpServiceTest.java

@@ -83,11 +83,11 @@ protected void scaffold(CentralDogma client) {
  void advertiseCapability(String repoName) {
  final RequestHeaders headers =
  RequestHeaders.of(HttpMethod.GET, "/foo/" + repoName + "/info/refs?service=git-upload-pack",
- "git-protocol", VERSION_2_REQUEST,
+ HttpHeaderNames.GIT_PROTOCOL, VERSION_2_REQUEST,
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  final AggregatedHttpResponse res = dogma.httpClient().execute(headers).aggregate().join();
  assertThat(res.status()).isSameAs(HttpStatus.OK);
- assertThat(res.headers().get("content-type")).isEqualTo("application/x-git-upload-pack-advertisement");
+ assertThat(res.headers().contentType()).isSameAs(MediaType.GIT_UPLOAD_PACK_ADVERTISEMENT);
  assertThat(res.headers().get(HttpHeaderNames.CACHE_CONTROL))
  .isEqualTo(ServerCacheControl.REVALIDATED.asHeaderValue());
  assertThat(res.contentUtf8()).isEqualTo("001e# service=git-upload-pack\n0000" +
@@ -102,7 +102,7 @@ void advertiseCapability(String repoName) {
  void invalidRequestAdvertiseCapability() {
  RequestHeaders headers =
  RequestHeaders.of(HttpMethod.GET, "/foo/non-exist-repo/info/refs?service=git-upload-pack",
- "git-protocol", VERSION_2_REQUEST,
+ HttpHeaderNames.GIT_PROTOCOL, VERSION_2_REQUEST,
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  assertThat(dogma.httpClient().execute(headers).aggregate().join().status())
  .isSameAs(HttpStatus.NOT_FOUND);
@@ -113,7 +113,7 @@ void invalidRequestAdvertiseCapability() {
  .isSameAs(HttpStatus.FORBIDDEN);
 
  headers = RequestHeaders.of(HttpMethod.GET, "/foo/bar.git/info/refs?service=git-upload-pack",
- "git-protocol", "invalid-version",
+ HttpHeaderNames.GIT_PROTOCOL, "invalid-version",
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  assertThat(dogma.httpClient().execute(headers).aggregate().join().status())
  .isSameAs(HttpStatus.BAD_REQUEST);
@@ -125,12 +125,12 @@ void gitUploadPackRequest(boolean shallow) {
  final RequestHeaders headers =
  RequestHeaders.of(HttpMethod.POST, "/foo/bar.git/git-upload-pack",
  HttpHeaderNames.CONTENT_TYPE, "application/x-git-upload-pack-request",
- "git-protocol", VERSION_2_REQUEST,
+ HttpHeaderNames.GIT_PROTOCOL, VERSION_2_REQUEST,
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  AggregatedHttpResponse res = dogma.httpClient().execute(headers, lsRefsCommand())
  .aggregate().join();
  assertThat(res.status()).isSameAs(HttpStatus.OK);
- assertThat(res.headers().get("content-type")).isEqualTo("application/x-git-upload-pack-result");
+ assertThat(res.headers().contentType()).isSameAs(MediaType.GIT_UPLOAD_PACK_RESULT);
  assertThat(res.headers().get(HttpHeaderNames.CACHE_CONTROL))
  .isEqualTo(ServerCacheControl.REVALIDATED.asHeaderValue());
  final List<String> lines = Splitter.on('\n').trimResults().splitToList(res.contentUtf8());
@@ -150,7 +150,7 @@ void gitUploadPackRequest(boolean shallow) {
 
  res = dogma.httpClient().execute(headers, fetchCommand(headLineSplit.get(0).substring(4), shallow))
  .aggregate().join();
- assertThat(res.headers().get("content-type")).isEqualTo("application/x-git-upload-pack-result");
+ assertThat(res.headers().contentType()).isSameAs(MediaType.GIT_UPLOAD_PACK_RESULT);
  assertThat(res.headers().get(HttpHeaderNames.CACHE_CONTROL))
  .isEqualTo(ServerCacheControl.REVALIDATED.asHeaderValue());
  final String[] contents = res.contentUtf8().split("\n");
@@ -170,7 +170,7 @@ void invalidGitUploadPackRequest() {
  RequestHeaders headers =
  RequestHeaders.of(HttpMethod.POST, "/foo/non-exist-repo/git-upload-pack",
  HttpHeaderNames.CONTENT_TYPE, "application/x-git-upload-pack-request",
- "git-protocol", VERSION_2_REQUEST,
+ HttpHeaderNames.GIT_PROTOCOL, VERSION_2_REQUEST,
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  assertThat(dogma.httpClient().execute(headers).aggregate().join().status())
  .isSameAs(HttpStatus.NOT_FOUND);
@@ -183,7 +183,7 @@ void invalidGitUploadPackRequest() {
 
  headers = RequestHeaders.of(HttpMethod.POST, "/foo/bar.git/git-upload-pack",
  HttpHeaderNames.CONTENT_TYPE, "application/x-git-upload-pack-request",
- "git-protocol", "invalid-version",
+ HttpHeaderNames.GIT_PROTOCOL, "invalid-version",
  HttpHeaderNames.AUTHORIZATION, "Bearer anonymous");
  assertThat(dogma.httpClient().execute(headers).aggregate().join().status())
  .isSameAs(HttpStatus.BAD_REQUEST);

server/src/test/java/com/linecorp/centraldogma/server/internal/replication/Replica.java

@@ -35,7 +35,7 @@
 
 import org.apache.curator.test.InstanceSpec;
 
-import com.linecorp.armeria.common.metric.PrometheusMeterRegistries;
+import com.linecorp.armeria.common.prometheus.PrometheusMeterRegistries;
 import com.linecorp.centraldogma.common.Author;
 import com.linecorp.centraldogma.server.QuotaConfig;
 import com.linecorp.centraldogma.server.ZooKeeperReplicationConfig;

server/src/test/java/com/linecorp/centraldogma/server/internal/storage/repository/cache/CachingRepositoryTest.java

@@ -47,7 +47,7 @@
 
 import com.linecorp.armeria.common.metric.MoreMeters;
 import com.linecorp.armeria.common.metric.NoopMeterRegistry;
-import com.linecorp.armeria.common.metric.PrometheusMeterRegistries;
+import com.linecorp.armeria.common.prometheus.PrometheusMeterRegistries;
 import com.linecorp.centraldogma.common.Change;
 import com.linecorp.centraldogma.common.Commit;
 import com.linecorp.centraldogma.common.Entry;