From a7876333d3ac83963a69df69654c9b2e2ee374dc Mon Sep 17 00:00:00 2001 From: Maurice Zeijen Date: Thu, 12 Oct 2023 21:35:01 +0200 Subject: [PATCH 1/5] Fixed order of the `BootstrapConfigFileApplicationListener` so that it always runs after the `ConfigDataEnvironmentPostProcessor` (#1213) * Changed order of `BootstrapConfigFileApplicationListener` Previously `BootstrapConfigFileApplicationListener` had the same order as `ConfigDataEnvironmentPostProcessor`. This made it indeterminable which one would run first. However, the `BootstrapConfigFileApplicationListener` relies on the `ConfigDataEnvironmentPostProcessor` to make sure the `Environment.activeProfiles` are correctly set, so it must always run after the `ConfigDataEnvironmentPostProcessor`. * Using `Math.addExact` for adding one to the `ConfigDataEnvironmentPostProcessor.DEFAULT_ORDER` so that any accidental overflow results in an exception --- .../bootstrap/BootstrapConfigFileApplicationListener.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java index 323643ac..03c9893a 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java @@ -166,7 +166,10 @@ public class BootstrapConfigFileApplicationListener /** * The default order for the processor. */ - public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 10; + public static final int DEFAULT_ORDER = + // This listener needs to run after the `ConfigDataEnvironmentPostProcessor` to + // make sure the `Environment.activeProfiles` are correctly set + Math.addExact(ConfigDataEnvironmentPostProcessor.ORDER, 1); private final Log logger; From 1b8075e06ad73076d0c06670c312490835b0f205 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 12 Oct 2023 23:49:10 +0000 Subject: [PATCH 2/5] Bumping versions --- .../bootstrap/BootstrapConfigFileApplicationListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java index 03c9893a..74a37f3b 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java @@ -167,7 +167,8 @@ public class BootstrapConfigFileApplicationListener * The default order for the processor. */ public static final int DEFAULT_ORDER = - // This listener needs to run after the `ConfigDataEnvironmentPostProcessor` to + // This listener needs to run after the `ConfigDataEnvironmentPostProcessor` + // to // make sure the `Environment.activeProfiles` are correctly set Math.addExact(ConfigDataEnvironmentPostProcessor.ORDER, 1); From 5d0a442250559b06033230fbd1f048f55a6c0598 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 18 Oct 2023 12:01:56 -0400 Subject: [PATCH 3/5] Upgrade spring-security-rsa (#1290) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- spring-cloud-commons-dependencies/pom.xml | 2 +- spring-cloud-commons/pom.xml | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index a4a97651..941b345d 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-commons-dependencies Spring Cloud Commons Dependencies - 1.0.11.RELEASE + 1.0.12.RELEASE diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index fd136d5b..3aa9fa99 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -33,6 +33,34 @@ + + org.basepom.maven + duplicate-finder-maven-plugin + + + + org.bouncycastle + bcprov-jdk18on + 1.73 + + + org.bouncycastle + bcprov-jdk15on + 1.64 + + + org.bouncycastle + bcpkix-jdk18on + 1.73 + + + org.bouncycastle + bcpkix-jdk15on + 1.64 + + + + From 96006b51ba2d6b3e0a57ce698ef1e3840e1891f8 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:35:54 -0400 Subject: [PATCH 4/5] Fixing include in docs --- docs/src/main/asciidoc/README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index d9e35e9f..4d1deb96 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -4,8 +4,8 @@ include::intro.adoc[] == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[] From 511b7cae8c689bc9ab0605464600673c5af2594b Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:54:19 -0400 Subject: [PATCH 5/5] Exclude more dependencies from the duplicate finder plugin --- spring-cloud-commons/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index c2027864..d37b528c 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -58,6 +58,16 @@ bcpkix-jdk15on 1.64 + + org.apache.httpcomponents.client5 + httpclient5 + 5.1.4 + + + org.apache.httpcomponents + httpclient + 4.5.14 +