Skip to content

Commit 56364e4

Browse files
committed
Upgrading dependencies for 1.4
Updating pipelines
1 parent 72f7d12 commit 56364e4

File tree

19 files changed

+48
-48
lines changed

19 files changed

+48
-48
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ updates:
55
target-branch: "main"
66
schedule:
77
interval: weekly
8+
milestone: 14
9+
labels:
10+
- dependencies
11+
12+
- package-ecosystem: gradle
13+
directory: "/"
14+
target-branch: "1.3.x"
15+
schedule:
16+
interval: weekly
17+
milestone: 22
818
labels:
919
- dependencies
1020

@@ -13,6 +23,7 @@ updates:
1323
target-branch: "1.2.x"
1424
schedule:
1525
interval: weekly
26+
milestone: 23
1627
labels:
1728
- dependencies
1829

@@ -21,5 +32,6 @@ updates:
2132
target-branch: "1.1.x"
2233
schedule:
2334
interval: weekly
35+
milestone: 24
2436
labels:
2537
- dependencies

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: build
55

66
on:
77
push:
8-
branches: [ main, 1.2.x, 1.1.x ]
8+
branches: [ main, 1.3.x, 1.2.x, 1.1.x ]
99
pull_request:
10-
branches: [ main, 1.2.x, 1.1.x ]
10+
branches: [ main, 1.3.x, 1.2.x, 1.1.x ]
1111

1212
jobs:
1313
build:

README.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ Join us in our gitter channel: https://gitter.im/spring-cloud-app-broker/communi
1919

2020
=== Compatibility
2121

22+
==== 1.4.x
23+
24+
* https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x
25+
* https://projects.spring.io/spring-boot/[Spring Boot] 2.5.x
26+
* https://github.com/cloudfoundry/cf-java-client/[Cloud Foundry Java Client] 5.x
27+
* https://github.com/reactor/[Reactor] 3.4.x
28+
* https://spring.io/projects/spring-cloud-open-service-broker/[Spring Cloud Open Service Broker] 3.4.x
29+
* https://github.com/openservicebrokerapi/servicebroker/tree/v2.15/[Open Service Broker API] 2.16
30+
2231
==== 1.3.x
2332

2433
* https://projects.spring.io/spring-framework/[Spring Framework] 5.3.x

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ buildscript {
2424
checkstyleVersion = "8.37"
2525
commonsTextVersion = "1.8"
2626
immutablesVersion = "2.8.8"
27-
openServiceBrokerVersion = "3.3.0"
27+
openServiceBrokerVersion = "3.4.0-M2"
2828
pmdVersion = "6.29.0"
29-
springBootVersion = "2.4.3"
30-
springCredhubVersion = "2.1.1.RELEASE"
31-
springFrameworkVersion = "5.3.4"
29+
springBootVersion = "2.5.8"
30+
springCredhubVersion = "2.2.0"
31+
springFrameworkVersion = "5.3.14"
3232
wiremockVersion = "2.27.2"
3333
}
3434
}

ci/config-concourse.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ artifactory-server: https://repo.spring.io
22
build-name: spring-cloud-app-broker
33
ab-slack-success-channel: "#sc-app-broker"
44
ab-slack-failure-channel: "#sc-app-broker"
5-
6-
7-
5+
github-repo: https://github.com/spring-cloud/spring-cloud-app-broker

ci/pipeline.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737
- task: build-project
3838
timeout: 1h30m
3939
file: git-repo/ci/tasks/build-project.yml
40-
vars:
41-
ci-image-tag: ((ci-image-tag))
4240
- put: artifactory-repo
4341
params: &artifactory-params
4442
signing_key: ((signing-key))
@@ -67,8 +65,6 @@ jobs:
6765
action: claim
6866
- task: acceptance-tests
6967
file: git-repo/ci/tasks/acceptance-tests.yml
70-
vars:
71-
ci-image-tag: ((ci-image-tag))
7268
on_success:
7369
in_parallel:
7470
- *slack-success-notification
@@ -89,7 +85,6 @@ jobs:
8985
file: git-repo/ci/tasks/stage.yml
9086
vars:
9187
release-type: M
92-
ci-image-tag: ((ci-image-tag))
9388
- put: artifactory-repo
9489
params:
9590
<<: *artifactory-params
@@ -107,7 +102,6 @@ jobs:
107102
file: git-repo/ci/tasks/stage.yml
108103
vars:
109104
release-type: RC
110-
ci-image-tag: ((ci-image-tag))
111105
- put: artifactory-repo
112106
params:
113107
<<: *artifactory-params
@@ -125,7 +119,6 @@ jobs:
125119
file: git-repo/ci/tasks/stage.yml
126120
vars:
127121
release-type: RELEASE
128-
ci-image-tag: ((ci-image-tag))
129122
- put: artifactory-repo
130123
params:
131124
<<: *artifactory-params
@@ -146,7 +139,6 @@ jobs:
146139
file: git-repo/ci/tasks/promote.yml
147140
vars:
148141
release-type: M
149-
ci-image-tag: ((ci-image-tag))
150142

151143
- name: promote-rc
152144
serial: true
@@ -161,7 +153,6 @@ jobs:
161153
file: git-repo/ci/tasks/promote.yml
162154
vars:
163155
release-type: RC
164-
ci-image-tag: ((ci-image-tag))
165156

166157
- name: promote-release
167158
serial: true
@@ -176,7 +167,6 @@ jobs:
176167
file: git-repo/ci/tasks/promote.yml
177168
vars:
178169
release-type: RELEASE
179-
ci-image-tag: ((ci-image-tag))
180170

181171
- name: sync-to-maven-central
182172
serial: true
@@ -189,8 +179,6 @@ jobs:
189179
save_build_info: true
190180
- task: sync-to-maven-central
191181
file: git-repo/ci/tasks/sync-to-maven-central.yml
192-
vars:
193-
ci-image-tag: ((ci-image-tag))
194182

195183
resource_types:
196184
- name: artifactory-resource
@@ -256,7 +244,7 @@ resources:
256244
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
257245
username: ((corporate-harbor-robot-account.username))
258246
password: ((corporate-harbor-robot-account.password))
259-
tag: ((ci-image-tag))
247+
tag: ((branch))
260248

261249
- name: artifactory-repo
262250
type: artifactory-resource

ci/pr-pipeline.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
file: pull-request/ci/tasks/build-project.yml
2727
input_mapping:
2828
git-repo: pull-request
29-
vars:
30-
ci-image-tag: ((ci-image-tag))
3129

3230
- name: run-acceptance-tests
3331
serial: true
@@ -44,8 +42,6 @@ jobs:
4442
file: pull-request/ci/tasks/acceptance-tests.yml
4543
input_mapping:
4644
git-repo: pull-request
47-
vars:
48-
ci-image-tag: ((ci-image-tag))
4945
on_success:
5046
in_parallel:
5147
- *slack-success-notification

ci/scripts/acceptance-tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ main() {
8787
prepare_cf_deployment
8888
prepare_cf
8989

90-
pushd "git-repo" >/dev/null
9190
run_tests
92-
popd >/dev/null
9391
}
9492

9593
main

ci/scripts/build-project.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ else
1414
build_task=build
1515
fi
1616

17-
pushd git-repo >/dev/null
1817
./gradlew --parallel clean "$build_task" publish \
1918
-PonlyShowStandardStreamsOnTestFailure="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE}" \
2019
-PpublicationRepository="${repository}"
21-
popd >/dev/null

ci/tasks/acceptance-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ image_resource:
66
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
77
username: ((corporate-harbor-robot-account.username))
88
password: ((corporate-harbor-robot-account.password))
9-
tag: ((ci-image-tag))
9+
tag: ((branch))
1010
inputs:
1111
- name: git-repo
1212
- name: toolsmith-env
1313
run:
14-
path: git-repo/ci/scripts/acceptance-tests.sh
14+
path: ci/scripts/acceptance-tests.sh
15+
dir: git-repo
1516
params:
16-
TOOLSMITH_ENV_INPUT: toolsmith-env
17+
TOOLSMITH_ENV_INPUT: ../toolsmith-env
1718
DEFAULT_ORG: ((acceptance-test-default-org))
1819
DEFAULT_SPACE: ((acceptance-test-default-space))
1920
SKIP_SSL_VALIDATION: ((acceptance-test-skip-ssl-validation))

0 commit comments

Comments
 (0)