Skip to content

Commit 9084a59

Browse files
fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 (#6877)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <[email protected]>
1 parent b482e76 commit 9084a59

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ val DEPENDENCY_BOMS = listOf(
1111
"com.fasterxml.jackson:jackson-bom:2.18.1",
1212
"com.google.guava:guava-bom:33.3.1-jre",
1313
"com.google.protobuf:protobuf-bom:3.25.5",
14-
"com.linecorp.armeria:armeria-bom:1.30.1",
14+
"com.linecorp.armeria:armeria-bom:1.31.0",
1515
"com.squareup.okhttp3:okhttp-bom:4.12.0",
1616
"com.squareup.okio:okio-bom:3.9.1", // applies to transitive dependencies of okhttp
1717
"io.grpc:grpc-bom:1.68.1",

exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.google.protobuf.InvalidProtocolBufferException;
1717
import com.google.protobuf.Message;
1818
import com.linecorp.armeria.common.HttpRequest;
19+
import com.linecorp.armeria.common.TlsKeyPair;
1920
import com.linecorp.armeria.common.grpc.protocol.ArmeriaStatusException;
2021
import com.linecorp.armeria.server.ServerBuilder;
2122
import com.linecorp.armeria.server.ServiceRequestContext;
@@ -137,7 +138,7 @@ protected void configure(ServerBuilder sb) {
137138

138139
sb.http(0);
139140
sb.https(0);
140-
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
141+
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
141142
sb.tlsCustomizer(ssl -> ssl.trustManager(clientCertificate.certificate()));
142143
sb.decorator(LoggingService.newDecorator());
143144
}

exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.linecorp.armeria.common.HttpStatus;
2020
import com.linecorp.armeria.common.MediaType;
2121
import com.linecorp.armeria.common.RequestHeaders;
22+
import com.linecorp.armeria.common.TlsKeyPair;
2223
import com.linecorp.armeria.server.HttpService;
2324
import com.linecorp.armeria.server.ServerBuilder;
2425
import com.linecorp.armeria.server.ServiceRequestContext;
@@ -144,7 +145,7 @@ protected void configure(ServerBuilder sb) {
144145

145146
sb.http(0);
146147
sb.https(0);
147-
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
148+
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
148149
sb.tlsCustomizer(ssl -> ssl.trustManager(clientCertificate.certificate()));
149150
sb.decorator(LoggingService.newDecorator());
150151
}

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static org.junit.jupiter.api.Named.named;
1313
import static org.junit.jupiter.params.provider.Arguments.arguments;
1414

15+
import com.linecorp.armeria.common.TlsKeyPair;
1516
import com.linecorp.armeria.common.grpc.protocol.ArmeriaStatusException;
1617
import com.linecorp.armeria.server.ServerBuilder;
1718
import com.linecorp.armeria.server.ServiceRequestContext;
@@ -117,7 +118,7 @@ protected CompletionStage<byte[]> handleMessage(
117118
});
118119
sb.http(0);
119120
sb.https(0);
120-
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
121+
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
121122
sb.tlsCustomizer(
122123
ssl -> {
123124
ssl.clientAuth(ClientAuth.OPTIONAL);

0 commit comments

Comments
 (0)