diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9e05f9e..07aeb09 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -70,23 +70,3 @@ updates: update-types: - "version-update:semver-major" - "version-update:semver-minor" - - - package-ecosystem: gradle - directory: "/" - target-branch: "1.4.x" - schedule: - interval: daily - commit-message: - prefix: "(1.4.x)" - milestone: 14 - 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" diff --git a/.github/workflows/java-17-baseline.yml b/.github/workflows/java-17-baseline.yml index e1d081a..ca1298d 100644 --- a/.github/workflows/java-17-baseline.yml +++ b/.github/workflows/java-17-baseline.yml @@ -2,9 +2,9 @@ name: Java 17 baseline build on: push: - branches: [ main ] + branches: [ 2.0.x, main ] pull_request: - branches: [ main ] + branches: [ 2.0.x, main ] jobs: build: diff --git a/.github/workflows/java-8-baseline.yml b/.github/workflows/java-8-baseline.yml index 0ea16bd..2b3e6d4 100644 --- a/.github/workflows/java-8-baseline.yml +++ b/.github/workflows/java-8-baseline.yml @@ -2,9 +2,9 @@ name: Java 8 baseline build on: push: - branches: [ 1.6.x, 1.5.x, 1.4.x ] + branches: [ 1.6.x, 1.5.x ] pull_request: - branches: [ 1.6.x, 1.5.x, 1.4.x ] + branches: [ 1.6.x, 1.5.x ] jobs: build: diff --git a/README.adoc b/README.adoc index 21e31b9..ce16d9a 100644 --- a/README.adoc +++ b/README.adoc @@ -7,7 +7,7 @@ Spring Cloud App Broker is a framework for building Spring Boot applications tha The Open Service Broker API project allows developers to deliver services to applications running within cloud native platforms such as Cloud Foundry, Kubernetes, and OpenShift. Spring Cloud App Broker provides a framework based on Spring Boot that enables you to quickly create a service broker that deploys applications and services to the platform when managed services are provisioned. -Currently Cloud Foundry is supported as a target platform for service instance backing applications and services. +Currently, Cloud Foundry is supported as a target platform for service instance backing applications and services. === Getting Started @@ -55,6 +55,8 @@ Join us in our gitter channel: https://gitter.im/spring-cloud-app-broker/communi * https://spring.io/projects/spring-cloud-open-service-broker/[Spring Cloud Open Service Broker] 3.5.x * https://github.com/openservicebrokerapi/servicebroker/tree/v2.16/[Open Service Broker API] 2.16 +=== End-of-Support + ==== 1.4.x * https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x @@ -64,8 +66,6 @@ Join us in our gitter channel: https://gitter.im/spring-cloud-app-broker/communi * https://spring.io/projects/spring-cloud-open-service-broker/[Spring Cloud Open Service Broker] 3.4.x * https://github.com/openservicebrokerapi/servicebroker/tree/v2.16/[Open Service Broker API] 2.16 -=== Unsupported versions - ==== 1.3.x * https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x @@ -104,7 +104,7 @@ Join us in our gitter channel: https://gitter.im/spring-cloud-app-broker/communi === Build -This project requires Java 8 at a minimum. +This project requires Java 17 at a minimum. The project is built with Gradle. The https://docs.gradle.org/current/userguide/gradle_wrapper.html[Gradle wrapper] allows you to build the project on multiple platforms and even if you do not have Gradle installed; run it in place of the `gradle` command (as `./gradlew`) from the root of the main project directory. diff --git a/ci/README.md b/ci/README.md index 93879f4..07928d5 100644 --- a/ci/README.md +++ b/ci/README.md @@ -39,7 +39,7 @@ The original pipeline was decomposed into different jobs so that we could recove The pipeline can be run using the following script: ```$bash -$ ./ci/scripts/set-pipeline.sh +$ ./scripts/set-pipelines.sh ``` ### Release commands diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh index 1307a46..5ea3945 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" "1.4.x") + local -r branches=("main" "2.0.x" "1.6.x" "1.5.x") for branch in "${branches[@]}"; do echo "Setting $pipeline_name $branch pipeline..."