diff --git a/examples/spring-boot-minimal-kotlin/src/test/resources/application-testbed.yml b/examples/spring-boot-minimal-kotlin/src/test/resources/application-testbed.yml index 4d61e856788..3a8514c0f45 100644 --- a/examples/spring-boot-minimal-kotlin/src/test/resources/application-testbed.yml +++ b/examples/spring-boot-minimal-kotlin/src/test/resources/application-testbed.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - # Disable the Web Server. # See https://docs.spring.io/spring-boot/docs/current/reference/html/howto-embedded-web-servers.html. spring.main.web-application-type: none diff --git a/examples/spring-boot-minimal/src/test/resources/application-testbed.yml b/examples/spring-boot-minimal/src/test/resources/application-testbed.yml index 4d61e856788..3a8514c0f45 100644 --- a/examples/spring-boot-minimal/src/test/resources/application-testbed.yml +++ b/examples/spring-boot-minimal/src/test/resources/application-testbed.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - # Disable the Web Server. # See https://docs.spring.io/spring-boot/docs/current/reference/html/howto-embedded-web-servers.html. spring.main.web-application-type: none diff --git a/examples/spring-boot-tomcat/src/main/resources/config/application.yml b/examples/spring-boot-tomcat/src/main/resources/config/application.yml index 65b732444bd..d369da7bf13 100644 --- a/examples/spring-boot-tomcat/src/main/resources/config/application.yml +++ b/examples/spring-boot-tomcat/src/main/resources/config/application.yml @@ -6,4 +6,4 @@ spring.config.activate.on-profile: local armeria: ports: - port: 8080 - protocol: HTTP + protocols: HTTP diff --git a/examples/spring-boot-tomcat/src/test/resources/application-testbed.yml b/examples/spring-boot-tomcat/src/test/resources/application-testbed.yml index 235debba937..b1c8f5f29ec 100644 --- a/examples/spring-boot-tomcat/src/test/resources/application-testbed.yml +++ b/examples/spring-boot-tomcat/src/test/resources/application-testbed.yml @@ -1,12 +1,7 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - # Prevent the embedded Tomcat from opening a TCP/IP port. server.port: -1 --- armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP diff --git a/examples/spring-boot-webflux/src/main/resources/config/application.yml b/examples/spring-boot-webflux/src/main/resources/config/application.yml index cbc1da5b8de..d5adc4ce2a9 100644 --- a/examples/spring-boot-webflux/src/main/resources/config/application.yml +++ b/examples/spring-boot-webflux/src/main/resources/config/application.yml @@ -12,4 +12,4 @@ armeria: - http - proxy - port: 8080 # Port 8080 will serve only HTTP. - protocol: http + protocols: http diff --git a/examples/spring-boot-webflux/src/test/resources/application-testbed.yml b/examples/spring-boot-webflux/src/test/resources/application-testbed.yml index a1f1113d14f..6dd1e607304 100644 --- a/examples/spring-boot-webflux/src/test/resources/application-testbed.yml +++ b/examples/spring-boot-webflux/src/test/resources/application-testbed.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - # Use a random port to avoid a potential port conflict. server: port: 0 diff --git a/it/spring/boot3-mixed-tomcat10/src/main/resources/config/application.yml b/it/spring/boot3-mixed-tomcat10/src/main/resources/config/application.yml index f444cc9f30a..4901d338333 100644 --- a/it/spring/boot3-mixed-tomcat10/src/main/resources/config/application.yml +++ b/it/spring/boot3-mixed-tomcat10/src/main/resources/config/application.yml @@ -1,4 +1,4 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP diff --git a/it/spring/boot3-mixed/src/main/resources/config/application.yml b/it/spring/boot3-mixed/src/main/resources/config/application.yml index f444cc9f30a..4901d338333 100644 --- a/it/spring/boot3-mixed/src/main/resources/config/application.yml +++ b/it/spring/boot3-mixed/src/main/resources/config/application.yml @@ -1,4 +1,4 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP diff --git a/it/spring/boot3-tomcat10/src/main/resources/config/application.yml b/it/spring/boot3-tomcat10/src/main/resources/config/application.yml index 67166fc59f4..70f70399462 100644 --- a/it/spring/boot3-tomcat10/src/main/resources/config/application.yml +++ b/it/spring/boot3-tomcat10/src/main/resources/config/application.yml @@ -1,7 +1,7 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP server: error: include-message: always diff --git a/it/spring/boot3-tomcat10/src/test/resources/application-healthGroupTest.yml b/it/spring/boot3-tomcat10/src/test/resources/application-healthGroupTest.yml index 2b44a4c4490..cc78089aa53 100644 --- a/it/spring/boot3-tomcat10/src/test/resources/application-healthGroupTest.yml +++ b/it/spring/boot3-tomcat10/src/test/resources/application-healthGroupTest.yml @@ -1,7 +1,7 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP management: server: diff --git a/site/src/pages/docs/advanced-dropwizard-integration.mdx b/site/src/pages/docs/advanced-dropwizard-integration.mdx index 2b84d83f8b6..88bb00f886a 100644 --- a/site/src/pages/docs/advanced-dropwizard-integration.mdx +++ b/site/src/pages/docs/advanced-dropwizard-integration.mdx @@ -118,7 +118,6 @@ server: protocols: - HTTPS - PROXY - ports: compression: enabled: true mimeTypes: diff --git a/site/src/pages/release-notes/0.83.0.mdx b/site/src/pages/release-notes/0.83.0.mdx index 6b52133c4ff..200197dd1ae 100644 --- a/site/src/pages/release-notes/0.83.0.mdx +++ b/site/src/pages/release-notes/0.83.0.mdx @@ -11,12 +11,12 @@ date: 2019-03-29 armeria: ports: - port: 8080 - protocol: HTTP + protocols: HTTP - ip: 127.0.0.1 port: 8081 - protocol:HTTP + protocols: HTTP - port: 8443 - protocol: HTTPS + protocols: HTTPS ssl: key-alias: "host.name.com" key-store: "keystore.jks" diff --git a/site/src/pages/release-notes/0.84.0.mdx b/site/src/pages/release-notes/0.84.0.mdx index cfcbdf3d8f8..4e586f6040f 100644 --- a/site/src/pages/release-notes/0.84.0.mdx +++ b/site/src/pages/release-notes/0.84.0.mdx @@ -123,7 +123,7 @@ date: 2019-04-23 armeria: ports: - port: 8080 - protocol: HTTP + protocols: HTTP compression: enabled: true mime-types: text/*, application/json diff --git a/spring/boot2-autoconfigure/src/test/resources/config/application-deprecatedIpTest.yml b/spring/boot2-autoconfigure/src/test/resources/config/application-deprecatedIpTest.yml index 1876681afc4..b363d9f8580 100644 --- a/spring/boot2-autoconfigure/src/test/resources/config/application-deprecatedIpTest.yml +++ b/spring/boot2-autoconfigure/src/test/resources/config/application-deprecatedIpTest.yml @@ -2,7 +2,7 @@ armeria: ports: - ip: 127.0.0.1 port: 0 - protocol: HTTP + protocols: HTTP - ip: 0.0.0.0 port: 0 - protocol: HTTP + protocols: HTTP diff --git a/spring/boot2-autoconfigure/src/test/resources/config/application-localhostAddressTest.yml b/spring/boot2-autoconfigure/src/test/resources/config/application-localhostAddressTest.yml index 9eba0dbd23c..299e588f4fc 100644 --- a/spring/boot2-autoconfigure/src/test/resources/config/application-localhostAddressTest.yml +++ b/spring/boot2-autoconfigure/src/test/resources/config/application-localhostAddressTest.yml @@ -2,4 +2,4 @@ armeria: ports: - address: localhost port: 0 - protocol: HTTP + protocols: HTTP diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-actuatorTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-actuatorTest.yml index 8f2897cb678..80875959934 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-actuatorTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-actuatorTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-allInternalServices.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-allInternalServices.yml index 9339e4ca0a8..2e05c4f9c87 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-allInternalServices.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-allInternalServices.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-autoConfTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-autoConfTest.yml index fdf714ea7e3..b44f04eda0e 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-autoConfTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-autoConfTest.yml @@ -1,13 +1,13 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP - address: 127.0.0.1 port: 0 - protocol: HTTP + protocols: HTTP - address: 0.0.0.0 port: 0 - protocol: HTTP + protocols: HTTP management: endpoints: diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathSamePortTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathSamePortTest.yml index 807707dd3a8..e830758d5c0 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathSamePortTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathSamePortTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathTest.yml index e6d1bbc4178..e4a97bce750 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathWithoutPortTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathWithoutPortTest.yml index 1ab8f693015..9f129dee8c8 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathWithoutPortTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-basePathWithoutPortTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-defaultInternalServices.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-defaultInternalServices.yml index 5856575a8f0..0b83b3e0eec 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-defaultInternalServices.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-defaultInternalServices.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-internalServiceTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-internalServiceTest.yml index 36922b300b4..bf42edcfb55 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-internalServiceTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-internalServiceTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-managedMetricPath.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-managedMetricPath.yml index 8a61e015e06..8e9262216aa 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-managedMetricPath.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-managedMetricPath.yml @@ -1,13 +1,13 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP - address: 127.0.0.1 port: 0 - protocol: HTTP + protocols: HTTP - address: 0.0.0.0 port: 0 - protocol: HTTP + protocols: HTTP metrics-path: '' management: diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-managementLocalhostTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-managementLocalhostTest.yml index b2c375948c2..a67d2ec53e7 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-managementLocalhostTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-managementLocalhostTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-secureTest.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-secureTest.yml index 319970154ec..ace65bc646f 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-secureTest.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-secureTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-actuator-autoconfigure/src/test/resources/application-ssl.yml b/spring/boot3-actuator-autoconfigure/src/test/resources/application-ssl.yml index be928928a0f..6232c9030f4 100644 --- a/spring/boot3-actuator-autoconfigure/src/test/resources/application-ssl.yml +++ b/spring/boot3-actuator-autoconfigure/src/test/resources/application-ssl.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - armeria: ports: - port: 0 diff --git a/spring/boot3-autoconfigure/src/main/java/com/linecorp/armeria/spring/ArmeriaSettings.java b/spring/boot3-autoconfigure/src/main/java/com/linecorp/armeria/spring/ArmeriaSettings.java index 83c30a67b53..7014f97f391 100644 --- a/spring/boot3-autoconfigure/src/main/java/com/linecorp/armeria/spring/ArmeriaSettings.java +++ b/spring/boot3-autoconfigure/src/main/java/com/linecorp/armeria/spring/ArmeriaSettings.java @@ -49,12 +49,12 @@ * armeria: * ports: * - port: 8080 - * protocol: HTTP + * protocols: HTTP * - address: 127.0.0.1 * port: 8081 - * protocol:HTTP + * protocols: HTTP * - port: 8443 - * protocol: HTTPS + * protocols: HTTPS * ssl: * key-alias: "host.name.com" * key-store: "keystore.jks" diff --git a/spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml b/spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml index 50710107301..b75ca780266 100644 --- a/spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml +++ b/spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml @@ -12,11 +12,11 @@ management: armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP - address: 127.0.0.1 port: 0 - protocol: HTTP + protocols: HTTP - address: 0.0.0.0 port: 0 - protocol: HTTP + protocols: HTTP enable-auto-injection: true diff --git a/spring/boot3-autoconfigure/src/test/resources/config/application-compressionTest.yml b/spring/boot3-autoconfigure/src/test/resources/config/application-compressionTest.yml index f9d7e893f56..2ac73c7cfaa 100644 --- a/spring/boot3-autoconfigure/src/test/resources/config/application-compressionTest.yml +++ b/spring/boot3-autoconfigure/src/test/resources/config/application-compressionTest.yml @@ -1,7 +1,7 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP compression: enabled: true mime-types: text/*, application/json diff --git a/spring/boot3-autoconfigure/src/test/resources/config/application-internalServiceTest.yml b/spring/boot3-autoconfigure/src/test/resources/config/application-internalServiceTest.yml index 4eae2fa9a51..00d404b51c0 100644 --- a/spring/boot3-autoconfigure/src/test/resources/config/application-internalServiceTest.yml +++ b/spring/boot3-autoconfigure/src/test/resources/config/application-internalServiceTest.yml @@ -1,8 +1,3 @@ -# Use-legacy-processing to use this application-testbed.yml file instead of application.yml -spring: - config: - use-legacy-processing: true - # Should not bind internal services to the management.server.port # if ArmeriaSpringActuatorAutoConfiguration was not configured. management.server.port: 0 diff --git a/spring/boot3-autoconfigure/src/test/resources/config/application-sslTest.yml b/spring/boot3-autoconfigure/src/test/resources/config/application-sslTest.yml index 8e5686431a9..4cdcceaf40c 100644 --- a/spring/boot3-autoconfigure/src/test/resources/config/application-sslTest.yml +++ b/spring/boot3-autoconfigure/src/test/resources/config/application-sslTest.yml @@ -1,9 +1,9 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP - port: 0 - protocol: HTTPS + protocols: HTTPS ssl: enabled: true # Use self-signed certificate because no key-store configuration is specified. # Make sure that port-based virtual host settings are compatible with Server Name Indication. diff --git a/spring/boot3-webflux-autoconfigure/src/test/resources/config/application-test_actuator.yml b/spring/boot3-webflux-autoconfigure/src/test/resources/config/application-test_actuator.yml index aa0d8ff9fe4..89b32a94446 100644 --- a/spring/boot3-webflux-autoconfigure/src/test/resources/config/application-test_actuator.yml +++ b/spring/boot3-webflux-autoconfigure/src/test/resources/config/application-test_actuator.yml @@ -1,7 +1,7 @@ armeria: ports: - port: 0 - protocol: HTTP + protocols: HTTP management: endpoints: