From 7dea727c813434e6b16f0e712693d37ee75fbe53 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 15 Jan 2025 13:08:39 +0100 Subject: [PATCH] Use micronaut.server.ssl.port (#11507) micronaut.ssl.port is deprecated --- .../io/micronaut/http/client/netty/PcapLoggingSpec.groovy | 2 +- .../io/micronaut/http/server/netty/PcapLoggingSpec.groovy | 2 +- .../http/server/netty/handler/accesslog/AccessLogSpec.groovy | 2 +- .../http/server/netty/http2/Http2ConcurrentStreamSpec.groovy | 2 +- .../java/io/micronaut/http/tck/EmbeddedServerUnderTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/http-client/src/test/groovy/io/micronaut/http/client/netty/PcapLoggingSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/netty/PcapLoggingSpec.groovy index 57c9c321fb0..cb52cd61831 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/netty/PcapLoggingSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/netty/PcapLoggingSpec.groovy @@ -21,7 +21,7 @@ class PcapLoggingSpec extends Specification { 'micronaut.http.client.pcap-logging-path-pattern': tmp.toString() + '/{localAddress}-{remoteAddress}-{qualifier}-{random}-{timestamp}.pcap', 'micronaut.ssl.enabled': true, 'micronaut.ssl.buildSelfSigned': true, - 'micronaut.ssl.port': -1, + 'micronaut.server.ssl.port': -1, 'micronaut.http.client.ssl.insecure-trust-all-certificates': true, ]) def server = ctx.getBean(EmbeddedServer) diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/PcapLoggingSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/PcapLoggingSpec.groovy index b1de9573924..acf516dca4f 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/PcapLoggingSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/PcapLoggingSpec.groovy @@ -21,7 +21,7 @@ class PcapLoggingSpec extends Specification { 'micronaut.server.netty.pcap-logging-path-pattern': tmp.toString() + '/{localAddress}-{remoteAddress}-{qualifier}-{random}-{timestamp}.pcap', 'micronaut.ssl.enabled': true, 'micronaut.ssl.buildSelfSigned': true, - 'micronaut.ssl.port': -1, + 'micronaut.server.ssl.port': -1, 'micronaut.http.client.ssl.insecure-trust-all-certificates': true, ]) def server = ctx.getBean(EmbeddedServer) diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/handler/accesslog/AccessLogSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/handler/accesslog/AccessLogSpec.groovy index 3c6c309a2e2..e11fad6d0a3 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/handler/accesslog/AccessLogSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/handler/accesslog/AccessLogSpec.groovy @@ -282,7 +282,7 @@ class AccessLogSpec extends Specification { 'spec.name': 'AccessLogSpec', 'micronaut.server.http-version': '2.0', 'micronaut.ssl.enabled': true, - 'micronaut.ssl.port': -1, + 'micronaut.server.ssl.port': -1, 'micronaut.ssl.buildSelfSigned': true, 'micronaut.server.netty.access-logger.enabled': true, 'micronaut.server.netty.access-logger.logger-name': 'http-access-log', diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2ConcurrentStreamSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2ConcurrentStreamSpec.groovy index f62d3281d02..5c30dd5b426 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2ConcurrentStreamSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2ConcurrentStreamSpec.groovy @@ -24,7 +24,7 @@ class Http2ConcurrentStreamSpec extends Specification { 'spec.name' : 'Http2ConcurrentStreamSpec', 'micronaut.server.http-version': '2.0', 'micronaut.ssl.enabled' : true, - 'micronaut.ssl.port' : -1, + 'micronaut.server.ssl.port' : -1, 'micronaut.ssl.buildSelfSigned': true, ]) def server = ctx.getBean(EmbeddedServer) diff --git a/http-tck/src/main/java/io/micronaut/http/tck/EmbeddedServerUnderTest.java b/http-tck/src/main/java/io/micronaut/http/tck/EmbeddedServerUnderTest.java index 5b5c6428fb9..0d61712ada3 100644 --- a/http-tck/src/main/java/io/micronaut/http/tck/EmbeddedServerUnderTest.java +++ b/http-tck/src/main/java/io/micronaut/http/tck/EmbeddedServerUnderTest.java @@ -46,7 +46,7 @@ public class EmbeddedServerUnderTest implements ServerUnderTest { public EmbeddedServerUnderTest(@NonNull Map properties) { properties.putIfAbsent("micronaut.server.port", -1); - properties.putIfAbsent("micronaut.ssl.port", -1); + properties.putIfAbsent("micronaut.server.ssl.port", -1); this.embeddedServer = ApplicationContext.run(EmbeddedServer.class, properties); this.isBlockingClient = (boolean) properties.getOrDefault(BLOCKING_CLIENT_PROPERTY, true); }