From 10a3976fd5da6f4d1ce773f8e922b74fe591ff7c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 31 Oct 2024 15:43:09 -0400 Subject: [PATCH 1/4] Only ignore profile activation and inclusion if the property source is profile specific (#2613) --- .../client/ConfigServerConfigDataLoader.java | 2 +- .../ConfigServerConfigDataLoaderTests.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java index edd4bc90..8b4fb439 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java @@ -159,7 +159,6 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader options = new ArrayList<>(); options.add(Option.IGNORE_IMPORTS); - options.add(Option.IGNORE_PROFILES); // TODO: the profile is now available on the backend // in a future minor, add the profile associated with a // PropertySource see @@ -180,6 +179,7 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader Date: Mon, 4 Nov 2024 08:46:20 -0500 Subject: [PATCH 2/4] Bump mikepenz/action-junit-report from 4 to 5 (#2620) Bumps [mikepenz/action-junit-report](https://github.com/mikepenz/action-junit-report) from 4 to 5. - [Release notes](https://github.com/mikepenz/action-junit-report/releases) - [Commits](https://github.com/mikepenz/action-junit-report/compare/v4...v5) --- updated-dependencies: - dependency-name: mikepenz/action-junit-report dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 96e8b1d4..e24c718d 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -31,7 +31,7 @@ jobs: - name: Build with Maven run: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: always() # always run even if the previous step fails with: report_paths: '**/surefire-reports/TEST-*.xml' From d8bd989d1311eb467feb562a722a955d31644796 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:48:16 -0500 Subject: [PATCH 3/4] Bump @antora/collector-extension in /docs (#2617) --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index ce2335c3..e4aad62b 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.3", + "@antora/collector-extension": "1.0.0-beta.4", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 77d3f5857c621c6f35eb8bf5f9e609fe9250f582 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 6 Nov 2024 15:36:12 -0500 Subject: [PATCH 4/4] Remove unused badges --- docs/src/main/asciidoc/README.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index ad621481..1177a219 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,6 +1,4 @@ -image::https://circleci.com/gh/spring-cloud/spring-cloud-config/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-config/tree/master"] image::https://codecov.io/gh/spring-cloud/spring-cloud-config/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-config/branch/master"] -image::https://api.codacy.com/project/badge/Grade/f064024a072c477e97dca6ed5a70fccd?branch=master["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-config?branch=master&utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-config&utm_campaign=Badge_Grade"] [[features]]