From 723663f5f5ee541ee4c8b46e7225673402b470ad Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 16 Jan 2025 11:00:35 -0500 Subject: [PATCH 1/6] Updating README with DCO --- README.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index 3fc0e1c8..7ab72671 100644 --- a/README.adoc +++ b/README.adoc @@ -45,15 +45,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 From 2ba1c83c53081695c72024dcc53d170c38f28cfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:54:02 +0000 Subject: [PATCH 2/6] Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 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.14...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 567c1f3a..1e55982d 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.2", - "@springio/asciidoctor-extensions": "1.0.0-alpha.14" + "@springio/asciidoctor-extensions": "1.0.0-alpha.16" } } From 0dd547bbb457ceb161469a49d4b7e9c4b746e452 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 3 Feb 2025 10:37:51 -0500 Subject: [PATCH 3/6] Update maven.yml Signed-off-by: Ryan Baxter --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 558a34e1..fda5d2ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -7,7 +7,7 @@ on: push: branches: [ main, 3.1.x ] pull_request: - branches: [ main, 3.1.x ] + branches: [ main, 4.1.x, 3.1.x ] jobs: build: From 0663022a86a1d2de0fe8bc3fa9fe59ba05c12eab Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 3 Feb 2025 10:38:05 -0500 Subject: [PATCH 4/6] Update maven.yml Signed-off-by: Ryan Baxter --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fda5d2ce..f2239dd0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,7 +5,7 @@ name: Build on: push: - branches: [ main, 3.1.x ] + branches: [ main, 4.1.x, 3.1.x ] pull_request: branches: [ main, 4.1.x, 3.1.x ] From 6d41d203eee06732e2de6d85622a0a49ffa76dec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:40:24 +0000 Subject: [PATCH 5/6] Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0 Bumps org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0. --- updated-dependencies: - dependency-name: org.jruby:jruby-complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1332ece7..f41f93cc 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ deploy ${project.version} 2.5.13 - 9.4.8.0 + 9.4.11.0 jacoco From fbc2042e0e4a435e0762b1279f4fc3527437e5ea Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 4 Feb 2025 10:26:24 -0500 Subject: [PATCH 6/6] Reverting JRuby upgrade --- .github/workflows/maven.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f2239dd0..01f2e4d4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,4 +29,4 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Build with Maven - run: ./mvnw clean install -B -U -Pspring + run: ./mvnw clean install -Pdocs -B -U -Pspring diff --git a/pom.xml b/pom.xml index f41f93cc..fbd80b9b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ deploy ${project.version} 2.5.13 - 9.4.11.0 + 9.4.9.0 jacoco