From c4edc5a4f32edc278775bd6f07512719c71265e7 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Thu, 15 Jun 2023 16:35:00 +0200 Subject: [PATCH 1/2] Removes unnecessary @RunWith annotations (#2290) --- .../config/server/TransportConfigurationIntegrationTests.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java index e52b5293..9b1436a9 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java @@ -29,7 +29,6 @@ import org.eclipse.jgit.transport.SshTransport; import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.transport.sshd.SshdSessionFactory; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -42,7 +41,6 @@ import org.springframework.cloud.config.server.ssh.PropertyBasedSshSessionFactor import org.springframework.cloud.config.server.ssh.SshPropertyValidator; import org.springframework.cloud.config.server.test.TestConfigServerApplication; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -334,7 +332,6 @@ public class TransportConfigurationIntegrationTests { public static class CallbackWithHttpUrlsOnly { - @RunWith(SpringRunner.class) @SpringBootTest(classes = { TestConfigServerApplication.class, SshPropertyValidator.class }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.config.server.git.uri=https://gitserver.com/team/repo.git" }) @@ -364,7 +361,6 @@ public class TransportConfigurationIntegrationTests { } - @RunWith(SpringRunner.class) @SpringBootTest(classes = { TestConfigServerApplication.class, SshPropertyValidator.class }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.config.server.composite[0].type=git", From 9d7d7b3f5f5f9f0f680ff2f308bb21a23b2ff066 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 16 Jun 2023 12:44:23 +0200 Subject: [PATCH 2/2] Including Observability appendix only for non-release train docs --- docs/src/main/asciidoc/spring-cloud-config.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index bef1b15e..1f634393 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -2135,7 +2135,9 @@ WARNING: Since in AOT and native mode, configuration is being processed and the WARNING: Since Config Client connects to a running data source (such as Config Server) while starting up from native image, the quick startup time will be slowed down by the time required for this network communication to take place. +ifndef::releaseTrain[] [[appendix]] = Appendices include::_observability.adoc[] +endif::[]