From ab76d94f6ed07e8c0c81229ec1d230a32c84f7e6 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 17 Jan 2025 11:09:03 +0000 Subject: [PATCH 1/3] Bumping versions --- README.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index e0b6427..9a257c0 100644 --- a/README.adoc +++ b/README.adoc @@ -39,15 +39,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 423cac0853d8693676f3388c29fa1240677a9701 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 20 Feb 2025 09:06:11 -0500 Subject: [PATCH 2/3] Create maven.yml Signed-off-by: Ryan Baxter --- .github/workflows/maven.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..af97a8b --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,32 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build + +on: + push: + branches: [ main, 2023.0.x ] + pull_request: + branches: [ main, 2023.0.x ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'temurin' + - name: Cache local Maven repository + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: ./mvnw clean install -Pdocs -B -U -Pspring From 0e25b5f7a2bcd074ffe4ca3e9757b6bd2cc1cf76 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 20 Feb 2025 09:07:55 -0500 Subject: [PATCH 3/3] Include 2024.0.x branch in actions --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index af97a8b..b400a89 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 2023.0.x ] + branches: [ main, 2024.0.x, 2023.0.x ] pull_request: - branches: [ main, 2023.0.x ] + branches: [ main, 2024.0.x, 2023.0.x ] jobs: build: