From 03d1d1e945670eedf7652102cfe910408bb0cc19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:25:33 +0000 Subject: [PATCH 01/12] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index be4b92d..833dcbe 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -16,7 +16,7 @@ jobs: # if: github.repository_owner == 'spring-cloud' steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: docs-build fetch-depth: 1 From 5c26b3d603b05248c4067bc291fe573b0488be90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:26:04 +0000 Subject: [PATCH 02/12] Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.10 to 1.0.0-alpha.16. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.10...v1.0.0-alpha.16) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index c3570e2..5fb676b 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,6 +5,6 @@ "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.11.1", - "@springio/asciidoctor-extensions": "1.0.0-alpha.10" + "@springio/asciidoctor-extensions": "1.0.0-alpha.16" } } From d20e5080175916c34bc83eee7a067648161d313e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:26:05 +0000 Subject: [PATCH 03/12] Bump org.apache.maven:maven-model from 3.8.5 to 3.8.8 Bumps org.apache.maven:maven-model from 3.8.5 to 3.8.8. --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 64728d7..a651d41 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -14,7 +14,7 @@ ${basedir}/.. - 3.8.5 + 3.8.8 4.3.0 2.5.3 2.11.0 From 589d4a61fa852c08b400065a338ef9cd93b1f928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:26:09 +0000 Subject: [PATCH 04/12] Bump antora from 3.2.0-alpha.4 to 3.2.0-alpha.8 in /docs Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.4 to 3.2.0-alpha.8. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.4...v3.2.0-alpha.8) --- updated-dependencies: - dependency-name: antora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index c3570e2..4c4e338 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.4", + "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", From fa06b6714a69015d69e88ceb6e7e509ba695b742 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:52:27 +0000 Subject: [PATCH 05/12] Bump @antora/collector-extension from 1.0.0-alpha.3 to 1.0.1 in /docs --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 835bef3..e875169 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-alpha.3", + "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.11.1", "@springio/asciidoctor-extensions": "1.0.0-alpha.16" From b71ab4179fc21cf7e1332bc641e48062fda455a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:53:01 +0000 Subject: [PATCH 06/12] Bump com.github.jknack:handlebars from 4.3.0 to 4.3.1 Bumps [com.github.jknack:handlebars](https://github.com/jknack/handlebars.java) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/jknack/handlebars.java/releases) - [Commits](https://github.com/jknack/handlebars.java/compare/v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: com.github.jknack:handlebars dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index a651d41..c79630d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ ${basedir}/.. 3.8.8 - 4.3.0 + 4.3.1 2.5.3 2.11.0 From ef5b260004c37266037be34ff5d43806e7929dce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:54:35 +0000 Subject: [PATCH 07/12] Bump @springio/antora-extensions from 1.11.1 to 1.14.4 in /docs Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.11.1 to 1.14.4. - [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/antora-extensions/compare/v1.11.1...v1.14.4) --- updated-dependencies: - dependency-name: "@springio/antora-extensions" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index e875169..6c97a4c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,7 +4,7 @@ "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", - "@springio/antora-extensions": "1.11.1", + "@springio/antora-extensions": "1.14.4", "@springio/asciidoctor-extensions": "1.0.0-alpha.16" } } From 6a3acad90842c0da10c11fdae1b26e36d04f1377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 15:00:50 +0000 Subject: [PATCH 08/12] Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 6c97a4c..1e4c440 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,6 +5,6 @@ "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.4", - "@springio/asciidoctor-extensions": "1.0.0-alpha.16" + "@springio/asciidoctor-extensions": "1.0.0-alpha.17" } } From 3219366bc3276260b8b35b6b996b5e003f2771f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 14:19:06 +0000 Subject: [PATCH 09/12] Bump org.springframework.cloud:spring-cloud-gateway-dependencies Bumps org.springframework.cloud:spring-cloud-gateway-dependencies from 4.1.7-SNAPSHOT to 4.1.8-SNAPSHOT. --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-gateway-dependencies dependency-version: 4.1.8-SNAPSHOT dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- spring-cloud-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 02108a5..37363e5 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -24,7 +24,7 @@ 4.1.4-SNAPSHOT 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT - 4.1.7-SNAPSHOT + 4.1.8-SNAPSHOT 3.1.6-SNAPSHOT 4.1.6-SNAPSHOT 4.1.5-SNAPSHOT From 88575a7550cb66a2386648dfe1e416f0eeafbd4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 14:19:15 +0000 Subject: [PATCH 10/12] Bump org.springframework.cloud:spring-cloud-config-dependencies Bumps org.springframework.cloud:spring-cloud-config-dependencies from 4.1.6-SNAPSHOT to 4.1.7-SNAPSHOT. --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-config-dependencies dependency-version: 4.1.7-SNAPSHOT dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- spring-cloud-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 02108a5..0213126 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -20,7 +20,7 @@ 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT 3.1.5-SNAPSHOT - 4.1.6-SNAPSHOT + 4.1.7-SNAPSHOT 4.1.4-SNAPSHOT 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT From 917148d659b86a1dc38fca42a6cc27d7fb6cc219 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 4 Apr 2025 20:37:35 +0000 Subject: [PATCH 11/12] Bumping versions --- docs/modules/ROOT/pages/_spring-cloud-links.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 51f75ce..de51ef1 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -2,11 +2,11 @@ https://docs.spring.io/spring-cloud-bus/reference/4.1-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.1.4-SNAPSHOT https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.5-SNAPSHOT https://docs.spring.io/spring-cloud-commons/reference/4.1-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.1.6-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.6-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.7-SNAPSHOT https://docs.spring.io/spring-cloud-consul/reference/4.1-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.1.4-SNAPSHOT https://docs.spring.io/spring-cloud-contract/reference/4.1-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.1.6-SNAPSHOT https://docs.spring.io/spring-cloud-function/reference/4.1-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.1.6-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.7-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.8-SNAPSHOT https://docs.spring.io/spring-cloud-kubernetes/reference/3.1-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.6-SNAPSHOT https://docs.spring.io/spring-cloud-netflix/reference/4.1-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.1.6-SNAPSHOT https://docs.spring.io/spring-cloud-openfeign/reference/4.1-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.5-SNAPSHOT From 805792d36c0eb62ae7b174026b253f3430d1655e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 10 Apr 2025 11:42:05 -0400 Subject: [PATCH 12/12] Use Assert4J --- .../org/springframework/cloud/internal/ZipCategoryTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java b/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java index 49c675f..0b258bd 100644 --- a/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java +++ b/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java @@ -20,9 +20,10 @@ import java.io.File; import java.nio.file.Files; import org.assertj.core.api.BDDAssertions; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Fail.fail; + class ZipCategoryTests { @Test @@ -49,7 +50,7 @@ class ZipCategoryTests { // when: try { ZipCategory.unzipTo(zipFile, tempDir); - Assertions.fail("Should throw exception"); + fail("Should throw exception"); } catch (Exception e) { BDDAssertions.then(e.getCause()).hasMessageContaining("is trying to leave the target output directory");