-
-
Save minwoox/5031e94835de5a3a11df066854bc639c to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/dependencies.yml b/dependencies.yml | |
| index 5cdc38a5..1f90bb61 100644 | |
| --- a/dependencies.yml | |
| +++ b/dependencies.yml | |
| @@ -6,11 +6,11 @@ boms: | |
| - com.fasterxml.jackson:jackson-bom:2.10.1 | |
| - io.dropwizard.metrics:metrics-bom:4.1.1 | |
| - io.grpc:grpc-bom:1.25.0 | |
| - - io.micrometer:micrometer-bom:1.3.1 | |
| + - io.micrometer:micrometer-bom:1.3.2 | |
| # NOTE: When changing this, re-evaluate netty-tcnative-boringssl-static below | |
| - io.netty:netty-bom:4.1.43.Final | |
| - - io.zipkin.brave:brave-bom:5.9.0 | |
| - - org.eclipse.jetty:jetty-bom:9.4.22.v20191022 | |
| + - io.zipkin.brave:brave-bom:5.9.1 | |
| + - org.eclipse.jetty:jetty-bom:9.4.24.v20191120 | |
| - org.junit:junit-bom:5.5.2 | |
| cglib: | |
| @@ -57,7 +57,7 @@ com.github.node-gradle: | |
| gradle-node-plugin: { version: '2.2.0' } | |
| com.google.api: | |
| - gax-grpc: { version: '1.50.1' } | |
| + gax-grpc: { version: '1.51.0' } | |
| com.google.code.findbugs: | |
| jsr305: { version: '3.0.2' } | |
| @@ -107,7 +107,7 @@ com.google.protobuf: | |
| protobuf-gradle-plugin: { version: '0.8.10' } | |
| com.puppycrawl.tools: | |
| - checkstyle: { version: '8.26' } | |
| + checkstyle: { version: '8.27' } | |
| com.spotify: | |
| completable-futures: | |
| @@ -156,13 +156,13 @@ io.grpc: | |
| io.micrometer: | |
| micrometer-core: | |
| javadocs: | |
| - - https://static.javadoc.io/io.micrometer/micrometer-core/1.3.1/ | |
| + - https://static.javadoc.io/io.micrometer/micrometer-core/1.3.2/ | |
| micrometer-registry-prometheus: | |
| javadocs: | |
| - - https://static.javadoc.io/io.micrometer/micrometer-registry-prometheus/1.3.1/ | |
| + - https://static.javadoc.io/io.micrometer/micrometer-registry-prometheus/1.3.2/ | |
| micrometer-spring-legacy: | |
| javadocs: | |
| - - https://static.javadoc.io/io.micrometer/micrometer-spring-legacy/1.3.1/ | |
| + - https://static.javadoc.io/io.micrometer/micrometer-spring-legacy/1.3.2/ | |
| exclusions: | |
| - org.springframework:spring-web | |
| - org.springframework:spring-webmvc | |
| @@ -176,7 +176,7 @@ io.netty: | |
| io.projectreactor: | |
| reactor-core: | |
| - version: &REACTOR_VERSION '3.3.0.RELEASE' | |
| + version: &REACTOR_VERSION '3.3.1.RELEASE' | |
| javadocs: | |
| - https://projectreactor.io/docs/core/release/api/ | |
| reactor-test: { version: *REACTOR_VERSION } | |
| @@ -189,7 +189,7 @@ io.prometheus: | |
| io.reactivex.rxjava2: | |
| rxjava: | |
| - version: '2.2.14' | |
| + version: '2.2.15' | |
| javadocs: | |
| - http://reactivex.io/RxJava/2.x/javadoc/ | |
| @@ -297,7 +297,7 @@ org.apache.thrift: | |
| org.apache.tomcat.embed: | |
| tomcat-embed-core: | |
| - version: &TOMCAT_VERSION '9.0.27' | |
| + version: &TOMCAT_VERSION '9.0.29' | |
| javadocs: | |
| - https://tomcat.apache.org/tomcat-9.0-doc/api/ | |
| tomcat-embed-jasper: { version: *TOMCAT_VERSION } | |
| @@ -368,7 +368,7 @@ org.jsoup: | |
| jsoup: { version: '1.12.1' } | |
| org.mockito: | |
| - mockito-core: { version: &MOCKITO_VERSION '3.1.0' } | |
| + mockito-core: { version: &MOCKITO_VERSION '3.2.0' } | |
| mockito-junit-jupiter: { version: *MOCKITO_VERSION } | |
| org.mortbay.jetty.alpn: | |
| @@ -413,7 +413,7 @@ org.slf4j: | |
| org.springframework.boot: | |
| spring-boot-starter: | |
| - version: &SPRING_BOOT_VERSION '2.1.10.RELEASE' | |
| + version: &SPRING_BOOT_VERSION '2.2.1.RELEASE' | |
| javadocs: | |
| - https://docs.spring.io/spring/docs/current/javadoc-api/ | |
| spring-boot-actuator-autoconfigure: { version: *SPRING_BOOT_VERSION } | |
| diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties | |
| index 562e2c88..1ba7206f 100644 | |
| --- a/gradle/wrapper/gradle-wrapper.properties | |
| +++ b/gradle/wrapper/gradle-wrapper.properties | |
| @@ -1,5 +1,5 @@ | |
| distributionBase=GRADLE_USER_HOME | |
| distributionPath=wrapper/dists | |
| -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip | |
| +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip | |
| zipStoreBase=GRADLE_USER_HOME | |
| zipStorePath=wrapper/dists | |
| diff --git a/it/spring/boot-tomcat8.5/build.gradle b/it/spring/boot-tomcat8.5/build.gradle | |
| index 60258ecd..fc33fb53 100644 | |
| --- a/it/spring/boot-tomcat8.5/build.gradle | |
| +++ b/it/spring/boot-tomcat8.5/build.gradle | |
| @@ -3,7 +3,8 @@ buildscript { | |
| mavenCentral() | |
| } | |
| dependencies { | |
| - classpath "org.springframework.boot:spring-boot-gradle-plugin:${managedVersions['org.springframework.boot:spring-boot-gradle-plugin']}" | |
| + // Spring Boot 2.2.x does not support Tomcat 8.5.x, so we fix the Spring Boot version to 2.1.x | |
| + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.10.RELEASE" | |
| } | |
| } | |
| @@ -13,7 +14,7 @@ apply plugin: 'org.springframework.boot' | |
| dependencyManagement { | |
| // Override Tomcat versions. | |
| dependencies { | |
| - dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.47') { | |
| + dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.49') { | |
| entry 'tomcat-embed-core' | |
| entry 'tomcat-embed-jasper' | |
| entry 'tomcat-embed-el' | |
| diff --git a/spring/boot-actuator-autoconfigure/src/main/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfiguration.java b/spring/boot-actuator-autoconfigure/src/main/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfiguration.java | |
| index d1ae99de..e9fc5315 100644 | |
| --- a/spring/boot-actuator-autoconfigure/src/main/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfiguration.java | |
| +++ b/spring/boot-actuator-autoconfigure/src/main/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfiguration.java | |
| @@ -75,10 +75,10 @@ import com.linecorp.armeria.spring.ArmeriaServerConfigurator; | |
| public class ArmeriaSpringActuatorAutoConfiguration { | |
| @VisibleForTesting | |
| - static final MediaType ACTUATOR_MEDIA_TYPE = MediaType.parse(ActuatorMediaType.V2_JSON); | |
| + static final MediaType ACTUATOR_MEDIA_TYPE = MediaType.parse(ActuatorMediaType.V3_JSON); | |
| private static final List<String> MEDIA_TYPES = | |
| - ImmutableList.of(ActuatorMediaType.V2_JSON, "application/json"); | |
| + ImmutableList.of(ActuatorMediaType.V3_JSON, "application/json"); | |
| private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); | |
| diff --git a/spring/boot-actuator-autoconfigure/src/test/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfigurationTest.java b/spring/boot-actuator-autoconfigure/src/test/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfigurationTest.java | |
| index 17cc8c9d..e945855a 100644 | |
| --- a/spring/boot-actuator-autoconfigure/src/test/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfigurationTest.java | |
| +++ b/spring/boot-actuator-autoconfigure/src/test/java/com/linecorp/armeria/spring/actuate/ArmeriaSpringActuatorAutoConfigurationTest.java | |
| @@ -156,7 +156,7 @@ public class ArmeriaSpringActuatorAutoConfigurationTest { | |
| public void testHealth_down() throws Exception { | |
| settableHealth.setHealth(Health.down().build()); | |
| final AggregatedHttpResponse res = client.get("/internal/actuator/health").aggregate().get(); | |
| - assertThat(res.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE); | |
| + assertThat(res.status()).isEqualTo(HttpStatus.OK); | |
| final Map<String, Object> values = OBJECT_MAPPER.readValue(res.content().array(), JSON_MAP); | |
| assertThat(values).containsEntry("status", "DOWN"); | |
| diff --git a/tomcat8.5/build.gradle b/tomcat8.5/build.gradle | |
| index 9db0ad15..a499c325 100644 | |
| --- a/tomcat8.5/build.gradle | |
| +++ b/tomcat8.5/build.gradle | |
| @@ -1,7 +1,7 @@ | |
| dependencyManagement { | |
| // Override Tomcat versions. | |
| dependencies { | |
| - dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.47') { | |
| + dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.49') { | |
| entry 'tomcat-embed-core' | |
| entry 'tomcat-embed-jasper' | |
| entry 'tomcat-embed-el' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment