Commit Graph

30812 Commits

Author SHA1 Message Date
Andy Wilkinson
3ada6e9304 Upgrade to Janino 3.1.3
Closes gh-25193
2021-02-12 09:28:14 +00:00
Andy Wilkinson
adc601b72c Upgrade to Hibernate 5.4.28.Final
Closes gh-25192
2021-02-12 09:28:13 +00:00
Andy Wilkinson
4b6418f11f Upgrade to Hazelcast 3.12.12
Closes gh-25191
2021-02-12 09:28:12 +00:00
Andy Wilkinson
88afda03a3 Upgrade to Byte Buddy 1.10.20
Closes gh-25190
2021-02-12 09:28:11 +00:00
Andy Wilkinson
fa6c749215 Upgrade to AppEngine SDK 1.9.86
Closes gh-25189
2021-02-12 09:28:10 +00:00
Andy Wilkinson
da3f0dc1c7 Merge branch '2.4.x'
Closes gh-25186
2021-02-11 20:12:43 +00:00
Andy Wilkinson
9ba28a8b99 Merge branch '2.3.x' into 2.4.x
Closes gh-25185
2021-02-11 20:12:30 +00:00
Andy Wilkinson
bd64e05203 Instrument AMQP AbstractCF when defined as a ConnectionFactory
Fixes gh-25138
2021-02-11 20:09:40 +00:00
Stephane Nicoll
5017d59d56 Merge branch '2.4.x'
Closes gh-25184
2021-02-11 13:55:42 +01:00
Stephane Nicoll
75fc896321 Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See https://github.com/spring-projects/spring-framework/issues/26403

Closes gh-24857
2021-02-11 13:55:10 +01:00
Andy Wilkinson
55c47c8b5d Merge branch '2.4.x'
Closes gh-25183
2021-02-11 10:24:11 +00:00
Andy Wilkinson
698672e1cb Merge branch '2.3.x' into 2.4.x
Closes gh-25182
2021-02-11 10:23:20 +00:00
Andy Wilkinson
82dc2dffbd Select specific CLI distribution in CLI's integration tests
Previously, CommandLineInvoker would use the first -bin.zip file found
in build/distributions. If this directory contained multiple zips from
building different versions of Spring Boot, this could result in the
tests being run against the wrong version of the CLI.

This commit updates CommandLineInvoker look for a specific zip in
build/distributions, using the version from gradle.properties to
identify it.

Closes gh-25179
2021-02-11 10:20:30 +00:00
Andy Wilkinson
fc7319fbf6 Merge branch '2.4.x'
Closes gh-25181
2021-02-11 10:09:16 +00:00
Andy Wilkinson
f5176f3569 Merge branch '2.3.x' into 2.4.x
Closes gh-25180
2021-02-11 10:09:03 +00:00
Andy Wilkinson
ded71a0fa8 Merge pull request #25178 from rand0m86
* gh-25178:
  Polish "Remove duplicate declaration of jackson-databind"
  Remove duplicate declaration of jackson-databind

Closes gh-25178
2021-02-11 10:08:45 +00:00
Andy Wilkinson
2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
2021-02-11 10:08:34 +00:00
Vitalii Mahas
a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
2021-02-11 10:08:22 +00:00
Andy Wilkinson
2ff256d759 Merge branch '2.4.x'
Closes gh-25177
2021-02-10 19:43:16 +00:00
Andy Wilkinson
3c8a974558 Merge branch '2.3.x' into 2.4.x
Closes gh-25176
2021-02-10 19:42:54 +00:00
Andy Wilkinson
249b38e07d Merge branch '2.4.x'
Closes gh-25175
2021-02-10 19:42:20 +00:00
Andy Wilkinson
9da3b65ff3 Merge branch '2.3.x' into 2.4.x
Closes gh-25174
2021-02-10 19:41:56 +00:00
Andy Wilkinson
b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
2021-02-10 19:05:38 +00:00
Stephane Nicoll
78061f4f1d Merge pull request #24718 from bono007
* pr/24718:
  Polish "Filter properties with a particular prefix"
  Filter properties with a particular prefix

Closes gh-24718
2021-02-10 17:34:15 +01:00
Stephane Nicoll
b92bb9332b Polish "Filter properties with a particular prefix"
See gh-24718
2021-02-10 17:32:18 +01:00
Andy Wilkinson
708cbd7294 Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
2021-02-10 15:07:44 +00:00
bono007
ad7c69a9cd Filter properties with a particular prefix
This commit improves the configprops endpoint to allow filtering
properties based on a particular prefix

See gh-24718
2021-02-10 15:30:02 +01:00
Stephane Nicoll
0f9fb13141 Fix formatting 2021-02-10 15:25:41 +01:00
Stephane Nicoll
a2118e985a Merge branch '2.4.x'
Closes gh-25170
2021-02-10 15:17:26 +01:00
Stephane Nicoll
46bc551c2b Merge branch '2.3.x' into 2.4.x
Closes gh-25169
2021-02-10 15:14:21 +01:00
Stephane Nicoll
1524793a92 Fix use of deprecated Cassandra properties in integration tests
Closes gh-25148
2021-02-10 15:12:20 +01:00
Andy Wilkinson
514aede91e Merge branch '2.4.x'
Closes gh-25168
2021-02-10 12:20:02 +00:00
Andy Wilkinson
45e6c12cb6 Consider transitives when identifying project dependencies
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
2021-02-10 12:10:07 +00:00
Stephane Nicoll
d436521472 Merge branch '2.4.x'
Closes gh-25167
2021-02-10 10:46:56 +01:00
Stephane Nicoll
7cb1605c11 Merge branch '2.3.x' into 2.4.x
Closes gh-25166
2021-02-10 10:45:54 +01:00
Stephane Nicoll
b2258b8d62 Merge pull request #25130 from bono007
* pr/25130:
  Polish "Validate Cassandra defaults"
  Validate Cassandra defaults

Closes gh-25130
2021-02-10 10:19:20 +01:00
Stephane Nicoll
e5098697cb Polish "Validate Cassandra defaults"
See gh-25130
2021-02-10 10:18:28 +01:00
bono007
f71ab69aeb Validate Cassandra defaults
See gh-25130
2021-02-10 10:15:31 +01:00
Stephane Nicoll
d28d82d355 Merge branch '2.4.x'
Closes gh-25164
2021-02-10 09:41:28 +01:00
Stephane Nicoll
54b9f16ae4 Merge pull request #25150 from bono007
* pr/25150:
  Update copyright of changed file
  Fix defaults for Cassandra's initQueryTimeout and idleTimeout

Closes gh-25150
2021-02-10 09:41:02 +01:00
Stephane Nicoll
acc8f3708b Update copyright of changed file
See gh-25150
2021-02-10 09:37:04 +01:00
bono007
4ef82c45ac Fix defaults for Cassandra's initQueryTimeout and idleTimeout
See gh-25150
2021-02-10 09:36:17 +01:00
Phillip Webb
23e4ff70b8 Merge branch '2.4.x' 2021-02-09 16:48:29 -08:00
Phillip Webb
f334b27d60 Merge branch '2.3.x' into 2.4.x 2021-02-09 16:48:05 -08:00
Phillip Webb
166d9b12f1 Merge branch '2.2.x' into 2.3.x 2021-02-09 16:47:50 -08:00
Phillip Webb
7ed64f0677 Drop registry mirror from CI
Remove the registry mirror since it causes oci-build-task to fail.

See gh-25135
2021-02-09 16:46:26 -08:00
Phillip Webb
dceaf9b7f0 Merge branch '2.4.x'
Closes gh-25161
2021-02-09 16:44:26 -08:00
Phillip Webb
f555a6f55f Merge branch '2.3.x' into 2.4.x
Closes gh-25160
2021-02-09 16:44:04 -08:00
Phillip Webb
f5f1b4348e Merge branch '2.2.x' into 2.3.x
Closes gh-25159
2021-02-09 16:43:41 -08:00
Phillip Webb
0129e6b52d Upgrade CI to github-pr-resource v0.23.0
Closes gh-25155
2021-02-09 16:43:19 -08:00