Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,405 Commits 23 Branches 0 Tags
698672e1cb8ba6d1db995e63013f50127c025474
Commit Graph

30405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
3c8a974558 Merge branch '2.3.x' into 2.4.x 
Closes gh-25176
 2021-02-10 19:42:54 +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
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
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
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
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
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
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
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
Phillip Webb
cd44db9fdb Merge branch '2.3.x' into 2.4.x 
Closes gh-25157
 2021-02-09 16:40:24 -08:00
Phillip Webb
479f6200da Merge branch '2.2.x' into 2.3.x 
Closes gh-25156
 2021-02-09 16:39:32 -08:00
Phillip Webb
4b97f819d6 Upgrade CI to artifactory-resource 0.0.13 
Closes gh-25154
 2021-02-09 16:37:08 -08:00
Stephane Nicoll
890c95adba Merge branch '2.3.x' into 2.4.x 
Closes gh-25144
 2021-02-09 15:25:07 +01:00
Stephane Nicoll
700c9ee0d9 Merge pull request #25120 from dreis2211 
* pr/25120:
  Upgrade to Gradle Enterprise Gradle Plugin 3.5.2

Closes gh-25120
 2021-02-09 15:24:52 +01:00
dreis2211
4bb86d4d8d Upgrade to Gradle Enterprise Gradle Plugin 3.5.2 
See gh-25120
 2021-02-09 15:24:08 +01:00
Andy Wilkinson
caa9249987 Merge branch '2.3.x' into 2.4.x 
Closes gh-25142
 2021-02-09 14:11:59 +00:00
Andy Wilkinson
7898b6afb0 Remove duplicate publication from spring-boot-docs 
Fixes gh-25132
 2021-02-09 14:10:58 +00:00
Stephane Nicoll
9218965104 Merge branch '2.3.x' into 2.4.x 
Closes gh-25140
 2021-02-09 15:04:28 +01:00
Stephane Nicoll
4f656d379c Merge pull request #25116 from dreis2211 
* pr/25116:
  Fix build deprecation warnings about duplicate jar entries

Closes gh-25116
 2021-02-09 15:04:06 +01:00
dreis2211
4937547b8a Fix build deprecation warnings about duplicate jar entries 
See gh-25116
 2021-02-09 14:45:58 +01:00
Stephane Nicoll
b09202ed40 Merge pull request #25093 from izeye 
* pr/25093:
  Polish

Closes gh-25093
 2021-02-09 09:49:44 +01:00
izeye
63ee99bf75 Polish 
See gh-25093
 2021-02-09 09:48:35 +01:00
Stephane Nicoll
1c5b802bfe Merge pull request #25075 from oleg-sukhov 
* pr/25075:
  Polish "Clarify usage of BufferingApplicationStartup"
  Clarify usage of BufferingApplicationStartup

Closes gh-25075
 2021-02-09 09:44:47 +01:00
Stephane Nicoll
b2818680fd Polish "Clarify usage of BufferingApplicationStartup" 
See gh-25075
 2021-02-09 09:44:19 +01:00
Oleg Sukhov
853dbc3de3 Clarify usage of BufferingApplicationStartup 
See gh-25075
 2021-02-09 09:21:52 +01:00
Andy Wilkinson
88bea823f8 Merge branch '2.3.x' into 2.4.x 
Closes gh-25118
 2021-02-05 13:58:54 +00:00
Andy Wilkinson
d12bb6f915 Upgrade to Gradle 6.8.2 
Closes gh-25117
 2021-02-05 13:34:00 +00:00
Andy Wilkinson
297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate 
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] a0f4d81db7
 2021-02-04 10:59:00 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x 
See gh-25076
 2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00
Phillip Webb
230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb
630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb
331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00