From bde980808c045e0e2a50a6fc4d01ea7b9a4bbc6a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 21 Jan 2020 13:36:29 +0000 Subject: [PATCH 1/6] Bumping versions --- spring-cloud-commons-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 91baf391..85203d5c 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-commons-dependencies From b6ddff7d2e7f6a2f83062e50cdc56410205c81fd Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 21 Jan 2020 14:38:47 +0100 Subject: [PATCH 2/6] Added 2.2.x to the list of whitelisted branches --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index a3aa723a..b7161688 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,7 +16,7 @@ spring-cloud-commons ${basedir}/.. - 1.2.x,1.3.x,2.0.x,2.1.x + 1.2.x,1.3.x,2.0.x,2.1.x,2.2.x spring.cloud.* From 8b53f2862a6037f83fc8a06be1d803db45a97ff5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 15:45:03 -0500 Subject: [PATCH 3/6] Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation. Swaps with ConditionalOnAvailableEndpoint --- .../CommonsClientAutoConfiguration.java | 4 +-- .../ServiceRegistryAutoConfiguration.java | 4 +-- .../CommonsClientAutoConfigurationTests.java | 8 ++++-- ...veCommonsClientAutoConfigurationTests.java | 25 +++++++++++-------- .../RefreshEndpointAutoConfiguration.java | 9 +++---- ...eEnvironmentEndpointAutoConfiguration.java | 6 ++--- .../LifecycleMvcAutoConfigurationTests.java | 12 ++++++--- .../restart/RestartIntegrationTests.java | 1 + 8 files changed, 42 insertions(+), 27 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java index e5a2e86e..50c115bf 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java @@ -21,7 +21,7 @@ import java.util.List; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -93,7 +93,7 @@ public class CommonsClientAutoConfiguration { private List hasFeatures = new ArrayList<>(); @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public FeaturesEndpoint featuresEndpoint() { return new FeaturesEndpoint(this.hasFeatures); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java index 4b71800f..a48390c4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.cloud.client.serviceregistry; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -39,7 +39,7 @@ public class ServiceRegistryAutoConfiguration { private Registration registration; @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public ServiceRegistryEndpoint serviceRegistryEndpoint( ServiceRegistry serviceRegistry) { ServiceRegistryEndpoint endpoint = new ServiceRegistryEndpoint( diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java index 58b4475a..13b3ad0b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java @@ -51,6 +51,7 @@ public class CommonsClientAutoConfigurationTests { applicationContextRunner .withConfiguration( AutoConfigurations.of(HealthEndpointAutoConfiguration.class)) + .withPropertyValues("management.endpoints.web.exposure.include=features") .run(ctxt -> { then(ctxt.getBean(DiscoveryClientHealthIndicator.class)).isNotNull(); then(ctxt.getBean(DiscoveryCompositeHealthContributor.class)) @@ -63,7 +64,9 @@ public class CommonsClientAutoConfigurationTests { @Test public void disableAll() { applicationContextRunner - .withPropertyValues("spring.cloud.discovery.enabled=false").run(ctxt -> { + .withPropertyValues("spring.cloud.discovery.enabled=false", + "management.endpoints.web.exposure.include=features") + .run(ctxt -> { assertThat(ctxt) .doesNotHaveBean(DiscoveryClientHealthIndicator.class); assertThat(ctxt) @@ -77,7 +80,8 @@ public class CommonsClientAutoConfigurationTests { @Test public void disableBlocking() { applicationContextRunner - .withPropertyValues("spring.cloud.discovery.blocking.enabled=false") + .withPropertyValues("spring.cloud.discovery.blocking.enabled=false", + "management.endpoints.web.exposure.include=features") .run(ctxt -> { assertThat(ctxt) .doesNotHaveBean(DiscoveryClientHealthIndicator.class); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java index 46062f3d..5f35aecc 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java @@ -46,20 +46,24 @@ public class ReactiveCommonsClientAutoConfigurationTests { @Test public void beansCreatedNormally() { - applicationContextRunner.run(context -> { - then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class)) - .isNotNull(); - then(context.getBean(ReactiveDiscoveryCompositeHealthContributor.class)) - .isNotNull(); - then(context.getBean(FeaturesEndpoint.class)).isNotNull(); - then(context.getBeansOfType(HasFeatures.class).values()).isNotEmpty(); - }); + applicationContextRunner + .withPropertyValues("management.endpoints.web.exposure.include=features") + .run(context -> { + then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class)) + .isNotNull(); + then(context + .getBean(ReactiveDiscoveryCompositeHealthContributor.class)) + .isNotNull(); + then(context.getBean(FeaturesEndpoint.class)).isNotNull(); + then(context.getBeansOfType(HasFeatures.class).values()).isNotEmpty(); + }); } @Test public void disableAll() { applicationContextRunner - .withPropertyValues("spring.cloud.discovery.enabled=false") + .withPropertyValues("spring.cloud.discovery.enabled=false", + "management.endpoints.web.exposure.include=features") .run(context -> { assertThat(context).doesNotHaveBean( ReactiveDiscoveryClientHealthIndicator.class); @@ -74,7 +78,8 @@ public class ReactiveCommonsClientAutoConfigurationTests { @Test public void disableReactive() { applicationContextRunner - .withPropertyValues("spring.cloud.discovery.reactive.enabled=false") + .withPropertyValues("spring.cloud.discovery.reactive.enabled=false", + "management.endpoints.web.exposure.include=features") .run(context -> { assertThat(context).doesNotHaveBean( ReactiveDiscoveryClientHealthIndicator.class); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java index 39ad4a7e..5f66358c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.actuate.health.Health; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -87,7 +86,7 @@ class RestartEndpointWithIntegrationConfiguration { private IntegrationMBeanExporter exporter; @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint @ConditionalOnMissingBean public RestartEndpoint restartEndpoint() { RestartEndpoint endpoint = new RestartEndpoint(); @@ -104,7 +103,7 @@ class RestartEndpointWithIntegrationConfiguration { class RestartEndpointWithoutIntegrationConfiguration { @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint @ConditionalOnMissingBean public RestartEndpoint restartEndpointWithoutIntegration() { return new RestartEndpoint(); @@ -118,7 +117,7 @@ class PauseResumeEndpointsConfiguration { @Bean @ConditionalOnBean(RestartEndpoint.class) @ConditionalOnMissingBean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public RestartEndpoint.PauseEndpoint pauseEndpoint(RestartEndpoint restartEndpoint) { return restartEndpoint.getPauseEndpoint(); } @@ -126,7 +125,7 @@ class PauseResumeEndpointsConfiguration { @Bean @ConditionalOnBean(RestartEndpoint.class) @ConditionalOnMissingBean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public RestartEndpoint.ResumeEndpoint resumeEndpoint( RestartEndpoint restartEndpoint) { return restartEndpoint.getResumeEndpoint(); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index 73a11ef7..89ed88fb 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.cloud.autoconfigure; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointProperties; import org.springframework.boot.actuate.env.EnvironmentEndpoint; @@ -61,7 +61,7 @@ public class WritableEnvironmentEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public WritableEnvironmentEndpoint environmentEndpoint(Environment environment) { WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint( environment); @@ -73,7 +73,7 @@ public class WritableEnvironmentEndpointAutoConfiguration { } @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public WritableEnvironmentEndpointWebExtension environmentEndpointWebExtension( WritableEnvironmentEndpoint endpoint, EnvironmentManager environment) { return new WritableEnvironmentEndpointWebExtension(endpoint, environment); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java index 07ae7bc6..da657bfc 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java @@ -63,7 +63,8 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void environmentWebEndpointExtensionEnabled() { beanCreated("environmentEndpointWebExtension", - "management.endpoint.env.enabled=true"); + "management.endpoint.env.enabled=true", + "management.endpoints.web.exposure.include=env"); } // restartEndpoint @@ -80,7 +81,8 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void restartEndpointEnabled() { beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class, - RestartEndpoint::restart, "management.endpoint.restart.enabled=true"); + RestartEndpoint::restart, "management.endpoint.restart.enabled=true", + "management.endpoints.web.exposure.include=restart"); } // pauseEndpoint @@ -105,6 +107,7 @@ public class LifecycleMvcAutoConfigurationTests { beanCreatedAndEndpointEnabled("pauseEndpoint", RestartEndpoint.PauseEndpoint.class, RestartEndpoint.PauseEndpoint::pause, "management.endpoint.restart.enabled=true", + "management.endpoints.web.exposure.include=restart,pause", "management.endpoint.pause.enabled=true"); } @@ -112,12 +115,14 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void resumeEndpointDisabled() { beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=true", + "management.endpoints.web.exposure.include=restart", "management.endpoint.resume.enabled=false"); } @Test public void resumeEndpointRestartDisabled() { beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=false", + "management.endpoints.web.exposure.include=resume", "management.endpoint.resume.enabled=true"); } @@ -132,7 +137,8 @@ public class LifecycleMvcAutoConfigurationTests { RestartEndpoint.ResumeEndpoint.class, RestartEndpoint.ResumeEndpoint::resume, "management.endpoint.restart.enabled=true", - "management.endpoint.resume.enabled=true"); + "management.endpoint.resume.enabled=true", + "management.endpoints.web.exposure.include=restart,resume"); } private void beanNotCreated(String beanName, String... contextProperties) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java index 97856464..c2024b75 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java @@ -47,6 +47,7 @@ public class RestartIntegrationTests { this.context = SpringApplication.run(TestConfiguration.class, "--management.endpoint.restart.enabled=true", "--server.port=0", + "--management.endpoints.web.exposure.include=restart", "--spring.liveBeansView.mbeanDomain=livebeans"); RestartEndpoint endpoint = this.context.getBean(RestartEndpoint.class); From 55e7ce5103658d096c307b97d89f6f02fddac50b Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 15:52:35 -0500 Subject: [PATCH 4/6] Migrates to new OutputCaptureRule --- .../RefreshAutoConfigurationMoreClassPathTests.java | 4 ++-- .../cloud/autoconfigure/RefreshAutoConfigurationTests.java | 4 ++-- .../EnvironmentDecryptApplicationInitializerTests.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java index 84ea03c5..6e2d47d6 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.cloud.test.ClassPathExclusions; import org.springframework.cloud.test.ModifiedClassPathRunner; import org.springframework.context.ConfigurableApplicationContext; @@ -40,7 +40,7 @@ import static org.assertj.core.api.BDDAssertions.then; public class RefreshAutoConfigurationMoreClassPathTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); private static ConfigurableApplicationContext getApplicationContext( Class configuration, String... properties) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java index 315b78bc..17459422 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.cloud.context.refresh.ContextRefresher; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -38,7 +38,7 @@ import static org.assertj.core.api.BDDAssertions.then; public class RefreshAutoConfigurationTests { @Rule - public OutputCapture output = new OutputCapture(); + public OutputCaptureRule output = new OutputCaptureRule(); private static ConfigurableApplicationContext getApplicationContext( WebApplicationType type, Class configuration, String... properties) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java index 5638e769..4bf69df0 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java @@ -24,7 +24,7 @@ import java.util.Map; import org.junit.Rule; import org.junit.Test; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.util.TestPropertyValues.Type; import org.springframework.context.ApplicationContext; @@ -59,7 +59,7 @@ public class EnvironmentDecryptApplicationInitializerTests { Encryptors.noOpText()); @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void decryptCipherKey() { From 0ce1c3a741c4b9ede4723f466e5be29aca20d2dd Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 16:25:02 -0500 Subject: [PATCH 5/6] Migrates to new OutputCaptureRule --- .../CompatibilityVerifierFailureAutoConfigurationTests.java | 4 ++-- .../cloud/configuration/CompatibilityVerifierTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java index a050b4c8..b1c39fd4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.context.annotation.Configuration; import org.springframework.core.NestedExceptionUtils; @@ -35,7 +35,7 @@ import static org.assertj.core.api.BDDAssertions.then; public class CompatibilityVerifierFailureAutoConfigurationTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void contextFailsToLoad() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java index e896ecfe..2746d170 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java @@ -23,7 +23,7 @@ import org.assertj.core.api.BDDAssertions; import org.junit.Rule; import org.junit.Test; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import static org.assertj.core.api.BDDAssertions.then; @@ -33,7 +33,7 @@ import static org.assertj.core.api.BDDAssertions.then; public class CompatibilityVerifierTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void should_not_print_the_report_when_no_errors_were_found() { From eac5cde53ac46c78f8eca8f2b8ddbc4b92c550b2 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 21 Jan 2020 12:46:54 -0500 Subject: [PATCH 6/6] Removes unused branches --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index b7161688..24829392 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,7 +16,7 @@ spring-cloud-commons ${basedir}/.. - 1.2.x,1.3.x,2.0.x,2.1.x,2.2.x + 2.1.x,2.2.x spring.cloud.*