From f88c16d5072fadd7f04b09ff7e089aebd3ec623a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:01:01 +0000 Subject: [PATCH 01/23] Bump @antora/collector-extension 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 1c8155de..cff67975 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 364d666b28fbbc7a203a2da940ada71b8d5a3187 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 11 Nov 2024 19:48:22 +0000 Subject: [PATCH 02/23] Bumping versions --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 67da9462..c5436860 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.8 + 3.2.11 4.1.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 5254f874..fc163edd 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.8 + 3.2.11 UTF-8 - 3.2.8 + 3.2.11 3.0.1 From 92798697dfad9ac831f27090075bb1e53e9e1b54 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 14 Nov 2024 16:43:49 +0000 Subject: [PATCH 03/23] Bumping versions --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c5436860..f9040d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.11 + 3.2.12-SNAPSHOT 4.1.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index fc163edd..677fb939 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.11 + 3.2.12-SNAPSHOT UTF-8 - 3.2.11 + 3.2.12-SNAPSHOT 3.0.1 From df8b2f19be956464b49c76620b47d1aa4a9c2774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:52:56 +0000 Subject: [PATCH 04/23] Bump @antora/collector-extension 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 cff67975..2054ec1c 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.4", + "@antora/collector-extension": "1.0.0-beta.5", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From f8252da76f56df105fe295b5cf0bdb2bce7d35ef Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 19 Nov 2024 21:45:45 +0000 Subject: [PATCH 05/23] Bumping versions --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index eaaeca0b..3fc0e1c8 100644 --- a/README.adoc +++ b/README.adoc @@ -57,9 +57,9 @@ given the ability to merge pull requests. [[code-of-conduct]] == Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +unacceptable behavior to code-of-conduct@spring.io. [[code-conventions-and-housekeeping]] == Code Conventions and Housekeeping From a2f97093bb7bb7e5fb56fa3324316c9ea45805b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:06:01 +0000 Subject: [PATCH 06/23] Bump @antora/collector-extension 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 2054ec1c..e63fe532 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.5", + "@antora/collector-extension": "1.0.0-rc.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From d0a70a604102739fb756222a4a461702355b8fab Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 25 Nov 2024 23:28:37 +0000 Subject: [PATCH 07/23] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bd00dee6..5ebf0440 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-build diff --git a/pom.xml b/pom.xml index f9040d0b..cd3eca07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12-SNAPSHOT - 4.1.4-SNAPSHOT + 3.2.12 + 4.1.4 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 677fb939..8ff6cf45 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 - 3.2.12-SNAPSHOT + 3.2.12 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6bb5b67a..f90666b4 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 61324d15..18ac3cb7 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From bd1f12eafb8849ad8a58cedb2b794c5a3d63f966 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 25 Nov 2024 23:29:16 +0000 Subject: [PATCH 08/23] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5ebf0440..bd00dee6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index cd3eca07..f9040d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12 - 4.1.4 + 3.2.12-SNAPSHOT + 4.1.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 8ff6cf45..677fb939 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 - 3.2.12 + 3.2.12-SNAPSHOT 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index f90666b4..6bb5b67a 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 18ac3cb7..61324d15 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 300bb7373690b4598d1e699e606fd7e22cc21cae Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 25 Nov 2024 23:29:16 +0000 Subject: [PATCH 09/23] Bumping versions to 4.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bd00dee6..fb7bc3a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index f9040d0b..6455453b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.2.12-SNAPSHOT - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 677fb939..993d6fd8 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6bb5b67a..b55737c2 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 61324d15..e61a8830 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 23a6cde46adc164352a79e8bee777b0d51c9b598 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 25 Nov 2024 23:30:09 +0000 Subject: [PATCH 10/23] Bumping dependency versions after release --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6455453b..cc86df4c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12-SNAPSHOT + 3.2.12 4.1.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 993d6fd8..e45ad436 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 - 3.2.12-SNAPSHOT + 3.2.12 3.0.1 From 7de1ad71b0a492e3a9646e0fa483ae5ab05c65a5 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 21:46:00 +0000 Subject: [PATCH 11/23] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fb7bc3a7..bd00dee6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index cc86df4c..f9040d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12 - 4.1.5-SNAPSHOT + 3.2.12-SNAPSHOT + 4.1.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index e45ad436..677fb939 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 - 3.2.12 + 3.2.12-SNAPSHOT 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index b55737c2..6bb5b67a 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index e61a8830..61324d15 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From f461511f5951010c428bcc619a6a6f8dd8a3ed56 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 23:54:12 +0000 Subject: [PATCH 12/23] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bd00dee6..5ebf0440 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-build diff --git a/pom.xml b/pom.xml index f9040d0b..cd3eca07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12-SNAPSHOT - 4.1.4-SNAPSHOT + 3.2.12 + 4.1.4 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 677fb939..8ff6cf45 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 - 3.2.12-SNAPSHOT + 3.2.12 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6bb5b67a..f90666b4 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 61324d15..18ac3cb7 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 1f72bedc58a7036b18e772b062656c35582c1401 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 23:54:45 +0000 Subject: [PATCH 13/23] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5ebf0440..bd00dee6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index cd3eca07..f9040d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12 - 4.1.4 + 3.2.12-SNAPSHOT + 4.1.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 8ff6cf45..677fb939 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 - 3.2.12 + 3.2.12-SNAPSHOT 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index f90666b4..6bb5b67a 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 18ac3cb7..61324d15 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 6224049d86700d6f2a2e72155a707e547b799459 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 23:54:46 +0000 Subject: [PATCH 14/23] Bumping versions to 4.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bd00dee6..fb7bc3a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index f9040d0b..6455453b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.2.12-SNAPSHOT - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 677fb939..993d6fd8 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6bb5b67a..b55737c2 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 61324d15..e61a8830 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 05d62927e84e0cff566f14613592ac8f24ff2618 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 23:55:25 +0000 Subject: [PATCH 15/23] Bumping dependency versions after release --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6455453b..cc86df4c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 3.2.12-SNAPSHOT + 3.2.12 4.1.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 993d6fd8..e45ad436 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 - 3.2.12-SNAPSHOT + 3.2.12 3.0.1 From 3452f7ef303580a8c59a39b437df5cf7f2bf5394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:08:43 +0000 Subject: [PATCH 16/23] Bump @antora/collector-extension from 1.0.0-rc.1 to 1.0.0 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 e63fe532..a41cc3cb 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-rc.1", + "@antora/collector-extension": "1.0.0", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 519f8b1ce7d3c1869a7187229593073260c4da82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:37:56 +0000 Subject: [PATCH 17/23] Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.6 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.6...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 a41cc3cb..32d13e1e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.6", + "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0", "@asciidoctor/tabs": "1.0.0-beta.6", From 72d097b9d4a4d91bbf2c21cdc47430b67788deda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:37:59 +0000 Subject: [PATCH 18/23] Bump @antora/collector-extension from 1.0.0 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 a41cc3cb..b7f45b0e 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", + "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 9247268a016ca262a99a2ae60d2e53045e038949 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 9 Jan 2025 23:03:40 +0000 Subject: [PATCH 19/23] Update SNAPSHOT to 4.1.5 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fb7bc3a7..61b6f58e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.5 spring-cloud-build diff --git a/pom.xml b/pom.xml index cc86df4c..727a5411 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.5 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index e45ad436..771e0c91 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.5-SNAPSHOT + 4.1.5 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index b55737c2..eac80c7d 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index e61a8830..20b0f128 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.5 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From a47fdeca017b13ffd22f1f75b6635a879555da4e Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 9 Jan 2025 23:04:23 +0000 Subject: [PATCH 20/23] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 61b6f58e..fb7bc3a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5 + 4.1.5-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 727a5411..cc86df4c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.5 + 4.1.5-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.2.12 - 4.1.5 + 4.1.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 771e0c91..e45ad436 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.5 + 4.1.5-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index eac80c7d..b55737c2 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 20b0f128..e61a8830 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.5 + 4.1.5-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 1955e62152f5976713c8f42d5350ea06732b89e1 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 9 Jan 2025 23:04:24 +0000 Subject: [PATCH 21/23] Bumping versions to 4.1.6-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fb7bc3a7..aef53772 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index cc86df4c..1332ece7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.2.12 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index e45ad436..f1a77cff 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index b55737c2..01e477a2 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index e61a8830..93438f83 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 7e4315ed3c5b3cd61f5154884c71461e67de54fa Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 16 Jan 2025 10:44:32 -0500 Subject: [PATCH 22/23] Create dco.yml --- .github/dco.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/dco.yml diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 00000000..0c4b142e --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false From 2336c6dedbac77ef3ddd935c203066d8f0aaa61d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 16 Jan 2025 10:45:07 -0500 Subject: [PATCH 23/23] Changing CLA to DCO --- docs/modules/ROOT/partials/contributing.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/modules/ROOT/partials/contributing.adoc b/docs/modules/ROOT/partials/contributing.adoc index 28599a96..818d8f2e 100644 --- a/docs/modules/ROOT/partials/contributing.adoc +++ b/docs/modules/ROOT/partials/contributing.adoc @@ -6,15 +6,11 @@ tracker for issues and merging pull requests into main. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. -[[sign-the-contributor-license-agreement]] -== Sign the Contributor License Agreement +[[developer-certificate-of-origin]] +== Developer Certificate of Origin (DCO) -Before we accept a non-trivial patch or pull request we will need you to sign the -https://cla.pivotal.io/sign/spring[Contributor License Agreement]. -Signing the contributor's agreement does not grant anyone commit rights to the main -repository, but it does mean that we can accept your contributions, and you will get an -author credit if we do. Active contributors might be asked to join the core team, and -given the ability to merge pull requests. +All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin. +For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring]. [[code-of-conduct]] == Code of Conduct