From cda14ccfeaf118b049a392f367963ae546eb0d1f Mon Sep 17 00:00:00 2001 From: Gareth Clay Date: Thu, 5 Oct 2023 11:42:22 +0100 Subject: [PATCH] Branch for 2.1.x series --- .github/dependabot.yml | 20 ++++++++++++++++++++ README.adoc | 9 +++++++++ gradle.properties | 2 +- scripts/set-pipelines.sh | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ddcfabde..0574b71d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,6 +3,17 @@ 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: @@ -10,6 +21,15 @@ updates: 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 index ce16d9ae..500bb929 100644 --- 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 index 315f2d6f..ad2ae90f 100644 --- 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 index 5ea3945d..fb1ca356 100755 --- 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..."