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

11462 Commits

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
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
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
izeye
b17895844d Provide dependency management for elasticsearch-rest-client-sniffer 
See gh-24173
 2020-11-17 21:32:37 +01:00
Scott Frederick
da2276e7d4 Use stable builder and run images in integration tests 
Fixes gh-24183
 2020-11-17 13:54:10 -06:00
Stephane Nicoll
7283ff04eb Merge branch '2.3.x' 
Closes gh-24162
 2020-11-16 07:21:19 +01:00
Sergey Kolesnikov
b341b478a6 Rename "sla" to "slo" in reference documentation 
See gh-24160
 2020-11-16 07:20:23 +01: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
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
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
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
Andy Wilkinson
e35c8e0214 Upgrade to Micrometer 1.5.7 
Closes gh-24050
 2020-11-11 19:33:12 +00:00
Andy Wilkinson
9f10bb1405 Upgrade to Spring Kafka 2.6.3 
Closes gh-24074
 2020-11-11 19:31:50 +00:00
Andy Wilkinson
6507175d35 Upgrade to Spring Kafka 2.5.8.RELEASE 
Closes gh-24075
 2020-11-11 19:30:09 +00:00
Andy Wilkinson
0053fb7871 Upgrade to Spring Integration 5.3.4.RELEASE 
Closes gh-24096
 2020-11-11 19:28:49 +00:00
Andy Wilkinson
10355fc6dc Upgrade to Spring AMQP 2.3.1 
Closes gh-24073
 2020-11-11 19:27:48 +00:00
Andy Wilkinson
795100f27d Merge branch '2.3.x' 
See gh-24043
 2020-11-11 15:39:23 +00:00
Andy Wilkinson
4a630dc7a9 Only skip ..-prefixed locations when found via wildcard 
Closes gh-23983
 2020-11-11 15:36:39 +00:00
Andy Wilkinson
8f2de48fc1 Upgrade to Spring Data 2020.0.1 
Closes gh-24036
 2020-11-11 11:45:28 +00:00
Andy Wilkinson
634b88b950 Upgrade to Reactor 2020.0.1 
Closes gh-24110
 2020-11-11 10:37:25 +00:00
Andy Wilkinson
e8a1c3b9f8 Start building against Spring Integration 5.3.4 snapshots 
See gh-24096
 2020-11-11 09:16:30 +00:00
Andy Wilkinson
85cb5d4b3b Upgrade to Reactor Dysprosium-SR14 
Closes gh-24109
 2020-11-11 09:14:21 +00:00
Stephane Nicoll
c3793bd0af Upgrade to Spring HATEOAS 1.2.1 
Closes gh-24091
 2020-11-11 08:52:07 +01:00
Scott Frederick
59e0f7317e Avoid image pulls in integration tests 
This commit sets the pull policy to `IF_NOT_PRESENT` where possible
in integration tests for the Maven and Gradle plugins to reduce
the number of times the default Paketo builder and run images are
pulled from Docker Hub.

Fixes gh-24113
 2020-11-10 16:19:05 -06:00
Andy Wilkinson
21d97524d8 Merge branch '2.3.x' 
Closes gh-24112
 2020-11-10 17:38:30 +00:00
Andy Wilkinson
e6ab20b029 Merge branch '2.2.x' into 2.3.x 
Closes gh-24111
 2020-11-10 17:37:41 +00:00
Andy Wilkinson
31042bfc49 Test inclusion of system scope dependencies in repackaged war 
Closes gh-22503
 2020-11-10 17:35:04 +00:00
Stephane Nicoll
82652c7742 Start building against Reactor 2020.0.1 snapshots 
See gh-24110
 2020-11-10 18:22:01 +01:00
Stephane Nicoll
afe721bc34 Start building against Reactor Dysprosium-SR14 snapshots 
See gh-24109
 2020-11-10 18:00:10 +01:00
Stephane Nicoll
b6fc0913cf Merge branch '2.3.x' 
Closes gh-24104
 2020-11-10 17:44:05 +01:00
Stephane Nicoll
515b18e142 Merge branch '2.3.x' 
Closes gh-24108
 2020-11-10 17:10:26 +01:00
Stephane Nicoll
9e901b6e07 Upgrade to Testcontainers 1.15.0 
Closes gh-24103
 2020-11-10 16:24:16 +01:00
Stephane Nicoll
23ad2b4156 Rationalize Testcontainers image versions 
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
 2020-11-10 16:04:27 +01:00
Brian Clozel
24f29a6516 Polish 
See gh-24099
 2020-11-10 15:52:17 +01:00