From 56364e4a5df8c16ee270e596d3270fa2104fc862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20C=2E=20R=C3=ADos?= Date: Wed, 5 Jan 2022 12:35:57 +0100 Subject: [PATCH] Upgrading dependencies for 1.4 Updating pipelines --- .github/dependabot.yml | 12 ++++++++++++ .github/workflows/build.yml | 4 ++-- README.adoc | 9 +++++++++ build.gradle | 8 ++++---- ci/config-concourse.yml | 4 +--- ci/pipeline.yml | 14 +------------- ci/pr-pipeline.yml | 4 ---- ci/scripts/acceptance-tests.sh | 2 -- ci/scripts/build-project.sh | 2 -- ci/tasks/acceptance-tests.yml | 7 ++++--- ci/tasks/build-project.yml | 5 +++-- ci/tasks/promote.yml | 2 +- ci/tasks/stage.yml | 2 +- ci/tasks/sync-to-maven-central.yml | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- scripts/set-pipelines.sh | 11 +++++------ .../build.gradle | 2 +- .../build.gradle | 2 +- 19 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 246ddb1..a62264c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,16 @@ updates: target-branch: "main" schedule: interval: weekly + milestone: 14 + labels: + - dependencies + + - package-ecosystem: gradle + directory: "/" + target-branch: "1.3.x" + schedule: + interval: weekly + milestone: 22 labels: - dependencies @@ -13,6 +23,7 @@ updates: target-branch: "1.2.x" schedule: interval: weekly + milestone: 23 labels: - dependencies @@ -21,5 +32,6 @@ updates: target-branch: "1.1.x" schedule: interval: weekly + milestone: 24 labels: - dependencies diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 728dcc0..050ccbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,9 @@ name: build on: push: - branches: [ main, 1.2.x, 1.1.x ] + branches: [ main, 1.3.x, 1.2.x, 1.1.x ] pull_request: - branches: [ main, 1.2.x, 1.1.x ] + branches: [ main, 1.3.x, 1.2.x, 1.1.x ] jobs: build: diff --git a/README.adoc b/README.adoc index f9f3983..25b14d7 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 +==== 1.4.x + +* https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x +* https://projects.spring.io/spring-boot/[Spring Boot] 2.5.x +* https://github.com/cloudfoundry/cf-java-client/[Cloud Foundry Java Client] 5.x +* https://github.com/reactor/[Reactor] 3.4.x +* https://spring.io/projects/spring-cloud-open-service-broker/[Spring Cloud Open Service Broker] 3.4.x +* https://github.com/openservicebrokerapi/servicebroker/tree/v2.15/[Open Service Broker API] 2.16 + ==== 1.3.x * https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x diff --git a/build.gradle b/build.gradle index 970c2f0..6186b55 100644 --- a/build.gradle +++ b/build.gradle @@ -24,11 +24,11 @@ buildscript { checkstyleVersion = "8.37" commonsTextVersion = "1.8" immutablesVersion = "2.8.8" - openServiceBrokerVersion = "3.3.0" + openServiceBrokerVersion = "3.4.0-M2" pmdVersion = "6.29.0" - springBootVersion = "2.4.3" - springCredhubVersion = "2.1.1.RELEASE" - springFrameworkVersion = "5.3.4" + springBootVersion = "2.5.8" + springCredhubVersion = "2.2.0" + springFrameworkVersion = "5.3.14" wiremockVersion = "2.27.2" } } diff --git a/ci/config-concourse.yml b/ci/config-concourse.yml index b022459..7e81e19 100644 --- a/ci/config-concourse.yml +++ b/ci/config-concourse.yml @@ -2,6 +2,4 @@ artifactory-server: https://repo.spring.io build-name: spring-cloud-app-broker ab-slack-success-channel: "#sc-app-broker" ab-slack-failure-channel: "#sc-app-broker" - - - +github-repo: https://github.com/spring-cloud/spring-cloud-app-broker diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 98ffb58..d069541 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -37,8 +37,6 @@ jobs: - task: build-project timeout: 1h30m file: git-repo/ci/tasks/build-project.yml - vars: - ci-image-tag: ((ci-image-tag)) - put: artifactory-repo params: &artifactory-params signing_key: ((signing-key)) @@ -67,8 +65,6 @@ jobs: action: claim - task: acceptance-tests file: git-repo/ci/tasks/acceptance-tests.yml - vars: - ci-image-tag: ((ci-image-tag)) on_success: in_parallel: - *slack-success-notification @@ -89,7 +85,6 @@ jobs: file: git-repo/ci/tasks/stage.yml vars: release-type: M - ci-image-tag: ((ci-image-tag)) - put: artifactory-repo params: <<: *artifactory-params @@ -107,7 +102,6 @@ jobs: file: git-repo/ci/tasks/stage.yml vars: release-type: RC - ci-image-tag: ((ci-image-tag)) - put: artifactory-repo params: <<: *artifactory-params @@ -125,7 +119,6 @@ jobs: file: git-repo/ci/tasks/stage.yml vars: release-type: RELEASE - ci-image-tag: ((ci-image-tag)) - put: artifactory-repo params: <<: *artifactory-params @@ -146,7 +139,6 @@ jobs: file: git-repo/ci/tasks/promote.yml vars: release-type: M - ci-image-tag: ((ci-image-tag)) - name: promote-rc serial: true @@ -161,7 +153,6 @@ jobs: file: git-repo/ci/tasks/promote.yml vars: release-type: RC - ci-image-tag: ((ci-image-tag)) - name: promote-release serial: true @@ -176,7 +167,6 @@ jobs: file: git-repo/ci/tasks/promote.yml vars: release-type: RELEASE - ci-image-tag: ((ci-image-tag)) - name: sync-to-maven-central serial: true @@ -189,8 +179,6 @@ jobs: save_build_info: true - task: sync-to-maven-central file: git-repo/ci/tasks/sync-to-maven-central.yml - vars: - ci-image-tag: ((ci-image-tag)) resource_types: - name: artifactory-resource @@ -256,7 +244,7 @@ resources: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) - name: artifactory-repo type: artifactory-resource diff --git a/ci/pr-pipeline.yml b/ci/pr-pipeline.yml index 5a7090f..e09375d 100644 --- a/ci/pr-pipeline.yml +++ b/ci/pr-pipeline.yml @@ -26,8 +26,6 @@ jobs: file: pull-request/ci/tasks/build-project.yml input_mapping: git-repo: pull-request - vars: - ci-image-tag: ((ci-image-tag)) - name: run-acceptance-tests serial: true @@ -44,8 +42,6 @@ jobs: file: pull-request/ci/tasks/acceptance-tests.yml input_mapping: git-repo: pull-request - vars: - ci-image-tag: ((ci-image-tag)) on_success: in_parallel: - *slack-success-notification diff --git a/ci/scripts/acceptance-tests.sh b/ci/scripts/acceptance-tests.sh index cde5077..93f2661 100755 --- a/ci/scripts/acceptance-tests.sh +++ b/ci/scripts/acceptance-tests.sh @@ -87,9 +87,7 @@ main() { prepare_cf_deployment prepare_cf - pushd "git-repo" >/dev/null run_tests - popd >/dev/null } main diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh index 7441192..1c486ec 100755 --- a/ci/scripts/build-project.sh +++ b/ci/scripts/build-project.sh @@ -14,8 +14,6 @@ else build_task=build fi -pushd git-repo >/dev/null ./gradlew --parallel clean "$build_task" publish \ -PonlyShowStandardStreamsOnTestFailure="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE}" \ -PpublicationRepository="${repository}" -popd >/dev/null diff --git a/ci/tasks/acceptance-tests.yml b/ci/tasks/acceptance-tests.yml index ff1de99..0aa23ff 100644 --- a/ci/tasks/acceptance-tests.yml +++ b/ci/tasks/acceptance-tests.yml @@ -6,14 +6,15 @@ image_resource: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) inputs: - name: git-repo - name: toolsmith-env run: - path: git-repo/ci/scripts/acceptance-tests.sh + path: ci/scripts/acceptance-tests.sh + dir: git-repo params: - TOOLSMITH_ENV_INPUT: toolsmith-env + TOOLSMITH_ENV_INPUT: ../toolsmith-env DEFAULT_ORG: ((acceptance-test-default-org)) DEFAULT_SPACE: ((acceptance-test-default-space)) SKIP_SSL_VALIDATION: ((acceptance-test-skip-ssl-validation)) diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml index b68058a..884d02a 100644 --- a/ci/tasks/build-project.yml +++ b/ci/tasks/build-project.yml @@ -6,7 +6,7 @@ image_resource: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) inputs: - name: git-repo outputs: @@ -15,7 +15,8 @@ caches: - path: maven - path: gradle run: - path: git-repo/ci/scripts/build-project.sh + path: ci/scripts/build-project.sh + dir: git-repo params: ARTIFACTORY_USERNAME: ((artifactory-username)) ARTIFACTORY_PASSWORD: ((artifactory-password)) diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml index 4744e09..fa2d884 100644 --- a/ci/tasks/promote.yml +++ b/ci/tasks/promote.yml @@ -6,7 +6,7 @@ image_resource: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) inputs: - name: git-repo - name: artifactory-repo diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml index e9a3b8b..7a4f85f 100644 --- a/ci/tasks/stage.yml +++ b/ci/tasks/stage.yml @@ -6,7 +6,7 @@ image_resource: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) inputs: - name: git-repo outputs: diff --git a/ci/tasks/sync-to-maven-central.yml b/ci/tasks/sync-to-maven-central.yml index 0a8bad6..2418641 100644 --- a/ci/tasks/sync-to-maven-central.yml +++ b/ci/tasks/sync-to-maven-central.yml @@ -6,7 +6,7 @@ image_resource: repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci username: ((corporate-harbor-robot-account.username)) password: ((corporate-harbor-robot-account.password)) - tag: ((ci-image-tag)) + tag: ((branch)) inputs: - name: git-repo - name: artifactory-repo diff --git a/gradle.properties b/gradle.properties index b4b89db..5b27313 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.3.2-SNAPSHOT +version=1.4.0-SNAPSHOT group=org.springframework.cloud onlyShowStandardStreamsOnTestFailure = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc..28ff446 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh index 5336b36..1afb1e0 100755 --- a/scripts/set-pipelines.sh +++ b/scripts/set-pipelines.sh @@ -3,7 +3,8 @@ set -euo pipefail readonly FLY_TARGET="app-broker" -readonly GITHUB_REPO="https://github.com/spring-cloud/spring-cloud-app-broker" +readonly VERSION=1.4.x +readonly BRANCH=main set_pipeline() { local pipeline_name pipeline_definition branch ci_image_tag @@ -17,9 +18,7 @@ set_pipeline() { --pipeline "$pipeline_name" \ --config "$pipeline_definition" \ --load-vars-from config-concourse.yml \ - --var "github-repo=$GITHUB_REPO" \ - --var "branch=$branch" \ - --var "ci-image-tag=$ci_image_tag" + --var "branch=$branch" } main() { @@ -27,8 +26,8 @@ main() { pushd "$(dirname "$0")/../ci" >/dev/null - set_pipeline app-broker-1.3.x pipeline.yml main - set_pipeline app-broker-1.3.x-pr pr-pipeline.yml main + set_pipeline "app-broker-$VERSION" pipeline.yml "$BRANCH" + set_pipeline "app-broker-$VERSION-pr" pr-pipeline.yml "$BRANCH" popd >/dev/null } diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle index fb7b322..7b4b110 100644 --- a/spring-cloud-app-broker-acceptance-tests/build.gradle +++ b/spring-cloud-app-broker-acceptance-tests/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'org.springframework.boot' version "2.4.3" + id 'org.springframework.boot' version "2.5.8" } description = "Spring Cloud App Broker Acceptance Tests" diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle index 03959cf..b2ef31b 100644 --- a/spring-cloud-app-broker-integration-tests/build.gradle +++ b/spring-cloud-app-broker-integration-tests/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'org.springframework.boot' version "2.4.3" + id 'org.springframework.boot' version "2.5.8" } description = "Spring Cloud App Broker Integration Tests"