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

30734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phillip Webb
13b2c2041f Merge branch '2.4.x' 
Closes gh-25158
 2021-02-09 16:41:17 -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
Madhura Bhave
301e80be8c Fix raw types error 2021-02-09 14:15:08 -08:00
Madhura Bhave
c05cb21ab7 Add a property to disable the /actuator discovery page 
Closes gh-24693
 2021-02-09 11:36:29 -08:00
Andy Wilkinson
3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource 
Closes gh-24944
 2021-02-09 17:10:03 +00:00
Stephane Nicoll
c60e9c8e64 Merge pull request #25109 from artembilan 
* pr/25109:
  Polish "Make Scheduler consistent for Spring Integration"
  Make Scheduler consistent for Spring Integration

Closes gh-25109
 2021-02-09 17:06:55 +01:00
Stephane Nicoll
dca643500a Polish "Make Scheduler consistent for Spring Integration" 
See gh-25109
 2021-02-09 17:06:43 +01:00
Artem Bilan
c5491cfdd7 Make Scheduler consistent for Spring Integration 
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
 2021-02-09 17:06:43 +01:00
Andy Wilkinson
78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout 
Closes gh-25146
 2021-02-09 15:51:24 +00:00
Stephane Nicoll
6668e008e0 Merge branch '2.4.x' 
Closes gh-25145
 2021-02-09 15:25:23 +01: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
6521d39867 Merge branch '2.4.x' 
Closes gh-25143
 2021-02-09 14:12:36 +00: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
c120f789d5 Merge branch '2.4.x' 
Closes gh-25141
 2021-02-09 15:04:58 +01: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
a9a8d3a167 Merge branch '2.4.x' 
Closes gh-25137
 2021-02-09 09:49:59 +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
ee59f644ed Merge branch '2.4.x' 
Closes gh-25136
 2021-02-09 09:45:37 +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