fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.3…

…1.0 (open-telemetry#1542) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
ing-bank · Nov 14, 2024 · 0b7233e · 0b7233e
1 parent 74a3d78
commit 0b7233e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java
@@ -10,6 +10,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.linecorp.armeria.common.AggregatedHttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
+import com.linecorp.armeria.common.TlsKeyPair;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension;
 import com.linecorp.armeria.testing.junit5.server.ServerExtension;
@@ -68,7 +69,7 @@ static class HttpsServerTest {
         new ServerExtension() {
           @Override
           protected void configure(ServerBuilder sb) {
-            sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
+            sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile()));
 
             sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me"));
           }

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -12,7 +12,7 @@ val otelInstrumentationVersion = "2.9.0-alpha"
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.18.1",
   "com.google.guava:guava-bom:33.3.1-jre",
-  "com.linecorp.armeria:armeria-bom:1.30.1",
+  "com.linecorp.armeria:armeria-bom:1.31.0",
   "org.junit:junit-bom:5.11.3",
   "io.grpc:grpc-bom:1.68.1",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",