Skip to content

Commit 9bb3e5f

Browse files
authored
Revert "fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 (#1542)" (#1546)
1 parent 20d8d6d commit 9bb3e5f

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.common.collect.ImmutableMap;
1111
import com.linecorp.armeria.common.AggregatedHttpRequest;
1212
import com.linecorp.armeria.common.HttpResponse;
13-
import com.linecorp.armeria.common.TlsKeyPair;
1413
import com.linecorp.armeria.server.ServerBuilder;
1514
import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension;
1615
import com.linecorp.armeria.testing.junit5.server.ServerExtension;
@@ -69,7 +68,7 @@ static class HttpsServerTest {
6968
new ServerExtension() {
7069
@Override
7170
protected void configure(ServerBuilder sb) {
72-
sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile()));
71+
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
7372

7473
sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me"));
7574
}

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val otelInstrumentationVersion = "2.9.0-alpha"
1212
val DEPENDENCY_BOMS = listOf(
1313
"com.fasterxml.jackson:jackson-bom:2.18.1",
1414
"com.google.guava:guava-bom:33.3.1-jre",
15-
"com.linecorp.armeria:armeria-bom:1.31.0",
15+
"com.linecorp.armeria:armeria-bom:1.30.1",
1616
"org.junit:junit-bom:5.11.3",
1717
"io.grpc:grpc-bom:1.68.1",
1818
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",

0 commit comments

Comments
 (0)