Merge 71202fe into 3.7.4

Signed-off-by: Violeta Georgieva <[email protected]>

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Setup JDK 21
-        if: contains('main 3.6.x', github.base_ref)
+        if: contains('main 3.6.x 3.7.x', github.base_ref)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'
@@ -75,7 +75,7 @@ jobs:
         distribution: 'temurin'
         java-version: 11
     - name: Setup Java 21
-      if: contains('main 3.6.x', github.base_ref)
+      if: contains('main 3.6.x 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'

.github/workflows/full.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ 3.6.x, main ]
+        branch: [ 3.6.x, 3.7.x, main ]
         test-type:
           - type: core
             arguments: ":reactor-core:test --no-daemon"
@@ -43,7 +43,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Setup Java 21
-        if: contains('main 3.6.x', matrix.branch)
+        if: contains('main 3.6.x 3.7.x', matrix.branch)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
         distribution: 'temurin'
         java-version: 11
     - name: Setup JDK 21
-      if: contains('main 3.6.x', github.base_ref)
+      if: contains('main 3.6.x 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -108,7 +108,7 @@ jobs:
         distribution: 'temurin'
         java-version: 11
     - name: Setup JDK 21
-      if: contains('main 3.6.x', github.base_ref)
+      if: contains('main 3.6.x 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -146,7 +146,7 @@ jobs:
         distribution: 'temurin'
         java-version: 11
     - name: Setup JDK 21
-      if: contains('main 3.6.x', github.base_ref)
+      if: contains('main 3.6.x 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -186,7 +186,7 @@ jobs:
         distribution: 'temurin'
         java-version: 11
     - name: Setup JDK 21
-      if: contains('main 3.6.x', github.base_ref)
+      if: contains('main 3.6.x 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'

.github/workflows/snapshots.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ 3.6.x, main ]
+        branch: [ 3.6.x, 3.7.x, main ]
         test-type:
           - type: core
             arguments: ":reactor-core:test --no-daemon -DuseSnapshotMicrometerVersion=true"
@@ -41,7 +41,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Setup Java 21
-        if: contains('main 3.6.x', matrix.branch)
+        if: contains('main 3.6.x 3.7.x', matrix.branch)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'

build.gradle

@@ -108,7 +108,7 @@ spotless {
 		enforceCheck false
 	}
 	else {
-		String spotlessBranch = "origin/main"
+		String spotlessBranch = "origin/3.7.x"
 		println "[Spotless] Local run detected, ratchet from $spotlessBranch"
 		ratchetFrom spotlessBranch
 	}