SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrading dependencies for 1.4

Browse Source 
Updating pipelines
This commit is contained in:
Alberto C. Ríos
2022-01-05 12:35:57 +01:00
parent 72f7d12b94
commit 56364e4a5d
19 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/dependabot.yml vendored
View File

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

4
.github/workflows/build.yml vendored
View File

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

9
README.adoc
View File

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

8
build.gradle
View File

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

4
ci/config-concourse.yml
View File

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

14
ci/pipeline.yml
View File

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

4
ci/pr-pipeline.yml
View File

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

2
ci/scripts/acceptance-tests.sh
View File

@@ -87,9 +87,7 @@ main() {
prepare_cf_deployment
prepare_cf
pushd "git-repo" >/dev/null
run_tests
popd >/dev/null
}
main

2
ci/scripts/build-project.sh
View File

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

7
ci/tasks/acceptance-tests.yml
View File

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

5
ci/tasks/build-project.yml
View File

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

2
ci/tasks/promote.yml
View File

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

2
ci/tasks/stage.yml
View File

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

2
ci/tasks/sync-to-maven-central.yml
View File

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

2
gradle.properties
View File

@@ -1,4 +1,4 @@
version=1.3.2-SNAPSHOT
version=1.4.0-SNAPSHOT
group=org.springframework.cloud
onlyShowStandardStreamsOnTestFailure = false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

11
scripts/set-pipelines.sh
View File

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

2
spring-cloud-app-broker-acceptance-tests/build.gradle
View File

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

2
spring-cloud-app-broker-integration-tests/build.gradle
View File

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