From 8925ab5e3fbbc056cfcc3136715e67e77d3ea43c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:19:03 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 3.1.1 --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- .../org/springframework/cloud/commons/util/IdUtils.java | 9 +++++---- .../springframework/cloud/commons/util/IdUtilsTests.java | 7 +++++-- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-bootstrap/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 16 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index b1c6306d..166e078f 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ Extract the files into the JDK/jre/lib/security folder for whichever version of == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 8eb89403..77d14b60 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 jar Spring Cloud Commons Docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 61f60ac9..f902f04e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.compatibility-verifier.compatible-boot-versions | `2.6.x` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} +|spring.cloud.compatibility-verifier.compatible-boot-versions | | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} |spring.cloud.compatibility-verifier.enabled | `false` | Enables creation of Spring Cloud compatibility verification. |spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. |spring.cloud.config.override-none | `false` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. diff --git a/pom.xml b/pom.xml index 403e2b41..e2c5f24a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 395a0b06..f25c6b55 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0 + 3.1.1 spring-cloud-commons-dependencies - 3.1.1-SNAPSHOT + 3.1.1 pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index d03509d7..891571be 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-commons diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java index e7bf3c10..a7689ecb 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java @@ -30,6 +30,7 @@ public final class IdUtils { public static final String DEFAULT_SERVICE_ID_STRING = "${vcap.application.name:${spring.application.name:application}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; public static final String DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING = "${vcap.application.name:${spring.application.name:application}:${spring.profiles.active}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; + // @checkstyle:on private IdUtils() { @@ -66,11 +67,13 @@ public final class IdUtils { */ public static String getResolvedServiceId(PropertyResolver resolver) { final String unresolvedServiceId; - // addition of active profiles at the 2nd position of the service ID breaks backwards-compatibility, + // addition of active profiles at the 2nd position of the service ID breaks + // backwards-compatibility, // so we fall back to the old implementation in case no profiles are active if (StringUtils.hasText(resolver.getProperty("spring.profiles.active"))) { unresolvedServiceId = getUnresolvedServiceIdWithActiveProfiles(); - } else { + } + else { unresolvedServiceId = getUnresolvedServiceId(); } return resolver.resolvePlaceholders(unresolvedServiceId); @@ -78,7 +81,6 @@ public final class IdUtils { /** * Gets the unresolved template for the service id without active profiles. - * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceId() { @@ -87,7 +89,6 @@ public final class IdUtils { /** * Gets the unresolved template for the service id including active profiles. - * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceIdWithActiveProfiles() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java index 0e5e7738..f11f68b3 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java @@ -116,7 +116,8 @@ public class IdUtilsTests { @Test public void testUnresolvedServiceIdWithActiveProfiles() { - then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING).isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); + then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING) + .isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); } @Test @@ -148,7 +149,8 @@ public class IdUtilsTests { env.setProperty("cachedrandom.springname.value", "123abc"); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); - // ensure that for spring.profiles.active, empty string value is equivalent to not being set at all + // ensure that for spring.profiles.active, empty string value is equivalent to not + // being set at all env.setProperty("spring.profiles.active", ""); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } @@ -179,4 +181,5 @@ public class IdUtilsTests { env.setProperty("spring.profiles.active", "123profile"); then("springname:123profile:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } + } diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 90d9d0c1..181dc4ae 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 28ccf79d..686b1865 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 27f30fdb..b5630ca9 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index a44d7208..729f4bb1 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 595bbcff..8f374e1a 100644 --- a/spring-cloud-starter-bootstrap/pom.xml +++ b/spring-cloud-starter-bootstrap/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 5efd01e9..e2beea8d 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index d992210a..8eaab4a6 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index c20b98f3..0e4efe41 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-test-support From 80338bc99b6d208363ef5ac5addea76eeb8ae436 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:21:01 +0000 Subject: [PATCH 2/5] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- .../org/springframework/cloud/commons/util/IdUtils.java | 9 ++++----- .../springframework/cloud/commons/util/IdUtilsTests.java | 7 ++----- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-bootstrap/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 16 files changed, 22 insertions(+), 26 deletions(-) diff --git a/README.adoc b/README.adoc index 166e078f..b1c6306d 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ Extract the files into the JDK/jre/lib/security folder for whichever version of == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 77d14b60..8eb89403 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index f902f04e..61f60ac9 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.compatibility-verifier.compatible-boot-versions | | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} +|spring.cloud.compatibility-verifier.compatible-boot-versions | `2.6.x` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} |spring.cloud.compatibility-verifier.enabled | `false` | Enables creation of Spring Cloud compatibility verification. |spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. |spring.cloud.config.override-none | `false` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. diff --git a/pom.xml b/pom.xml index e2c5f24a..403e2b41 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.1-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index f25c6b55..395a0b06 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1 + 3.1.0 spring-cloud-commons-dependencies - 3.1.1 + 3.1.1-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 891571be..d03509d7 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java index a7689ecb..e7bf3c10 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java @@ -30,7 +30,6 @@ public final class IdUtils { public static final String DEFAULT_SERVICE_ID_STRING = "${vcap.application.name:${spring.application.name:application}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; public static final String DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING = "${vcap.application.name:${spring.application.name:application}:${spring.profiles.active}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; - // @checkstyle:on private IdUtils() { @@ -67,13 +66,11 @@ public final class IdUtils { */ public static String getResolvedServiceId(PropertyResolver resolver) { final String unresolvedServiceId; - // addition of active profiles at the 2nd position of the service ID breaks - // backwards-compatibility, + // addition of active profiles at the 2nd position of the service ID breaks backwards-compatibility, // so we fall back to the old implementation in case no profiles are active if (StringUtils.hasText(resolver.getProperty("spring.profiles.active"))) { unresolvedServiceId = getUnresolvedServiceIdWithActiveProfiles(); - } - else { + } else { unresolvedServiceId = getUnresolvedServiceId(); } return resolver.resolvePlaceholders(unresolvedServiceId); @@ -81,6 +78,7 @@ public final class IdUtils { /** * Gets the unresolved template for the service id without active profiles. + * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceId() { @@ -89,6 +87,7 @@ public final class IdUtils { /** * Gets the unresolved template for the service id including active profiles. + * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceIdWithActiveProfiles() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java index f11f68b3..0e5e7738 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java @@ -116,8 +116,7 @@ public class IdUtilsTests { @Test public void testUnresolvedServiceIdWithActiveProfiles() { - then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING) - .isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); + then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING).isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); } @Test @@ -149,8 +148,7 @@ public class IdUtilsTests { env.setProperty("cachedrandom.springname.value", "123abc"); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); - // ensure that for spring.profiles.active, empty string value is equivalent to not - // being set at all + // ensure that for spring.profiles.active, empty string value is equivalent to not being set at all env.setProperty("spring.profiles.active", ""); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } @@ -181,5 +179,4 @@ public class IdUtilsTests { env.setProperty("spring.profiles.active", "123profile"); then("springname:123profile:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } - } diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 181dc4ae..90d9d0c1 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 686b1865..28ccf79d 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index b5630ca9..27f30fdb 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 729f4bb1..a44d7208 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 8f374e1a..595bbcff 100644 --- a/spring-cloud-starter-bootstrap/pom.xml +++ b/spring-cloud-starter-bootstrap/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index e2beea8d..5efd01e9 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 8eaab4a6..d992210a 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 0e4efe41..c20b98f3 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-test-support From 7b8e7d905092828e5f91a0f7247b29e81cff8764 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:21:01 +0000 Subject: [PATCH 3/5] Bumping versions to 3.1.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-bootstrap/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8eb89403..5432f2ed 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 403e2b41..b72062ff 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 395a0b06..9187de84 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0 + 3.1.2-SNAPSHOT spring-cloud-commons-dependencies - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index d03509d7..569efd0b 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 90d9d0c1..3b1e4325 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 28ccf79d..69893609 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 27f30fdb..498ece68 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index a44d7208..ea09644b 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 595bbcff..0bead122 100644 --- a/spring-cloud-starter-bootstrap/pom.xml +++ b/spring-cloud-starter-bootstrap/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 5efd01e9..ce9846f3 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index d992210a..6bf2db0e 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index c20b98f3..86e00de4 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-test-support From 64b0d17e0b895581f65eb59639fc19fdb86f52bf Mon Sep 17 00:00:00 2001 From: Neil Powell <52715665+neiljpowell@users.noreply.github.com> Date: Fri, 18 Feb 2022 06:05:59 -0600 Subject: [PATCH 4/5] Support uri without port for default service instance (#1054) --- .../cloud/client/DefaultServiceInstance.java | 9 ++++++-- .../simple/SimpleDiscoveryClientTests.java | 22 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index 89b200af..53d182ec 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -27,6 +27,7 @@ import java.util.Objects; * @author Spencer Gibb * @author Tim Ysewyn * @author Charu Covindane + * @author Neil Powell */ public class DefaultServiceInstance implements ServiceInstance { @@ -79,11 +80,15 @@ public class DefaultServiceInstance implements ServiceInstance { /** * Creates a URI from the given ServiceInstance's host:port. * @param instance the ServiceInstance. - * @return URI of the form (secure)?https:http + "host:port". + * @return URI of the form (secure)?https:http + "host:port". Scheme port default used if port not set. */ public static URI getUri(ServiceInstance instance) { String scheme = (instance.isSecure()) ? "https" : "http"; - String uri = String.format("%s://%s:%s", scheme, instance.getHost(), instance.getPort()); + int port = instance.getPort(); + if (port <= 0) { + port = (instance.isSecure()) ? 443 : 80; + } + String uri = String.format("%s://%s:%s", scheme, instance.getHost(), port); return URI.create(uri); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java index 82944a11..06c7d3e0 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.BDDAssertions.then; /** * @author Biju Kunjummen * @author Charu Covindane + * @author Neil Powell */ public class SimpleDiscoveryClientTests { @@ -44,8 +45,9 @@ public class SimpleDiscoveryClientTests { Map> map = new HashMap<>(); DefaultServiceInstance service1Inst1 = new DefaultServiceInstance(null, null, "host1", 8080, false); - DefaultServiceInstance service1Inst2 = new DefaultServiceInstance(null, null, "host2", 8443, true); - map.put("service1", Arrays.asList(service1Inst1, service1Inst2)); + DefaultServiceInstance service1Inst2 = new DefaultServiceInstance(null, null, "host2", 0, true); + DefaultServiceInstance service1Inst3 = new DefaultServiceInstance(null, null, "host3", 0, false); + map.put("service1", Arrays.asList(service1Inst1, service1Inst2, service1Inst3)); simpleDiscoveryProperties.setInstances(map); simpleDiscoveryProperties.init(); this.simpleDiscoveryClient = new SimpleDiscoveryClient(simpleDiscoveryProperties); @@ -54,13 +56,27 @@ public class SimpleDiscoveryClientTests { @Test public void shouldBeAbleToRetrieveServiceDetailsByName() { List instances = this.simpleDiscoveryClient.getInstances("service1"); - then(instances.size()).isEqualTo(2); + then(instances.size()).isEqualTo(3); then(instances.get(0).getServiceId()).isEqualTo("service1"); then(instances.get(0).getHost()).isEqualTo("host1"); then(instances.get(0).getPort()).isEqualTo(8080); then(instances.get(0).getUri()).isEqualTo(URI.create("http://host1:8080")); then(instances.get(0).isSecure()).isEqualTo(false); then(instances.get(0).getMetadata()).isNotNull(); + + then(instances.get(1).getServiceId()).isEqualTo("service1"); + then(instances.get(1).getHost()).isEqualTo("host2"); + then(instances.get(1).getPort()).isEqualTo(0); + then(instances.get(1).getUri()).isEqualTo(URI.create("https://host2:443")); + then(instances.get(1).isSecure()).isEqualTo(true); + then(instances.get(1).getMetadata()).isNotNull(); + + then(instances.get(2).getServiceId()).isEqualTo("service1"); + then(instances.get(2).getHost()).isEqualTo("host3"); + then(instances.get(2).getPort()).isEqualTo(0); + then(instances.get(2).getUri()).isEqualTo(URI.create("http://host3:80")); + then(instances.get(2).isSecure()).isEqualTo(false); + then(instances.get(2).getMetadata()).isNotNull(); } } From 9c3620b77227487f4465d300a8916cf501730fd3 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 18 Feb 2022 13:16:17 +0100 Subject: [PATCH 5/5] Reformat and regenerate docs. --- README.adoc | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 +- .../cloud/client/DefaultServiceInstance.java | 5 +++-- .../org/springframework/cloud/commons/util/IdUtils.java | 9 +++++---- .../discovery/simple/SimpleDiscoveryClientTests.java | 2 +- .../springframework/cloud/commons/util/IdUtilsTests.java | 7 +++++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index b1c6306d..166e078f 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ Extract the files into the JDK/jre/lib/security folder for whichever version of == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 61f60ac9..f902f04e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.compatibility-verifier.compatible-boot-versions | `2.6.x` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} +|spring.cloud.compatibility-verifier.compatible-boot-versions | | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} |spring.cloud.compatibility-verifier.enabled | `false` | Enables creation of Spring Cloud compatibility verification. |spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. |spring.cloud.config.override-none | `false` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index 53d182ec..53695c61 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -80,13 +80,14 @@ public class DefaultServiceInstance implements ServiceInstance { /** * Creates a URI from the given ServiceInstance's host:port. * @param instance the ServiceInstance. - * @return URI of the form (secure)?https:http + "host:port". Scheme port default used if port not set. + * @return URI of the form (secure)?https:http + "host:port". Scheme port default used + * if port not set. */ public static URI getUri(ServiceInstance instance) { String scheme = (instance.isSecure()) ? "https" : "http"; int port = instance.getPort(); if (port <= 0) { - port = (instance.isSecure()) ? 443 : 80; + port = (instance.isSecure()) ? 443 : 80; } String uri = String.format("%s://%s:%s", scheme, instance.getHost(), port); return URI.create(uri); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java index e7bf3c10..a7689ecb 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java @@ -30,6 +30,7 @@ public final class IdUtils { public static final String DEFAULT_SERVICE_ID_STRING = "${vcap.application.name:${spring.application.name:application}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; public static final String DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING = "${vcap.application.name:${spring.application.name:application}:${spring.profiles.active}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}"; + // @checkstyle:on private IdUtils() { @@ -66,11 +67,13 @@ public final class IdUtils { */ public static String getResolvedServiceId(PropertyResolver resolver) { final String unresolvedServiceId; - // addition of active profiles at the 2nd position of the service ID breaks backwards-compatibility, + // addition of active profiles at the 2nd position of the service ID breaks + // backwards-compatibility, // so we fall back to the old implementation in case no profiles are active if (StringUtils.hasText(resolver.getProperty("spring.profiles.active"))) { unresolvedServiceId = getUnresolvedServiceIdWithActiveProfiles(); - } else { + } + else { unresolvedServiceId = getUnresolvedServiceId(); } return resolver.resolvePlaceholders(unresolvedServiceId); @@ -78,7 +81,6 @@ public final class IdUtils { /** * Gets the unresolved template for the service id without active profiles. - * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceId() { @@ -87,7 +89,6 @@ public final class IdUtils { /** * Gets the unresolved template for the service id including active profiles. - * * @return The combination of properties to create a unique service id. */ public static String getUnresolvedServiceIdWithActiveProfiles() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java index 06c7d3e0..a7dc032c 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java @@ -70,7 +70,7 @@ public class SimpleDiscoveryClientTests { then(instances.get(1).getUri()).isEqualTo(URI.create("https://host2:443")); then(instances.get(1).isSecure()).isEqualTo(true); then(instances.get(1).getMetadata()).isNotNull(); - + then(instances.get(2).getServiceId()).isEqualTo("service1"); then(instances.get(2).getHost()).isEqualTo("host3"); then(instances.get(2).getPort()).isEqualTo(0); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java index 0e5e7738..f11f68b3 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java @@ -116,7 +116,8 @@ public class IdUtilsTests { @Test public void testUnresolvedServiceIdWithActiveProfiles() { - then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING).isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); + then(IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING) + .isEqualTo(IdUtils.getUnresolvedServiceIdWithActiveProfiles()); } @Test @@ -148,7 +149,8 @@ public class IdUtilsTests { env.setProperty("cachedrandom.springname.value", "123abc"); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); - // ensure that for spring.profiles.active, empty string value is equivalent to not being set at all + // ensure that for spring.profiles.active, empty string value is equivalent to not + // being set at all env.setProperty("spring.profiles.active", ""); then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } @@ -179,4 +181,5 @@ public class IdUtilsTests { env.setProperty("spring.profiles.active", "123profile"); then("springname:123profile:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } + }