CommandRegistration.Builder with lambdas

.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.yml

@@ -48,18 +48,17 @@ jobs:
             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
@@ -72,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 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
@@ -74,12 +74,10 @@ jobs:
             nickname: win
           # - os: windows-2019
           #   nickname: win
-          - os: macos-12
-            nickname: macos
-          - os: macos-13
-            nickname: macos
           - os: macos-14
             nickname: macos
+          - os: macos-15
+            nickname: macos
           - os: ubuntu-22.04
             nickname: linux
           - os: ubuntu-20.04
@@ -97,10 +95,6 @@ jobs:
           distribution: adopt
           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

@@ -17,22 +17,18 @@ jobs:
         java-version: |
           22
           17
-    - uses: jvalkeal/setup-maven@v1
-      with:
-        maven-version: 3.8.4
     - 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
@@ -61,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 artifactoryPublish
+        jf gradle build artifactoryPublish
         jf rt build-publish
     - name: Push Release
       env:
@@ -83,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: |
@@ -159,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

@@ -20,22 +20,18 @@ jobs:
         java-version: |
           22
           17
-    - uses: jvalkeal/setup-maven@v1
-      with:
-        maven-version: 3.8.4
     - 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
@@ -87,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: |

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).
+

e2e/spring-shell-e2e/package.json

@@ -36,7 +36,7 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "node-pty": "0.11.0-beta19",
-    "xterm-headless": "^4.18.0"
+    "node-pty": "^1.0.0",
+    "@xterm/headless": "^5.5.0"
   }
 }

gradle.properties

@@ -1,11 +1,11 @@
-version=3.4.0-SNAPSHOT
-springBootVersion=3.4.0-M3
-nativeBuildToolsVersion=0.10.1
-commonsIoVersion=2.11.0
-jlineVersion=3.26.3
-st4Version=4.3.3
-jimfsVersion=1.2
-gradleEnterpriseVersion=3.16.2
-springGeConventionsVersion=0.0.15
-findbugsVersion=3.0.2
+version=3.4.1-SNAPSHOT
+springBootVersion=3.5.0-SNAPSHOT
+nativeBuildToolsVersion=0.10.6
+commonsIoVersion=2.19.0
+jlineVersion=3.29.0
+st4Version=4.3.4
+jimfsVersion=1.3.0
+gradleEnterpriseVersion=3.19.2
+springGeConventionsVersion=0.0.17
 org.gradle.caching=true
+includeFfm=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -49,12 +49,18 @@ include 'spring-shell-table'
 include 'spring-shell-test'
 include 'spring-shell-test-autoconfigure'
 
+def ffm = settings.properties.hasProperty('includeFfm') && settings.properties.property('includeFfm').asBoolean()
+
 file("${rootDir}/spring-shell-starters").eachDirMatch(~/spring-shell-starter.*/) {
-	include "spring-shell-starters:${it.name}"
+	if((!it.name.endsWith('ffm') && !ffm) || ffm) { // skipping
+		include "spring-shell-starters:${it.name}"
+	}
 }
 
 file("${rootDir}/spring-shell-samples").eachDirMatch(~/spring-shell-sample.*/) {
-	include "spring-shell-samples:${it.name}"
+	if((!it.name.endsWith('ffm') && !ffm) || ffm) { // skipping
+		include "spring-shell-samples:${it.name}"
+	}
 }
 
 rootProject.children.each { project ->

spring-shell-autoconfigure/spring-shell-autoconfigure.gradle

@@ -10,6 +10,11 @@ dependencies {
 	implementation project(':spring-shell-core')
 	implementation project(':spring-shell-standard')
 	implementation project(':spring-shell-standard-commands')
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation('org.springframework.boot:spring-boot-test')
+	testImplementation('org.junit.jupiter:junit-jupiter-engine')
+	testImplementation('org.junit.jupiter:junit-jupiter-params')
+    testImplementation('org.junit.platform:junit-platform-launcher')
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation('org.assertj:assertj-core')
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 }

spring-shell-core/spring-shell-core.gradle

@@ -17,8 +17,12 @@ dependencies {
 	api('org.jline:jline-terminal')
 	api('org.antlr:ST4')
 	api('commons-io:commons-io')
-	compileOnly 'com.google.code.findbugs:jsr305'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation('org.springframework.boot:spring-boot-test')
+	testImplementation('org.junit.jupiter:junit-jupiter-engine')
+	testImplementation('org.junit.jupiter:junit-jupiter-params')
+    testImplementation('org.junit.platform:junit-platform-launcher')
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation('org.assertj:assertj-core')
 	testImplementation 'org.awaitility:awaitility'
 	testImplementation 'com.google.jimfs:jimfs'
 	testImplementation 'io.projectreactor:reactor-test'