Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,704 Commits 23 Branches 0 Tags
e708667fc00a6ff45cee906f0b8cca1ea521e9e8
Commit Graph

29704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
e708667fc0 Merge branch '2.3.x' 
Closes gh-24194
 2020-11-18 10:09:23 +01:00
Stephane Nicoll
76912d1952 Merge branch '2.2.x' into 2.3.x 
Closes gh-24193
 2020-11-18 10:09:03 +01:00
Stephane Nicoll
d96ff16da9 Merge pull request #24147 from stokpop 
* pr/24147:
  Polish "Avoid unnecessary pattern compilation in WebFluxTags"
  Avoid unnecessary pattern compilation in WebFluxTags

Closes gh-24147
 2020-11-18 10:08:38 +01:00
Stephane Nicoll
d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags" 
See gh-24147
 2020-11-18 09:58:03 +01:00
Peter Paul Bakker
b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags 
See gh-24147
 2020-11-18 09:58:03 +01:00
Phillip Webb
0ce3e7ec6b Protect against NPE caused by recursive calls 
Update `SpringBootConfigurationFactory` so that it no longer attempts
to get a `LoggingSystem`.

The recent `LoggingSystem` update means makes use of the
`SpringFactoriesLoader` class to load candidate logging systems.
Unfortunately, the `SpringFactoriesLoader` class creates a `Logger`
which (when using Log4J2) causes `SpringBootConfigurationFactory` to
run. Calling `LoggingSystem.get` from `SpringBootConfigurationFactory`
results in a recursive call to `SpringFactoriesLoader` which hasn't
yet been fully initialized. We then see an NPE caused by a `null`
`cache`.

This update removes the call to `LoggingSystem.get` with the assumption
that it would never return `null` anyway.

Fixes gh-24163
 2020-11-17 17:24:14 -08:00
Madhura Bhave
33499674e7 Merge branch '2.3.x' 
Closes gh-24188
 2020-11-17 16:24:42 -08:00
Madhura Bhave
af8b6ed5d2 Merge branch '2.2.x' into 2.3.x 
Closes gh-24187
 2020-11-17 16:23:37 -08:00
Madhura Bhave
4961599f53 Pin github-pr-resource to v0.21.0 
Closes gh-24145
 2020-11-17 16:21:24 -08:00
Phillip Webb
e8244d8d70 Add CharSequenceToObjectConverter support 
Update `ApplicationConversionService` with support for converting
`CharSequence` source types by using existing `String` based converters.

The addition is primarily to allow `ConfigTreePropertySource` values
to be converted correctly.

Closes gh-24171
 2020-11-17 13:19:10 -08:00
Stephane Nicoll
e220536ddb Merge branch '2.3.x' 
Closes gh-24186
 2020-11-17 21:36:58 +01:00
Stephane Nicoll
dea12f7551 Merge branch '2.2.x' into 2.3.x 
Closes gh-24185
 2020-11-17 21:36:34 +01:00
Stephane Nicoll
749f039b4b Merge pull request #24173 from izeye 
* pr/24173:
  Provide dependency management for elasticsearch-rest-client-sniffer

Closes gh-24173
 2020-11-17 21:33:00 +01:00
izeye
b17895844d Provide dependency management for elasticsearch-rest-client-sniffer 
See gh-24173
 2020-11-17 21:32:37 +01:00
Scott Frederick
a30fcbf1d5 Merge branch '2.3.x' 
Closes gh-24184
 2020-11-17 13:59:10 -06:00
Scott Frederick
da2276e7d4 Use stable builder and run images in integration tests 
Fixes gh-24183
 2020-11-17 13:54:10 -06:00
Andy Wilkinson
525cc4abf6 Merge branch '2.3.x' 
See gh-24179
 2020-11-17 14:39:23 +00:00
Andy Wilkinson
14b15027af Correct the ID of the GE conventions plugin 
See gh-24178
 2020-11-17 14:38:54 +00:00
Andy Wilkinson
9fdbf51024 Merge branch '2.3.x' 
Closes gh-24180
 2020-11-17 14:32:04 +00:00
Andy Wilkinson
23852aa06f Upgrade to Gradle Enterprise Gradle Plugin 3.5 
Closes gh-24177
 2020-11-17 14:31:43 +00:00
Andy Wilkinson
2cc6661054 Merge branch '2.3.x' 
Closes gh-24179
 2020-11-17 14:29:10 +00:00
Andy Wilkinson
666e9e1aa6 Merge branch '2.2.x' into 2.3.x 
Closes gh-24178
 2020-11-17 14:28:46 +00:00
Andy Wilkinson
039666a688 Upgrade to Gradle Enterprise Conventions 0.0.7 
Closes gh-24175
 2020-11-17 14:27:48 +00:00
Andy Wilkinson
845e287e51 Merge branch '2.2.x' into 2.3.x 2020-11-17 14:26:46 +00:00
Andy Wilkinson
27bc7db1fa Upgrade to Gradle Enterprise Maven Extension 1.7.1 
Closes gh-24176
 2020-11-17 14:24:52 +00:00
Stephane Nicoll
7283ff04eb Merge branch '2.3.x' 
Closes gh-24162
 2020-11-16 07:21:19 +01:00
Stephane Nicoll
1395e1eb32 Merge pull request #24160 from SCORE1387 
* pr/24160:
  Rename "sla" to "slo" in reference documentation

Closes gh-24160
 2020-11-16 07:21:02 +01:00
Sergey Kolesnikov
b341b478a6 Rename "sla" to "slo" in reference documentation 
See gh-24160
 2020-11-16 07:20:23 +01:00
Spring Buildmaster
b3970322aa Next development version (v2.4.1-SNAPSHOT) 2020-11-12 14:22:12 +00:00
Andy Wilkinson
6df10842d2 Allow Devtools to be enabled irrespective of the launching ClassLoader 
Closes gh-21424
 2020-11-12 13:22:40 +00:00
Andy Wilkinson
30bc0ad96a Merge branch '2.3.x' 2020-11-12 12:33:24 +00:00
Spring Buildmaster
5a5f5bc2ad Next development version (v2.3.7.BUILD-SNAPSHOT) 2020-11-12 08:57:43 +00:00
Andy Wilkinson
bce2029bc6 Merge branch '2.3.x' 
Closes gh-24132
 2020-11-12 08:12:39 +00:00
Andy Wilkinson
189046bd4f Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars" 
Closes gh-24131
 2020-11-12 08:11:00 +00:00
Stephane Nicoll
5b311d805b Upgrade to Netty 4.1.54.Final 
Closes gh-24129
 2020-11-12 07:25:49 +01:00
Stephane Nicoll
62e5f2e8a6 Upgrade to jOOQ 3.14.3 
Closes gh-24128
 2020-11-12 07:25:47 +01:00
Stephane Nicoll
56ce2afe8f Upgrade to Infinispan 11.0.5.Final 
Closes gh-24127
 2020-11-12 07:25:46 +01:00
Stephane Nicoll
20edba51ef Upgrade to AssertJ 3.18.1 
Closes gh-24126
 2020-11-12 07:25:45 +01:00
Stephane Nicoll
e2914a20cd Merge branch '2.3.x' 2020-11-12 07:24:52 +01:00
Stephane Nicoll
8311edf722 Upgrade to Neo4j OGM 3.2.18 
Closes gh-24125
 2020-11-12 07:15:26 +01:00
Stephane Nicoll
79835dc20f Upgrade to Netty 4.1.54.Final 
Closes gh-24124
 2020-11-12 07:08:37 +01:00
Andy Wilkinson
6b650f8c45 Upgrade to Spring Integration 5.4.1 
Closes gh-24097
 2020-11-11 21:25:09 +00:00
Andy Wilkinson
368b40868f Merge branch '2.3.x' 
Closes gh-24122
 2020-11-11 20:16:51 +00:00
Andy Wilkinson
3e243de41b Merge branch '2.2.x' into 2.3.x 
Closes gh-24121
 2020-11-11 20:16:39 +00:00
Andy Wilkinson
0c938ffa73 Merge pull request #24119 from dreis2211 
* gh-24119:
  Fix link to Flyway callback docs

Closes gh-24119
 2020-11-11 20:14:36 +00:00
dreis2211
033c78b945 Fix link to Flyway callback docs 
See gh-24119
 2020-11-11 20:14:08 +00:00
Andy Wilkinson
f8a5be8245 Merge pull request #24120 from dreis2211 
* gh-24120:
  Fix deprecation warnings in javadoc comments

Closes gh-24120
 2020-11-11 20:10:07 +00:00
dreis2211
5ef6e09c64 Fix deprecation warnings in javadoc comments 
See gh-24120
 2020-11-11 20:09:23 +00:00
Andy Wilkinson
51981d5ed3 Upgrade to Spring Session 2020.0.1 
Closes gh-24098
 2020-11-11 19:46:45 +00:00
Andy Wilkinson
4a9ca33026 Upgrade to Micrometer 1.6.1 
Closes gh-24051
 2020-11-11 19:35:29 +00:00