Commit Graph

331 Commits

Author SHA1 Message Date
Phillip Webb
56a8125eee Upgrade docker images to Ubuntu Focal
Closes gh-23492
2020-09-25 12:38:44 -07:00
Andy Wilkinson
184bd5b13d Merge branch '2.2.x' into 2.3.x
Closes gh-23470
2020-09-24 09:24:38 +01:00
Andy Wilkinson
d208ec92fc Merge branch '2.1.x' into 2.2.x
Closes gh-23471
2020-09-24 09:24:18 +01:00
Andy Wilkinson
39a24b093d Upgrade CI to Docker 19.03.13
Closes gh-23469
2020-09-24 09:22:02 +01:00
Andy Wilkinson
0d0f55f0e3 Merge branch '2.2.x' into 2.3.x
Closes gh-23472
2020-09-24 09:17:55 +01:00
Andy Wilkinson
11e68717f9 Merge branch '2.1.x' into 2.2.x
Closes gh-23473
2020-09-24 09:17:24 +01:00
Andy Wilkinson
0690690039 Update CI images to use ubuntu:bionic-20200903
Closes gh-23468
2020-09-24 09:15:09 +01:00
Phillip Webb
a47bc41fe3 Merge branch '2.2.x' into 2.3.x 2020-09-21 21:29:05 -07:00
Phillip Webb
e8d24948d5 Merge branch '2.1.x' into 2.2.x 2020-09-21 21:23:03 -07:00
Phillip Webb
b0cc5fba4e Use per-branch CI images
Closes gh-23439
2020-09-21 20:03:43 -07:00
Phillip Webb
945347c944 Merge branch '2.2.x' into 2.3.x 2020-09-21 17:46:49 -07:00
Phillip Webb
15f2186aaf Add Java 15 to download script
See gh-23433
2020-09-21 17:46:20 -07:00
Phillip Webb
b59b28767b Merge branch '2.2.x' into 2.3.x 2020-09-21 17:41:50 -07:00
Phillip Webb
e6ebcf1429 Upgrade Java version used in CI from 14 to 15
Closes gh-23433
2020-09-21 17:18:49 -07:00
Andy Wilkinson
16ff7022db Merge branch '2.2.x' into 2.3.x 2020-09-17 09:47:18 +01:00
Andy Wilkinson
c23e420914 Merge branch '2.1.x' into 2.2.x 2020-09-17 09:47:06 +01:00
Andy Wilkinson
dbd27839e5 Polish logging in BintrayService 2020-09-17 09:46:39 +01:00
Stephane Nicoll
9814a30b51 Upgrade Ubuntu version in CI images
Closes gh-23100
2020-08-27 11:57:16 +02:00
Stephane Nicoll
0032ab6afe Upgrade Ubuntu version in CI images
Closes gh-23103
2020-08-27 11:55:37 +02:00
Stephane Nicoll
1ae120f8c5 Upgrade Ubuntu version in CI images
Closes gh-23102
2020-08-27 11:52:53 +02:00
Phillip Webb
4924573074 Merge branch '2.2.x' into 2.3.x 2020-08-06 10:15:22 -07:00
Phillip Webb
fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Stephane Nicoll
235f5e1103 Upgrade Java 8 version in CI image
Closes gh-22754
2020-08-06 09:39:38 +02:00
Stephane Nicoll
6232ece61d Upgrade Java 8 version in CI image
Closes gh-22752
2020-08-06 09:38:19 +02:00
Stephane Nicoll
64264b5240 Upgrade Java 8 version in CI image
Closes gh-22755
2020-08-06 09:37:04 +02:00
Andy Wilkinson
46e12cbacc Merge branch '2.2.x' into 2.3.x
Closes gh-22656
2020-07-30 08:48:17 +01:00
Andy Wilkinson
e1617185a1 Merge branch '2.1.x' into 2.2.x
Closes gh-22655
2020-07-30 08:48:07 +01:00
Andy Wilkinson
ac732773bc Update CI images to use ubuntu:bionic-20200713
Closes gh-22659
2020-07-30 08:46:36 +01:00
Phillip Webb
f625d8e701 Merge branch '2.2.x' into 2.3.x 2020-07-23 21:37:16 -07:00
Phillip Webb
e137e3d130 Merge branch '2.1.x' into 2.2.x 2020-07-23 21:36:50 -07:00
Phillip Webb
f68671e1bc Refine regex
See gh-22543
2020-07-23 21:23:42 -07:00
Phillip Webb
7ace6cd450 Move properties to correct file
See gh-22543
2020-07-23 21:09:15 -07:00
Phillip Webb
b77dbcd06f Allow certain artifacts to be optionally deployed
Update `DistributeCommand` so that regex patterns can be used to mark
artifacts that are optional and need not fail the release.

Closes gh-22543
2020-07-23 20:45:25 -07:00
Phillip Webb
d69c35a1db Deal with 404 response when checking for artifacts 2020-07-23 18:23:24 -07:00
Phillip Webb
53296cd161 Backport build script updates 2020-07-23 17:45:55 -07:00
Phillip Webb
c043701dc0 Turn on debug logging 2020-07-23 17:45:49 -07:00
Stephane Nicoll
41b7eb158b Upgrade Java 14 version in CI image
Closes gh-22515
2020-07-23 09:35:44 +02:00
Stephane Nicoll
71ec15e851 Upgrade Java 8 version in CI image
Closes gh-22514
2020-07-23 09:35:07 +02:00
Stephane Nicoll
458b5690e1 Upgrade Java 14 version in CI image
Closes gh-22516
2020-07-23 09:33:30 +02:00
Stephane Nicoll
a2b797f8b7 Upgrade Java 8 version in CI image
Closes gh-22518
2020-07-23 09:33:03 +02:00
Stephane Nicoll
ee37ddd6c0 Upgrade Java 8 version in CI image
Closes gh-22512
2020-07-23 09:31:01 +02:00
Phillip Webb
217b2eff89 Merge branch '2.2.x' into 2.3.x 2020-07-22 17:03:23 -07:00
Phillip Webb
b5e70157dc Update copyright year of changed files 2020-07-22 17:01:36 -07:00
Andy Wilkinson
f3e2e6c4ec Merge branch '2.2.x' into 2.3.x
Closes gh-22345
2020-07-16 10:54:41 +01:00
Andy Wilkinson
055f7f95be Merge branch '2.1.x' into 2.2.x
Closes gh-22347
2020-07-16 10:53:44 +01:00
Andy Wilkinson
831333f841 Update JDK 11 CI image to use 11.0.8_10
Closes gh-22348
2020-07-16 10:52:52 +01:00
Andy Wilkinson
888bea5224 Merge branch '2.2.x' into 2.3.x
Closes gh-22268
2020-07-09 09:41:55 +01:00
Andy Wilkinson
efad6c16d1 Merge branch '2.1.x' into 2.2.x
Closes gh-22269
2020-07-09 09:40:50 +01:00
Andy Wilkinson
9800804b65 Upgrade CI images to use ubuntu:bionic-20200630
Closes gh-22271
2020-07-09 09:39:52 +01:00
Andy Wilkinson
f0b78fb3c4 Merge branch '2.2.x' into 2.3.x
Closes gh-22190
2020-07-02 09:42:50 +01:00
Andy Wilkinson
1410ef2911 Merge branch '2.1.x' into 2.2.x
Closes gh-22193
2020-07-02 09:42:03 +01:00
Andy Wilkinson
c9958c2ab4 Upgrade CI to Docker 19.03.12
Closes gh-22189
2020-07-02 09:39:13 +01:00
Madhura Bhave
67060731bc Merge branch '2.1.x' into 2.2.x 2020-06-29 16:40:59 -07:00
Madhura Bhave
4a55a414e7 Fix typo 2020-06-29 16:40:24 -07:00
Johnny Lim
43aee1bddd Polish
See gh-22090
2020-06-29 16:35:23 -07:00
Andy Wilkinson
ab51f3a0a4 Merge branch '2.2.x' into 2.3.x
Closes gh-22004
2020-06-18 10:22:57 +01:00
Andy Wilkinson
73a1047ad2 Merge branch '2.1.x' into 2.2.x
Closes gh-22005
2020-06-18 10:22:28 +01:00
Andy Wilkinson
db634d762e Update CI images to use ubuntu:bionic-20200526
Closes gh-22003
2020-06-18 10:17:39 +01:00
Phillip Webb
025d7aaac8 Merge branch '2.2.x' into 2.3.x 2020-06-15 10:53:00 -07:00
Phillip Webb
550b2847c5 Merge branch '2.1.x' into 2.2.x 2020-06-15 10:52:50 -07:00
Phillip Webb
b129a3f7fb Check that a distribution has been started
Update the releasescript to ensure that a distribution has been started
before starting it again. This functionality was accidentally removed
during the updates for gh-21474.

See gh-21474
2020-06-15 10:50:06 -07:00
Madhura Bhave
847d633097 Merge branch '2.2.x' into 2.3.x 2020-06-15 09:23:47 -07:00
Madhura Bhave
0395b186ad Merge branch '2.1.x' into 2.2.x 2020-06-15 09:23:26 -07:00
Madhura Bhave
9d9a90ccd4 Polish 2020-06-15 09:22:14 -07:00
Phillip Webb
209c5c4013 Merge branch '2.1.x' into 2.2.x 2020-06-11 23:19:16 -07:00
Phillip Webb
6d93d732b4 Cherry-pick release script updates
Cherry-pick release script updates from 2.3.x

See gh-21474
2020-06-11 23:15:10 -07:00
Phillip Webb
1706ae29f5 Support octet-stream response from sonatype
See gh-21474
2020-06-11 22:56:43 -07:00
Phillip Webb
dbda2d0b92 Improve release script logging
Improve logging and fix a few issue with the release script.

See gh-21474
2020-06-11 22:29:50 -07:00
Phillip Webb
ce011ca384 Check if promotion has already occurred
Update the release tooling to check for bintray published artifacts
using SHA256 digests and to also check before attempting a promote.

See gh-21474
2020-06-11 21:08:59 -07:00
Phillip Webb
d650c5fdf2 Polish 2020-06-11 21:08:52 -07:00
Phillip Webb
de8970ec8e Update copyright year of changed files 2020-06-05 15:37:24 -07:00
Andy Wilkinson
0415c307c7 Merge branch '2.2.x' into 2.3.x
Closes gh-21683
2020-06-05 12:52:50 +01:00
Andy Wilkinson
97533a5364 Merge branch '2.1.x' into 2.2.x
Closes gh-21682
2020-06-05 12:52:24 +01:00
Andy Wilkinson
20f0b41099 Upgrade CI to Docker 19.03.9
Closes gh-21681
2020-06-05 12:48:49 +01:00
Madhura Bhave
72ebefba0c Merge branch '2.2.x'
Closes gh-21524
2020-05-20 15:30:53 -07:00
Madhura Bhave
831bb1f206 Merge branch '2.1.x' into 2.2.x
Closes gh-21526
2020-05-20 15:29:50 -07:00
Madhura Bhave
bce48ea745 Upgrade CI to Docker 19.03.9
Closes gh-21525
2020-05-20 15:29:02 -07:00
Phillip Webb
8eec9cf32f Restore release scripts POM
Closes gh-21460
2020-05-14 21:16:12 -07:00
Phillip Webb
c7023c5b17 Increase bintray timeout 2020-05-14 21:04:29 -07:00
Phillip Webb
9a1a2ca613 Merge branch '2.2.x'
Closes gh-21448
2020-05-13 23:28:29 -07:00
Phillip Webb
5eabb0400c Merge branch '2.1.x' into 2.2.x
Closes gh-21447
2020-05-13 23:01:02 -07:00
Phillip Webb
d7c7ca31f3 Upgrade to spring-javaformat 0.0.22
Closes gh-21446
2020-05-13 23:00:18 -07:00
Stephane Nicoll
5d7df790f1 Merge branch '2.2.x'
Closes gh-21261
2020-05-04 15:02:51 +02:00
Stephane Nicoll
487329fafa Merge branch '2.1.x' into 2.2.x
Closes gh-21260
2020-05-04 15:02:17 +02:00
Stephane Nicoll
e54b7d07c9 Upgrade Ubuntu version in CI images
Closes gh-21262
2020-05-04 14:19:02 +02:00
Stephane Nicoll
489f9b0e58 Upgrade Java 14 version in CI image
Closes gh-21086
2020-04-23 09:03:23 +02:00
Stephane Nicoll
0568920695 Upgrade Java 8 version in CI image`
Closes gh-21085
2020-04-23 09:02:43 +02:00
Stephane Nicoll
81268914b4 Upgrade Java 14 version in CI image
Closes gh-21087
2020-04-23 09:01:22 +02:00
Stephane Nicoll
ac5c7cb5e1 Upgrade Java 8 version in CI image
Closes gh-21088
2020-04-23 09:00:36 +02:00
Stephane Nicoll
66667964b3 Upgrade Java 8 version in CI image
Closes gh-21084
2020-04-23 08:58:36 +02:00
Madhura Bhave
b75df92d9e Merge branch '2.2.x'
Closes gh-20977
2020-04-15 16:39:59 -07:00
Madhura Bhave
aebf475e13 Merge branch '2.1.x' into 2.2.x
Closes gh-20979
2020-04-15 16:39:29 -07:00
Madhura Bhave
9d3d202837 Upgrade Java 11 version in CI image
Closes gh-20978
2020-04-15 16:38:04 -07:00
Madhura Bhave
ed596a3916 Merge branch '2.2.x'
Closes gh-20888
2020-04-08 13:34:55 -07:00
Madhura Bhave
e6c0a0dc35 Merge branch '2.1.x' into 2.2.x
Closes gh-20889
2020-04-08 13:33:42 -07:00
Madhura Bhave
b03ba02125 Upgrade Ubuntu version in CI images
Closes gh-20678
2020-04-08 13:31:51 -07:00
Madhura Bhave
38dd762086 Merge branch '2.2.x' 2020-04-03 12:27:51 -07:00
Madhura Bhave
d7c376adf6 Merge branch '2.1.x' into 2.2.x 2020-04-03 12:27:26 -07:00
Madhura Bhave
d5a3310b91 Fix CI dockerfile 2020-04-03 12:26:19 -07:00
Madhura Bhave
c027487d72 Merge branch '2.2.x' 2020-04-03 10:11:29 -07:00
Madhura Bhave
2b862d2409 Merge branch '2.1.x' into 2.2.x 2020-04-03 10:11:04 -07:00
Madhura Bhave
a0a0d28582 Add get-docker-url script to image before executing it 2020-04-03 10:09:02 -07:00
Madhura Bhave
6641154148 Merge branch '2.2.x'
Closes gh-20804
2020-04-01 18:40:48 -07:00
Madhura Bhave
20c04bc63c Merge branch '2.1.x' into 2.2.x
Closes gh-20803
2020-04-01 18:40:21 -07:00
Spring Buildmaster
1566259c02 Upgrade to Docker 19.03.8 in CI
See gh-20756
2020-04-01 18:38:21 -07:00
Madhura Bhave
9ebad0dfe5 Merge branch '2.2.x'
Closes gh-20753
2020-03-31 10:48:13 -07:00
Madhura Bhave
41255ca8d1 Merge branch '2.1.x' into 2.2.x
Closes gh-20752
2020-03-31 10:47:21 -07:00
dreis2211
4752d7e91a Automate Docker updates in CI
See gh-20530
2020-03-31 10:39:34 -07:00
Phillip Webb
9a33a723fe Update copyright year of changed files 2020-03-23 14:15:08 -07:00
Stephane Nicoll
9766127f9a Merge branch '2.2.x'
Closes gh-20599
2020-03-21 14:02:09 +01:00
Stephane Nicoll
1bf7d25141 Remove Java 13 CI job
Closes gh-20578
2020-03-21 13:56:41 +01:00
Stephane Nicoll
b546415d32 Merge branch '2.2.x'
See gh-20568
2020-03-19 15:30:54 +01:00
Stephane Nicoll
833f0a1db3 Merge branch '2.1.x' into 2.2.x
See gh-20567
2020-03-19 15:29:20 +01:00
Stephane Nicoll
d0ccb59931 Revert "Upgrade CI images to Ubuntu Bionic 20200311"
This reverts commit d25286c5

Closes gh-20566
2020-03-19 15:23:36 +01:00
dreis2211
0e796479dc Add Java 14 CI
Closes gh-20576
2020-03-19 14:54:33 +01:00
Stephane Nicoll
521143a314 Merge branch '2.2.x'
Closes gh-20568
2020-03-19 10:12:11 +01:00
Stephane Nicoll
68a2be0ad5 Merge branch '2.1.x' into 2.2.x
Closes gh-20567
2020-03-19 10:11:13 +01:00
dreis2211
d25286c5d6 Upgrade CI images to Ubuntu Bionic 20200311
See gh-20566
2020-03-19 10:09:28 +01:00
Stephane Nicoll
8d3ab1cc7d Polish "Add Java 14 CI"
See gh-20413
2020-03-18 14:33:01 +01:00
dreis2211
f0e57ed688 Add Java 14 CI
See gh-20413
2020-03-18 14:29:55 +01:00
Stephane Nicoll
0ea81c4a19 Merge branch '2.2.x'
Closes gh-20422
2020-03-08 12:02:23 +01:00
Stephane Nicoll
3152971ad1 Merge branch '2.1.x' into 2.2.x
Closes gh-20421
2020-03-08 12:01:23 +01:00
dreis2211
570dca8064 Upgrade CI to Docker 19.03.7
See gh-20420
2020-03-08 11:46:10 +01:00
Madhura Bhave
8dd0ef9b39 Merge branch '2.2.x'
Closes gh-20376
2020-03-02 14:51:50 -08:00
Madhura Bhave
d83ef715a4 Merge branch '2.1.x' into 2.2.x
Closes gh-20375
2020-03-02 14:50:49 -08:00
dreis2211
cd9879d45a Upgrade CI images to Ubuntu Bionic 20200219
See gh-20361
2020-03-02 14:47:40 -08:00
Andy Wilkinson
487328e4c0 Configure user name used for Gradle CI builds
Closes gh-20312
2020-02-25 10:06:52 +00:00
Madhura Bhave
0ec1ed4642 Merge branch '2.2.x'
Closes gh-20188
2020-02-14 13:51:27 -08:00
Madhura Bhave
4ac12660c6 Explicitly enable config properties scan in java release scripts
This commit also upgrades the Spring Boot version used by the scripts
to 2.2.4 which is why the explicit annotation is required.

Closes gh-20174
2020-02-14 13:46:56 -08:00
Stephane Nicoll
b8ccfbafd0 Upgrade to Spring Boot 2.2.4 2020-02-13 13:36:57 +01:00
Stephane Nicoll
738e8b39c7 Upgrade to spring javaformat 0.0.20 2020-02-13 13:36:57 +01:00
Stephane Nicoll
362297a010 Fix formatting 2020-02-13 13:36:57 +01:00
Stephane Nicoll
475169a80e Merge branch '2.2.x'
Closes gh-20160
2020-02-13 13:14:57 +01:00
Stephane Nicoll
06c85e96c3 Merge branch '2.1.x' into 2.2.x
Closes gh-20159
2020-02-13 13:13:17 +01:00
dreis2211
e1f743a21b Upgrade CI to Docker 19.03.5
See gh-20157
2020-02-13 10:24:33 +01:00
Johnny Lim
b67ece48e4 Polish
See gh-20020
2020-02-03 17:37:01 +01:00
Stephane Nicoll
bdf2029c36 Merge branch '2.1.x' into 2.2.x
Closes gh-19928
2020-01-26 08:36:55 +01:00
dreis2211
4205d980b7 Upgrade CI images to Ubuntu Bionic 20200112
See gh-19913
2020-01-26 08:34:14 +01:00
Stephane Nicoll
9c27921a46 Upgrade Java 13 version in CI image
Closes gh-19856
2020-01-23 08:52:07 +01:00
Stephane Nicoll
b315bfd87c Merge branch '2.1.x' into 2.2.x
Closes gh-19869
2020-01-23 08:50:21 +01:00
Stephane Nicoll
8dc3e74447 Upgrade Java 8 version in CI image
Closes gh-19857
2020-01-23 08:49:46 +01:00
Stephane Nicoll
938c7a6d9f Merge branch '2.1.x' into 2.2.x
Closes gh-19763 in 2.2.4
2020-01-20 11:25:48 +01:00
Stephane Nicoll
11efe172e9 Upgrade Java 11 version in CI image
Closes gh-19763
2020-01-20 11:25:10 +01:00
Madhura Bhave
75f210a631 Merge branch '2.1.x'
Closes gh-18906
2019-11-06 11:15:46 -08:00
Madhura Bhave
8d3df1b4b8 Make CI credentials requirement lenient when building RestTemplate
Fixes gh-18901
2019-11-06 11:12:20 -08:00
Andy Wilkinson
142934432f Merge branch '2.1.x'
Closes gh-18903
2019-11-06 14:53:19 +00:00
Andy Wilkinson
891c7120ef Wait for distribution to reach Bintray before checking its completeness
Previously, as soon as the distribution of a release from Artifactory
to Bintray had been initiated we would start checking if it was
complete. This created a race condition between the distribution being
created and us checking if it was complete. If the check won the race
and happened before the creation, Bintray would respond with a 404.

This commit updates BintrayService to wait for up to 5 minutes for the
distribution to be created on Bintray. Once it has been created we
then wait for up to 40 minutes for it to be complete as we did before.

The use of Awaitility has been introduced in this commit to simplify
the logic required to wait for the distribution's creation and
completion.

Closes gh-18902
2019-11-06 14:52:50 +00:00
Stephane Nicoll
8e3459fe4f Merge branch '2.1.x'
Closes gh-18851
2019-11-04 10:05:39 +01:00
dreis2211
f9cb7c6220 Drop JDK 12-based CI
See gh-18848
2019-11-04 10:00:42 +01:00
Madhura Bhave
2369639b4b Merge branch '2.1.x'
Closes gh-18840
2019-11-01 16:15:42 -07:00