Parse commented lines like an empty lines

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

.github/labels-manage.yml

@@ -118,7 +118,7 @@
   description: Something needs to get done
 - name: type/technical-debt
   color: D4C5F9
-  description: Techical Dept
+  description: Technical Dept
 - name: type/question
   color: D4C5F9
   description: Is a question

.github/workflows/ci-native.yml

@@ -0,0 +1,34 @@
+name: CI Native
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - nickname: linux jdk17
+            java: 17
+            os: ubuntu-latest
+          - nickname: macos jdk17
+            java: 17
+            os: macos-latest
+          - nickname: windows jdk17
+            java: 17
+            os: windows-latest
+    name: CI Build ${{ matrix.nickname }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: adopt
+          java-version: |
+            22
+            17
+          cache: gradle
+      - name: Build
+        run: ./gradlew build
+

.github/workflows/ci.yml

@@ -28,7 +28,9 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: ${{ matrix.java }}
+          java-version: |
+            22
+            17
           cache: gradle
       - name: Build
         run: ./gradlew build
@@ -41,21 +43,22 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 17
+          java-version: |
+            22
+            17
           cache: gradle
       - uses: jfrog/setup-jfrog-cli@v3
-        with:
-          version: 2.21.5
         env:
+          JF_URL: 'https://repo.spring.io'
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         run: |
-          jf rt gradlec \
+          jf gradlec \
             --use-wrapper \
             --uses-plugin \
             --deploy-ivy-desc=false \
-            --server-id-resolve repo.spring.io \
-            --server-id-deploy repo.spring.io \
+            --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+            --server-id-deploy=${{ vars.JF_SERVER_ID }} \
             --repo-resolve snapshot \
             --repo-deploy snapshot
           echo JFROG_CLI_BUILD_NAME=spring-shell-main >> $GITHUB_ENV
@@ -68,5 +71,5 @@ jobs:
           GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
         run: |
-          jf rt gradle build distZip artifactoryPublish
+          jf gradle build artifactoryPublish
           jf rt build-publish

.github/workflows/e2e.yml

@@ -16,7 +16,7 @@ jobs:
             graal: latest
             musl: false
           - nickname: macos
-            os: macos-12
+            os: macos-latest
             graal: latest
             musl: false
           - nickname: linux
@@ -34,7 +34,7 @@ jobs:
       - uses: graalvm/setup-graalvm@v1
         with:
           version: ${{ matrix.graal }}
-          java-version: 21
+          java-version: 22
           components: native-image
           native-image-musl: ${{ matrix.musl }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -74,9 +74,9 @@ jobs:
             nickname: win
           # - os: windows-2019
           #   nickname: win
-          - os: macos-12
+          - os: macos-14
             nickname: macos
-          - os: macos-11
+          - os: macos-15
             nickname: macos
           - os: ubuntu-22.04
             nickname: linux
@@ -93,12 +93,8 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 21
+          java-version: 22
           cache: gradle
-      - name: Use Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
       - uses: actions/setup-node@v2
         with:
           node-version: '16'

.github/workflows/release-ga.yml

@@ -14,23 +14,21 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: adopt
-        java-version: 17
-    - uses: jvalkeal/setup-maven@v1
-      with:
-        maven-version: 3.8.4
+        java-version: |
+          22
+          17
     - uses: jfrog/setup-jfrog-cli@v3
-      with:
-        version: 2.21.5
       env:
+        JF_URL: 'https://repo.spring.io'
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
-        jf rt gradlec \
+        jf gradlec \
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve repo.spring.io \
-          --server-id-deploy repo.spring.io \
+          --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+          --server-id-deploy=${{ vars.JF_SERVER_ID }} \
           --repo-resolve release \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
@@ -59,7 +57,7 @@ jobs:
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       run: |
-        jf rt gradle build distZip artifactoryPublish
+        jf gradle build artifactoryPublish
         jf rt build-publish
     - name: Push Release
       env:
@@ -81,9 +79,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: jfrog/setup-jfrog-cli@v3
-      with:
-        version: 2.21.5
       env:
+        JF_URL: 'https://repo.spring.io'
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
@@ -157,9 +154,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: jfrog/setup-jfrog-cli@v3
-      with:
-        version: 2.21.5
       env:
+        JF_URL: 'https://repo.spring.io'
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |

.github/workflows/release-milestone.yml

@@ -17,23 +17,21 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: adopt
-        java-version: 17
-    - uses: jvalkeal/setup-maven@v1
-      with:
-        maven-version: 3.8.4
+        java-version: |
+          22
+          17
     - uses: jfrog/setup-jfrog-cli@v3
-      with:
-        version: 2.21.5
       env:
+        JF_URL: 'https://repo.spring.io'
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
         jf rt gradlec \
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve repo.spring.io \
-          --server-id-deploy repo.spring.io \
+          --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+          --server-id-deploy=${{ vars.JF_SERVER_ID }} \
           --repo-resolve milestone \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV
@@ -63,7 +61,7 @@ jobs:
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       run: |
-        jf rt gradle build distZip artifactoryPublish
+        jf rt gradle build artifactoryPublish
         jf rt build-publish
     - name: Push Release
       env:
@@ -85,9 +83,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: jfrog/setup-jfrog-cli@v3
-      with:
-        version: 2.21.5
       env:
+        JF_URL: 'https://repo.spring.io'
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |

.github/workflows/schedule-e2e.yml

@@ -3,7 +3,7 @@ name: Schedule e2e
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1,3,5'
+    - cron: '0 0 * * 1,4'
 
 permissions:
   actions: write
@@ -14,7 +14,7 @@ jobs:
     if: github.repository_owner == 'spring-projects'
     strategy:
       matrix:
-        branch: [ main, 3.2.x, 3.1.x ]
+        branch: [ main, 3.3.x, 3.2.x ]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout

CONTRIBUTING.adoc

@@ -1,2 +1,6 @@
-If you have not previously done so, please fill out and
-submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+### Sign-off commits according to the Developer Certificate of Origin
+
+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](https://developercertificate.org).
+
+For additional details, please refer to the blog post [Hello DCO, Goodbye CLA: Simplifying Contributions to Spring](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring).
+

build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "base"
-	id 'org.springframework.shell.root'
 }
 
 description = 'Spring Shell'

buildSrc/build.gradle

@@ -26,7 +26,6 @@ dependencies {
 	implementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
 	implementation "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
 	implementation("org.springframework:spring-core")
-	implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
 	implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0'
 	implementation "org.graalvm.buildtools:native-gradle-plugin:${nativeBuildToolsVersion}"
 }
@@ -49,13 +48,13 @@ gradlePlugin {
 			id = "org.springframework.shell.docs"
 			implementationClass = "org.springframework.shell.gradle.DocsPlugin"
 		}
-		distPlugin {
-			id = "org.springframework.shell.root"
-			implementationClass = "org.springframework.shell.gradle.RootPlugin"
-		}
 		samplePlugin {
 			id = "org.springframework.shell.sample"
 			implementationClass = "org.springframework.shell.gradle.SamplePlugin"
 		}
+		toolchainPlugin {
+			id = "org.springframework.shell.toolchain"
+			implementationClass = "org.springframework.shell.gradle.ToolchainPlugin"
+		}
 	}
 }