Branch for 2.1.x series

spring-cloud · Oct 5, 2023 · d10f9dc · d10f9dc
1 parent 4a10971
commit d10f9dc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,13 +3,33 @@ updates:
   - package-ecosystem: gradle
     directory: "/"
     target-branch: "main"
+    schedule:
+      interval: daily
+    commit-message:
+      prefix: "(2.2.x)"
+    milestone: 30
+    labels:
+      - dependencies
+
+  - package-ecosystem: gradle
+    directory: "/"
+    target-branch: "2.1.x"
     schedule:
       interval: daily
     commit-message:
       prefix: "(2.1.x)"
     milestone: 29
     labels:
       - dependencies
+    ignore:
+      - dependency-name: "org.springframework.boot:*"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+      - dependency-name: "spring-cloud-starter-open-service-broker"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
 
   - package-ecosystem: gradle
     directory: "/"

diff --git a/README.adoc b/README.adoc
@@ -19,6 +19,15 @@ Join us in our gitter channel: https://gitter.im/spring-cloud-app-broker/communi
 
 === Compatibility
 
+==== 2.2.x
+
+* https://projects.spring.io/spring-framework/[Spring Framework] 6.0.x
+* https://projects.spring.io/spring-boot/[Spring Boot] 3.1.x
+* https://github.com/cloudfoundry/cf-java-client/[Cloud Foundry Java Client] 5.x
+* https://github.com/reactor/[Reactor] 2022.0.0
+* https://spring.io/projects/spring-cloud-open-service-broker/[Spring Cloud Open Service Broker] 4.1.x
+* https://github.com/openservicebrokerapi/servicebroker/tree/v2.16/[Open Service Broker API] 2.16
+
 ==== 2.1.x
 
 * https://projects.spring.io/spring-framework/[Spring Framework] 6.0.x

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.1.0-SNAPSHOT
+version=2.2.0-SNAPSHOT
 group=org.springframework.cloud
 
 onlyShowStandardStreamsOnTestFailure = false

diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh
@@ -10,7 +10,7 @@ readonly PIPELINE_TYPE=${1:-""}
 
 set_branch_pipeline() {
   local -r pipeline_name="app-broker${PIPELINE_NAME_SUFFIX:+"-$PIPELINE_NAME_SUFFIX"}"
-  local -r branches=("main" "2.0.x" "1.6.x" "1.5.x")
+  local -r branches=("main" "2.1.x" "2.0.x" "1.6.x" "1.5.x")
 
 	for branch in "${branches[@]}"; do
   	echo "Setting $pipeline_name $branch pipeline..."