Upgrading dependencies for 1.4

Updating pipelines

Author: Albertoimpl

.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

.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:

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

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"
 	}
 }

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

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

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

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

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

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))