root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
36,365 Commits 23 Branches 345 Tags 267 MiB
Commit Graph

16204 Commits

Author SHA1 Message Date
Stephane Nicoll c55f0a1eac Start building against Micrometer 1.7.10 snapshots 
See gh-30171
 2022-03-11 21:22:48 +01:00
Stephane Nicoll 2620710480 Start building against Spring Framework 5.3.17 snapshots 
See gh-30170
 2022-03-11 21:22:48 +01:00
Stephane Nicoll d14d0c3f04 Start building against Reactor 2020.0.17 snapshots 
See gh-30169
 2022-03-11 17:08:52 +01:00
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x 
Closes gh-30164
 2022-03-11 11:03:01 +00:00
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s 
Closes gh-30163
 2022-03-11 11:02:18 +00:00
Andy Wilkinson 4c1d1a6a69 Merge branch '2.5.x' into 2.6.x 
Closes gh-30166
 2022-03-11 08:17:59 +00:00
Andy Wilkinson cced7edd9c Document Devtools' property defaults directly in reference docs 
Closes gh-29406
 2022-03-11 08:15:40 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x 
Closes gh-30164
 2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra 
Closes gh-30163
 2022-03-10 16:50:39 +00:00
Andy Wilkinson 0958498a47 Merge branch '2.5.x' into 2.6.x 
Closes gh-30161
 2022-03-10 16:31:09 +00:00
Andy Wilkinson 6eacc07de0 Fix handling of Flux responses from Actuator endpoints 
Closes gh-30095
 2022-03-10 16:10:39 +00:00
Madhura Bhave bdcc2509f5 Merge branch '2.5.x' into 2.6.x 
Closes gh-30149
 2022-03-09 15:52:56 -08:00
Madhura Bhave d0883ba6ef Document the WebSocket-related exclusions that are required to use Jetty 10 
Closes gh-29275
 2022-03-09 15:40:01 -08:00
Andy Wilkinson 382c6972ec Merge branch '2.5.x' into 2.6.x 
Closes gh-30141
 2022-03-09 18:39:32 +00:00
Andy Wilkinson 5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1 
Closes gh-30139
 2022-03-09 18:09:07 +00:00
Andy Wilkinson abcc246a38 Polish 2022-03-09 15:22:24 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x 
Closes gh-30134
 2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests 
Closes gh-29693
 2022-03-09 14:41:13 +00:00
Andy Wilkinson b1be6ac271 Merge branch '2.5.x' into 2.6.x 
Closes gh-30132
 2022-03-09 14:28:01 +00:00
Andy Wilkinson 314acd3407 Add EIGHTEEN to JavaVersion 
Closes gh-29524
 2022-03-09 14:26:19 +00:00
Andy Wilkinson b0e4cabdd8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30123
 2022-03-09 12:37:45 +00:00
Andy Wilkinson 20d21d4e58 Set up CI with JDK 18 
Closes gh-30104
 2022-03-09 12:28:34 +00:00
Moritz Halbritter 16f069ef47 Merge branch '2.5.x' into 2.6.x 
Closes gh-30125
 2022-03-09 12:10:05 +01:00
Moritz Halbritter d14980ed5e Polish "Tweak performance for Prometheus scraping endpoint" 
See gh-30085
 2022-03-09 12:08:55 +01:00
Peter Paul Bakker fb3f3c52cf Tweak performance for Prometheus scraping endpoint 
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
 2022-03-09 12:08:26 +01:00
Stephane Nicoll 069c328075 Merge branch '2.5.x' into 2.6.x 
Closes gh-30120
 2022-03-09 08:29:07 +01:00
fml2 80b90ed386 Fix typo 
See gh-30118
 2022-03-09 08:28:44 +01:00
Stephane Nicoll be85f317d3 Fix anchor tag for Spring HATEOAS section 
Closes gh-30106
 2022-03-09 08:25:10 +01:00
Madhura Bhave 09dc4e5ce3 Merge branch '2.5.x' into 2.6.x 
Closes gh-30113
Closes gh-30114
 2022-03-08 22:01:26 -08:00
Madhura Bhave ef7d7487fa Document when config data properties are invalid 
This commit also reinstates documentation for
`spring.profiles.include`

Closes gh-25849
Closes gh-28451
 2022-03-08 21:58:43 -08:00
Madhura Bhave b86ad89523 Merge branch '2.5.x' into 2.6.x 
Closes gh-30111
 2022-03-08 18:13:01 -08:00
Madhura Bhave 7d63faac7c Document the scalar types supported by MapBinder 
Closes gh-27581
 2022-03-08 18:12:21 -08:00
Madhura Bhave 9c437c6cd9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30109
 2022-03-08 17:40:52 -08:00
Madhura Bhave d240e293db Document how to obtain ServletContext with an embedded container setup 
Closes gh-24561
 2022-03-08 17:34:35 -08:00
Andy Wilkinson 5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson 708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x 
Closes gh-30098
 2022-03-08 13:52:25 +00:00
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate 
Closes gh-30073
 2022-03-08 13:51:38 +00:00
Madhura Bhave d131003456 Merge branch '2.5.x' into 2.6.x 
Closes gh-30093
 2022-03-07 21:53:44 -08:00
Madhura Bhave 480ccc6175 Clarify devtools documentation when using with build plugins 
Closes gh-17851
 2022-03-07 21:52:43 -08:00
Madhura Bhave 27bf068091 Merge branch '2.5.x' into 2.6.x 2022-03-07 20:22:42 -08:00
Madhura Bhave 9b073c825b Fix checkstyle 2022-03-07 20:22:27 -08:00
Madhura Bhave ac04be75f8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30091
 2022-03-07 18:23:19 -08:00
Madhura Bhave ed8f8d59ef Document how to structure configurations for efficient slice tests 
Closes gh-16088
 2022-03-07 18:21:12 -08:00
Moritz Halbritter e980a53399 Merge branch '2.5.x' into 2.6.x 2022-03-07 14:11:11 +01:00
Moritz Halbritter f3eb90046f Remove @Repeatable support for @DisabledOnOs 
We'll add it back again when we need it, and delay the naming issue.

See gh-30082
 2022-03-07 14:10:13 +01:00
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x 
Closes gh-30083
 2022-03-07 13:22:34 +01:00
Moritz Halbritter be38311c5d Disable incompatible tests on Linux AArch64 
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
 2022-03-07 13:22:17 +01:00
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x 
Closes gh-30080
 2022-03-07 09:49:00 +01:00
Stephane Nicoll cf9cc82025 Update copyright year of change file 
See gh-30074
 2022-03-07 09:47:12 +01:00
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout 
See gh-30074
 2022-03-07 09:42:43 +01:00
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x 
Closes gh-30070
 2022-03-04 17:56:14 +00:00
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use 
Closes gh-30061
 2022-03-04 17:55:54 +00:00
Andy Wilkinson c872539dea Polish "Clarify actuator security documentation" 
See gh-30065
 2022-03-04 17:20:25 +00:00
Khan, C M Abdullah 5b7c21e780 Clarify actuator security documentation 
See gh-30065
 2022-03-04 17:20:17 +00:00
Andy Wilkinson fd3248b629 Merge branch '2.5.x' into 2.6.x 
Closes gh-30059
 2022-03-03 20:39:10 +00:00
Lars Grefer 99a8374249 Use Gradle's configuration avoidance APIs in the reference docs 
See gh-30000
 2022-03-03 20:38:35 +00:00
Andy Wilkinson 2ba8b490a0 Merge branch '2.5.x' into 2.6.x 
Closes gh-30057
 2022-03-03 20:34:34 +00:00
Andy Wilkinson e7566e968e Use configuration avoidance APIs in Gradle plugin's docs 
Closes gh-30056
 2022-03-03 20:27:46 +00:00
Andy Wilkinson 1f2da6a341 Document SanitizingFunction 
Closes gh-29950
 2022-03-03 14:17:28 +00:00
Andy Wilkinson d63e609fda Merge branch '2.5.x' into 2.6.x 
Closes gh-30050
 2022-03-03 12:08:11 +00:00
Andy Wilkinson 7dce772d67 Polish "Update placeholder docs to mention env vars and default values" 
See gh-30012
 2022-03-03 12:07:38 +00:00
Kirill Marchuk 2644a2b897 Update placeholder docs to mention env vars and default values 
See gh-30012
 2022-03-03 11:48:50 +00:00
Andy Wilkinson d11c5d3bd2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30048
 2022-03-03 11:27:18 +00:00
wonwoo c2bf0d551b Polish RestController examples 
See gh-30027
 2022-03-03 11:26:11 +00:00
Andy Wilkinson 71dd607623 Merge branch '2.5.x' into 2.6.x 
Closes gh-30043
 2022-03-03 10:33:40 +00:00
Andy Wilkinson 34e436ef6e Accommodate SocketException when reading from stopped TunnelClient 
TunnelClientTests stopTriggersTunnelClose expects that stopping the
client will cause an attempt to read from a connected channel to
return -1. With Java 17 on Windows the connection has been reset and
a SocketException is thrown instead. This seems reasonable as
stopping the client closes the ServerSocketChannel to which the test
was connected.

This commit updates test to expect a SocketException or a return
value of -1.

Closes gh-30042
 2022-03-03 10:30:54 +00:00
Andy Wilkinson 0ca64d3b64 Merge branch '2.5.x' into 2.6.x 
Closes gh-30038
 2022-03-02 15:56:04 +00:00
Andy Wilkinson 35e5b4329e Provide complete dependency management for Netty tcNative 
Closes gh-30010
 2022-03-02 15:55:15 +00:00
Andy Wilkinson ea729fc1c6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30036
 2022-03-02 15:21:43 +00:00
Andy Wilkinson 4073cf8334 Only apply special handling of META-INF to jar files 
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.

This commit reworks the changes so that they only apply to jar files.

Closes gh-30026
 2022-03-02 15:19:09 +00:00
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x 
Closes gh-30033
 2022-03-02 12:21:20 +00:00
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean 
See gh-29983
 2022-03-02 11:40:44 +00:00
Andy Wilkinson 1ac1782e21 Merge branch '2.5.x' into 2.6.x 
Closes gh-30031
 2022-03-02 11:21:56 +00:00
Andy Wilkinson 35f9358eb2 Manage more of Kafka's modules 
Closes gh-29023
 2022-03-02 11:06:25 +00:00
Andy Wilkinson 3630952f7b Merge branch '2.5.x' into 2.6.x 
Closes gh-30022
 2022-03-01 17:49:14 +00:00
Andy Wilkinson a265f150ac Improve parsing of numeric default values 
Previously, all integral numbers were parsed as integers. This
caused two problems:

1. Compilation would fail if the default value for a long wasn't a
   valid integer.
2. The default value for a byte or short could be out of range,
   resulting in the generation of invalid metadata and an error
   that could have been caught at compile time not being caught
   until runtime.

This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.

Fixes gh-30020
 2022-03-01 17:38:19 +00:00
Andy Wilkinson c8b849e2f6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30018
 2022-03-01 12:32:07 +00:00
Andy Wilkinson 355f80ab98 Add links to Spring Boot for Apache Geode and its documentation 
Closes gh-29697
 2022-03-01 12:13:58 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x 
Closes gh-30008
 2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash 
Closes gh-30007
 2022-02-28 10:54:31 +00:00
Stephane Nicoll 0941cfd5fe Merge branch '2.5.x' into 2.6.x 
Closes gh-29993
 2022-02-24 15:12:26 +01:00
Stephane Nicoll b60b5feefe Add explicit dependency on inject-api 
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.

Closes gh-29990
 2022-02-24 15:12:09 +01:00
Phillip Webb 1a3841f74e Polish 2022-02-23 21:44:14 -08:00
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb 57009d5623 Polish 2022-02-23 21:43:42 -08:00
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests 
Fixes gh-29885
 2022-02-23 17:56:21 -06:00
Madhura Bhave acd1ba0eca Merge branch '2.5.x' into 2.6.x 
Closes gh-29980
 2022-02-23 15:28:17 -08:00
Madhura Bhave 67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved 
Closes gh-23164
 2022-02-23 15:27:43 -08:00
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x 
Closes gh-29978
 2022-02-23 15:10:12 -08:00
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data 
Closes gh-29606
 2022-02-23 15:09:42 -08:00
Stephane Nicoll 8147aff76a Upgrade to Spring Batch 4.3.5 
Closes gh-29724
 2022-02-23 17:04:59 +01:00
Stephane Nicoll f864505ea7 Upgrade to Netty tcNative 2.0.50.Final 
Closes gh-29974
 2022-02-23 17:04:40 +01:00
Stephane Nicoll 479a4e693c Upgrade to Spring Batch 4.3.5 
Closes gh-29714
 2022-02-23 16:58:39 +01:00
Stephane Nicoll 773b025208 Upgrade to Netty tcNative 2.0.50.Final 
Closes gh-29973
 2022-02-23 16:57:32 +01:00
Stephane Nicoll d1ab3f5f78 Upgrade to Spring Session 2021.1.2 
Closes gh-29725
 2022-02-23 16:19:26 +01:00
Stephane Nicoll 776ccf77a7 Upgrade to Spring Session 2021.0.5 
Closes gh-29715
 2022-02-23 16:17:52 +01:00
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x 
Closes gh-29970
 2022-02-23 11:52:57 +00:00
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged 
Closes gh-29953
 2022-02-23 11:30:21 +00:00
Andy Wilkinson 4f8a18fa0a Merge branch '2.5.x' into 2.6.x 
Closes gh-29966
 2022-02-23 08:59:16 +00:00
Andy Wilkinson 9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples 
Closes gh-29965
 2022-02-23 08:59:04 +00:00
Stephane Nicoll 9e3891a0fe Upgrade to Spring Integration 5.5.9 
Closes gh-29963
 2022-02-23 08:29:23 +01:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3 
Closes gh-29722
 2022-02-23 08:27:24 +01:00
Stephane Nicoll ee7426a555 Upgrade to Spring Integration 5.5.9 
Closes gh-29962
 2022-02-23 08:21:14 +01:00
Stephane Nicoll 3f2d01628d Upgrade to Spring Kafka 2.7.11 
Closes gh-29712
 2022-02-23 08:19:08 +01:00
Madhura Bhave 880db30c67 Merge branch '2.5.x' into 2.6.x 
Closes gh-29959
 2022-02-22 15:49:18 -08:00
Madhura Bhave a70fa80571 Rectify incorrect sanitizing regex example provided in how-to docs 
Closes gh-29951
 2022-02-22 15:44:50 -08:00
Andy Wilkinson 3614c8d1f8 Merge branch '2.5.x' into 2.6.x 
Closes gh-29954
 2022-02-22 20:08:31 +00:00
Andy Wilkinson 1e8d29f7aa Configure Kotlin compilation JVM target by convention 
Closes gh-29952
 2022-02-22 18:11:51 +00:00
Stephane Nicoll d6105c7122 Upgrade to Postgresql 42.3.3 
Closes gh-29941
 2022-02-22 08:47:38 +01:00
Stephane Nicoll 6e0f664bbe Upgrade to Netty tcNative 2.0.49.Final 
Closes gh-29940
 2022-02-22 08:47:35 +01:00
Stephane Nicoll 2617eeb1fd Upgrade to Jetty Reactive HTTPClient 1.1.11 
Closes gh-29939
 2022-02-22 08:47:32 +01:00
Stephane Nicoll 8daa8e2307 Upgrade to AppEngine SDK 1.9.95 
Closes gh-29938
 2022-02-22 08:47:30 +01:00
Stephane Nicoll 2bd58f8f9b Upgrade to ActiveMQ 5.16.4 
Closes gh-29937
 2022-02-22 08:47:27 +01:00
Stephane Nicoll 49337f30da Upgrade to Netty tcNative 2.0.49.Final 
Closes gh-29936
 2022-02-22 08:43:16 +01:00
Stephane Nicoll db26aff792 Merge branch '2.5.x' into 2.6.x 
Closes gh-29934
 2022-02-22 08:30:38 +01:00
UbaidurRehman1 7b48c51689 Clarify that any property of the environment can be used in a banner 
See gh-29931
 2022-02-22 08:30:07 +01:00
Andy Wilkinson ca2dbf39ec Upgrade to Jetty Reactive HTTPClient 1.1.11 
Closes gh-29927
 2022-02-21 14:26:48 +00:00
Andy Wilkinson df6959679c Upgrade to AppEngine SDK 1.9.95 
Closes gh-29926
 2022-02-21 14:26:45 +00:00
Andy Wilkinson 7db9bb94cd Upgrade to ActiveMQ 5.16.4 
Closes gh-29925
 2022-02-21 14:26:42 +00:00
Andy Wilkinson 2d8495361e Upgrade to Spring Security 5.6.2 
Closes gh-29723
 2022-02-21 14:09:38 +00:00
Andy Wilkinson 21fb273ec3 Upgrade to Spring Security 5.5.5 
Closes gh-29713
 2022-02-21 14:08:16 +00:00
Andy Wilkinson fcd52c02a7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29921
 2022-02-21 14:01:47 +00:00
Andy Wilkinson 55f68989d8 Remove redundant action to make plugins dat file reproducible 
Closes gh-29917
 2022-02-21 14:01:04 +00:00
Stephane Nicoll c52f6f09ad Merge branch '2.5.x' into 2.6.x 
Closes gh-29915
 2022-02-21 09:25:08 +01:00
Stephane Nicoll 92cd51e6b0 Polish "Clarify log message with a profile containing a comma" 
See gh-29896
 2022-02-21 09:00:27 +01:00
gcoppex c8466a14e9 Clarify log message with a profile containing a comma 
See gh-29896
 2022-02-21 08:28:10 +01:00
Andy Wilkinson 95d67a985b Merge branch 'gh-29639' into 2.6.x 
Closes gh-29909
 2022-02-19 11:36:09 +00:00
Andy Wilkinson 5baa71f1b3 Allow beans with circular dependencies to be spied 
Closes gh-29639
 2022-02-19 11:35:58 +00:00
Andy Wilkinson 9a3f053034 Allow beans with circular dependencies to be spied 
Closes gh-29639
 2022-02-19 11:35:28 +00:00
Andy Wilkinson f919c9983c Upgrade to Spring Data 2021.1.2 
Closes gh-29721
 2022-02-19 08:02:55 +00:00
Andy Wilkinson 1c4fc7d3fa Upgrade to Spring Data 2021.0.9 
Closes gh-29711
 2022-02-19 07:59:10 +00:00
Stephane Nicoll 47510924e5 Upgrade to Spring LDAP 2.3.6 
Closes gh-29720
 2022-02-18 17:28:16 +01:00
Stephane Nicoll 6bf172f0f2 Upgrade to Spring LDAP 2.3.6 
Closes gh-29710
 2022-02-18 17:02:39 +01:00
Brian Clozel 16c47595e7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29905
 2022-02-18 13:55:27 +01:00
Brian Clozel 00114f9d61 Deregister failed contexts from SpringApplicationShutdownHook 
Prior to this change, SpringApplication would register contexts to
SpringApplicationShutdownHook and only deregister them when they're
properly closed. A failed refresh attempt does not deregister the
context from the shutdown hook.
When a test suite runs lots of tests failing because of failed contexts,
this can build up and consume lots of resources.

This commit fixes this leak and deregisters failed contexts.

Fixes gh-29874
 2022-02-18 13:54:14 +01:00
Andy Wilkinson 9da6fb4a5a Merge branch '2.5.x' into 2.6.x 
Closes gh-29903
 2022-02-18 11:42:10 +00:00
Andy Wilkinson c676b8b84d Remove KafkaPropertiesKafka24Tests 
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
 2022-02-18 11:41:24 +00:00
Andy Wilkinson 0cebb332d1 Merge branch '2.5.x' into 2.6.x 
Closes gh-29901
 2022-02-18 11:08:21 +00:00
Andy Wilkinson ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain 
Closes gh-29900
 2022-02-18 11:05:48 +00:00
Stephane Nicoll 5b58d1bfca Upgrade to Spring Framework 5.3.16 
Closes gh-29719
 2022-02-17 11:12:37 +01:00
Stephane Nicoll b1cfa402e8 Upgrade to Spring Framework 5.3.16 
Closes gh-29709
 2022-02-17 11:11:57 +01:00
Stephane Nicoll 6c82bb2e6f Upgrade to Micrometer 1.8.3 
Closes gh-29718
 2022-02-17 10:00:41 +01:00
Stephane Nicoll 0fba81adf0 Upgrade to Micrometer 1.7.9 
Closes gh-29708
 2022-02-17 09:59:40 +01:00
Phillip Webb 560d576a02 Polish 2022-02-16 20:30:14 -08:00
Phillip Webb 5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Phillip Webb 9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Andy Wilkinson 86c75b7a5c Merge branch '2.5.x' into 2.6.x 
Closes gh-29880
 2022-02-16 14:58:58 +00:00
Andy Wilkinson 03352b0a8c Prohibit use of APIs that prevent task configuration avoidance 
Closes gh-29809
 2022-02-16 14:57:47 +00:00
Stephane Nicoll 4fe0fb8913 Merge branch '2.5.x' into 2.6.x 2022-02-16 14:32:30 +01:00
Stephane Nicoll 865a829d29 Prevent upgrade to AspectJ 1.9.8 as it requires Java 11 2022-02-16 14:31:26 +01:00
Andy Wilkinson ce4beae12f Merge branch '2.5.x' into 2.6.x 
Closes gh-29877
 2022-02-16 12:01:15 +00:00
izeye 6bd6f590d3 Fix Javadoc since for ResolveMainClassName#setClasspath(Object) 
See gh-29826
 2022-02-16 12:00:31 +00:00
Stephane Nicoll f59e442978 Merge branch '2.5.x' into 2.6.x 
Closes gh-29822
 2022-02-15 16:19:59 +01:00
Stephane Nicoll f3af035941 Remove usage of SocketUtils in tests 
Closes gh-29821
 2022-02-15 16:17:21 +01:00
Stephane Nicoll 863b23e7a8 Upgrade to Reactor 2020.0.16 
Closes gh-29717
 2022-02-15 15:10:11 +01:00
Stephane Nicoll f180397998 Upgrade to Reactor 2020.0.16 
Closes gh-29707
 2022-02-15 15:09:21 +01:00
Andy Wilkinson f134358c78 Merge branch '2.5.x' into 2.6.x 
Closes gh-29817
 2022-02-15 12:24:05 +00:00
Andy Wilkinson c84b35c460 Polish "Avoid using Gradle APIs that trigger eager task creation" 
See gh-29762
 2022-02-15 08:36:29 +00:00
Lars Grefer 7cd87acd73 Avoid using Gradle APIs that trigger eager task creation 
See gh-29762
 2022-02-15 08:24:14 +00:00
Andy Wilkinson 64e24a0e11 Merge branch '2.5.x' into 2.6.x 
Closes gh-29807
 2022-02-14 14:48:30 +00:00
dreis2211 39394b9c2b Link to Integration section of the appendix for Kafka properties 
See gh-29758
 2022-02-14 14:25:40 +00:00
Stephane Nicoll f6a0fd5938 Upgrade to Undertow 2.2.16.Final 
Closes gh-29804
 2022-02-14 13:43:45 +01:00
Stephane Nicoll 72fad9843a Upgrade to Thymeleaf 3.0.15.RELEASE 
Closes gh-29802
 2022-02-14 13:43:45 +01:00
Stephane Nicoll 775ada2001 Upgrade to SLF4J 1.7.36 
Closes gh-29801
 2022-02-14 13:43:45 +01:00
Stephane Nicoll 4a88b521a8 Upgrade to Postgresql 42.3.2 
Closes gh-29800
 2022-02-14 13:43:45 +01:00
Stephane Nicoll b73c67e53e Upgrade to Netty tcNative 2.0.48.Final 
Closes gh-29799
 2022-02-14 13:43:44 +01:00
Stephane Nicoll 185c4968c2 Upgrade to Netty 4.1.74.Final 
Closes gh-29798
 2022-02-14 13:43:44 +01:00
Stephane Nicoll bb336e5e7b Upgrade to Neo4j Java Driver 4.4.3 
Closes gh-29797
 2022-02-14 13:43:44 +01:00
Stephane Nicoll 57bc5136f5 Upgrade to MongoDB 4.4.2 
Closes gh-29796
 2022-02-14 13:43:44 +01:00
Stephane Nicoll dd293cd86c Upgrade to Maven Javadoc Plugin 3.3.2 
Closes gh-29795
 2022-02-14 13:43:44 +01:00
Stephane Nicoll b1160d676d Upgrade to Json-smart 2.4.8 
Closes gh-29794
 2022-02-14 13:43:44 +01:00
Stephane Nicoll 82a0491afd Upgrade to Johnzon 1.2.16 
Closes gh-29793
 2022-02-14 13:43:44 +01:00
Stephane Nicoll dc171c6462 Upgrade to Jetty 9.4.45.v20220203 
Closes gh-29791
 2022-02-14 13:43:43 +01:00
Stephane Nicoll 96e4cbbe04 Upgrade to HttpClient5 5.1.3 
Closes gh-29790
 2022-02-14 13:43:43 +01:00
Stephane Nicoll f2ab9c3b10 Upgrade to Hibernate Validator 6.2.2.Final 
Closes gh-29789
 2022-02-14 13:43:43 +01:00
Stephane Nicoll 60cf736e28 Upgrade to Hibernate 5.6.5.Final 
Closes gh-29788
 2022-02-14 13:43:43 +01:00
Stephane Nicoll 7800c9b1de Upgrade to Glassfish JAXB 2.3.6 
Closes gh-29787
 2022-02-14 13:43:43 +01:00
Stephane Nicoll e5f399b005 Upgrade to Dropwizard Metrics 4.2.8 
Closes gh-29786
 2022-02-14 13:43:43 +01:00
Stephane Nicoll 7375a5f52f Upgrade to Couchbase Client 3.2.5 
Closes gh-29785
 2022-02-14 13:43:42 +01:00
Stephane Nicoll 7016693f0e Upgrade to Artemis 2.19.1 
Closes gh-29784
 2022-02-14 13:43:42 +01:00
Stephane Nicoll 32dda9e730 Upgrade to AppEngine SDK 1.9.94 
Closes gh-29783
 2022-02-14 13:43:42 +01:00
Stephane Nicoll 4ee7b4b25a Upgrade to Undertow 2.2.16.Final 
Closes gh-29781
 2022-02-14 13:43:25 +01:00
Stephane Nicoll e9eba82c6c Upgrade to Thymeleaf 3.0.15.RELEASE 
Closes gh-29779
 2022-02-14 13:43:24 +01:00
Stephane Nicoll 0440147f41 Upgrade to SLF4J 1.7.36 
Closes gh-29778
 2022-02-14 13:43:24 +01:00
Stephane Nicoll ea609ae697 Upgrade to Postgresql 42.2.25 
Closes gh-29777
 2022-02-14 13:43:24 +01:00
Stephane Nicoll 1c1bf932b2 Upgrade to Netty tcNative 2.0.48.Final 
Closes gh-29776
 2022-02-14 13:43:24 +01:00
Stephane Nicoll 66cc3e7730 Upgrade to Netty 4.1.74.Final 
Closes gh-29775
 2022-02-14 13:43:24 +01:00
Stephane Nicoll f29152496a Upgrade to Neo4j Java Driver 4.2.9 
Closes gh-29774
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 4f98bfd39d Upgrade to Json-smart 2.4.8 
Closes gh-29773
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 7de763f2d7 Upgrade to Johnzon 1.2.16 
Closes gh-29772
 2022-02-14 13:43:23 +01:00
Stephane Nicoll a99582a3bb Upgrade to Jetty 9.4.45.v20220203 
Closes gh-29771
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 1cdb75f780 Upgrade to Hibernate Validator 6.2.2.Final 
Closes gh-29770
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 2485c05a50 Upgrade to Glassfish JAXB 2.3.6 
Closes gh-29769
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 6c09d4d7a1 Upgrade to Dropwizard Metrics 4.1.30 
Closes gh-29768
 2022-02-14 13:43:22 +01:00
Stephane Nicoll 81aec09357 Upgrade to AppEngine SDK 1.9.94 
Closes gh-29767
 2022-02-14 13:43:22 +01:00
Andy Wilkinson 85d14cdb2c Merge branch '2.5.x' into 2.6.x 
Closes gh-29805
 2022-02-14 12:32:32 +00:00
Andy Wilkinson 1fd4a4d86b Remove code related to unsupported versions of Gradle 
Closes gh-29681
 2022-02-14 12:31:21 +00:00
Stephane Nicoll bd6cb5c915 Merge branch '2.5.x' into 2.6.x 2022-02-13 18:15:48 +01:00
Stephane Nicoll 1f01345057 Fix assertion due to toString change in Spring Framework 2022-02-13 18:01:00 +01:00
Andy Wilkinson 09f51f38d6 Update docs to reflect use of CamelCaseToUnderscoresNamingStrategy 
Closes gh-29743
 2022-02-11 15:37:10 +00:00
Andy Wilkinson 4b33ea733e Merge branch '2.5.x' into 2.6.x 
Closes gh-29750
 2022-02-11 14:14:43 +00:00
Andy Wilkinson 387795d4db Remove trailing space from media type for ots mapping 
The regular expression in the new test is intended to match the
documented [1] ABNF for a media type:

    type-name = reg-name
    subtype-name = reg-name

    reg-name = 1*127reg-name-chars
    reg-name-chars = ALPHA / DIGIT / "!" /
                     "#" / "$" / "&" / "." /
                     "+" / "-" / "^" / "_"

Closes gh-29746

[1] https://datatracker.ietf.org/doc/html/rfc4288#section-4.2
 2022-02-11 14:09:53 +00:00
Andy Wilkinson 646bb05c8d Merge branch '2.5.x' into 2.6.x 
Closes gh-29748
 2022-02-11 13:34:40 +00:00
Andy Wilkinson c3eee4ad68 Align Gradle's plugin's META-INF repackaging with Maven plugin's 
Closes gh-28562
 2022-02-11 13:32:52 +00:00
Andy Wilkinson b74f668254 Only auto-configure WebSessionIdResolver in reactive web app 
Closes gh-29669
 2022-02-11 12:09:45 +00:00
Andy Wilkinson bb7fa9f545 Merge branch '2.5.x' into 2.6.x 
Closes gh-29741
 2022-02-11 11:35:47 +00:00
Andy Wilkinson c46b45a1e3 Add dependency management for liquibase-cdi 
Closes gh-29676
 2022-02-11 11:34:51 +00:00
Stephane Nicoll d8454f8758 Start building against Spring Session 2021.1.2 snapshots 
See gh-29725
 2022-02-11 10:10:12 +01:00
Stephane Nicoll 9006fdec50 Start building against Spring Batch 4.3.5 snapshots 
See gh-29724
 2022-02-11 10:10:12 +01:00
Stephane Nicoll 56ed5fb68c Start building against Spring Security 5.6.2 
See gh-29723
 2022-02-11 10:10:12 +01:00
Stephane Nicoll 1ce07cfe2b Start building against Spring Data 2021.1.2 snapshots 
See gh-29721
 2022-02-11 09:35:25 +01:00
Stephane Nicoll 2b87d8364d Start building against Spring LDAP 2.3.6 snapshots 
See gh-29720
 2022-02-11 09:35:01 +01:00
Stephane Nicoll f6cf198767 Start building against Spring Framework 5.3.16 snapshots 
See gh-29719
 2022-02-11 09:34:35 +01:00
Stephane Nicoll cebba5a6d0 Start building against Micrometer 1.8.3 snapshots 
See gh-29718
 2022-02-11 09:34:14 +01:00
Stephane Nicoll 0297437fc5 Start building against Reactor 2020.0.16 snapshots 
See gh-29717
 2022-02-11 09:33:13 +01:00
Stephane Nicoll e242dc5ce8 Start building against Spring Session 2021.0.5 snapshots 
See gh-29715
 2022-02-11 09:29:06 +01:00
Stephane Nicoll 7afd33589f Start building against Spring Batch 4.3.5 snapshots 
See gh-29714
 2022-02-11 09:28:41 +01:00
Stephane Nicoll 3c3ebafa31 Start building against Spring Security 5.5.5 snapshots 
See gh-29713
 2022-02-11 09:28:17 +01:00
Stephane Nicoll b892bb4415 Start building against Spring Kafka 2.7.11 snapshots 
See gh-29712
 2022-02-11 09:27:52 +01:00
Stephane Nicoll cd94b27f2d Start building against Spring Data 2021.0.9 snapshots 
See gh-29711
 2022-02-11 09:27:28 +01:00
Stephane Nicoll 29d502da5b Start building against Spring LDAP 2.3.6 snapshots 
See gh-29710
 2022-02-11 09:27:05 +01:00
Stephane Nicoll d15149c1a3 Start building against Spring Framework 5.3.16 snapshots 
See gh-29709
 2022-02-11 09:26:35 +01:00
Stephane Nicoll 0f630debb3 Start building against Micrometer 1.7.9 snapshots 
See gh-29708
 2022-02-11 09:26:11 +01:00
Stephane Nicoll 5767e1fda1 Start building against Reactor 2020.0.16 snapshots 
See gh-29707
 2022-02-11 09:25:38 +01:00
Andy Wilkinson d6ebce4ccf Merge branch '2.5.x' into 2.6.x 
Closes gh-29733
 2022-02-10 17:02:39 +00:00
Andy Wilkinson 6901f6dab2 Test our Gradle plugin against Gradle 7.4 
Closes gh-29673
 2022-02-10 16:57:13 +00:00
Andy Wilkinson 197ba9ebc9 Merge branch '2.5.x' into 2.6.x 
Closes gh-29731
 2022-02-10 15:04:58 +00:00
Andy Wilkinson 64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects" 
See gh-29333
 2022-02-10 15:01:57 +00:00
Guirong Hu cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects 
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
 2022-02-10 15:01:56 +00:00
Moritz Halbritter 44ff29c4d4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29728
 2022-02-10 13:28:15 +01:00
Moritz Halbritter 096ba72a39 Add documentation for WebMvc.fn 
See gh-29683
 2022-02-10 13:14:34 +01:00
Andy Wilkinson f672a20f90 Polish appendix cross-references 
See gh-29689
 2022-02-09 13:24:05 +00:00
Moritz Halbritter 079ea41d6d Merge branch '2.5.x' into 2.6.x 
Closes gh-29691
 2022-02-09 14:09:33 +01:00
Moritz Halbritter 262db65a38 Ignore invalid stream types when reading log update events 
See gh-29675
 2022-02-09 14:03:02 +01:00
Andy Wilkinson 093e8a524d Merge branch '2.5.x' into 2.6.x 
Closes gh-29689
 2022-02-09 12:18:35 +00:00
Moritz Halbritter 52d9ba58d8 Move appendix subsections under appendix section 
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
 2022-02-09 12:04:05 +00:00
Andy Wilkinson b46eba16e6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29687
 2022-02-09 11:34:51 +00:00
Andy Wilkinson 48fe1513fe Test documented build script snippets when they change 
Closes gh-29684
 2022-02-09 11:33:40 +00:00
Andy Wilkinson c0664efa86 Merge branch '2.5.x' into 2.6.x 
Closes gh-29685
 2022-02-09 11:32:32 +00:00
Mike Partridge 2e9dcdd96d Replace use of classifier with archiveClassifier 
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.

See gh-29611
 2022-02-09 11:31:22 +00:00
Andy Wilkinson 358cdb33f7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29679
 2022-02-08 19:21:48 +00:00
Andy Wilkinson 43ca2d2cb0 Access classpath lazily to allow later changes to be picked up 
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.

This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.

Closes gh-29672
 2022-02-08 19:21:37 +00:00
Phillip Webb b3a82c9de6 Merge branch '2.5.x' into 2.6.x 2022-02-05 10:16:03 -08:00
Phillip Webb 52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x 
Closes gh-29657
 2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3 
Closes gh-29656
 2022-02-04 19:43:47 -08:00
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x 
Closes gh-29649
 2022-02-04 09:50:47 +01:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests 
Closes gh-29648
 2022-02-04 09:49:15 +01:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 2b40ce09d8 Update copyright year of changed files 2022-02-02 10:35:40 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29616
 2022-02-01 16:35:19 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression" 
See gh-29276
 2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression 
See gh-29276
 2022-02-01 16:24:13 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover" 
See gh-29438
 2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover 
See gh-29438
 2022-01-31 16:28:28 +01:00
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x 
Closes gh-29600
 2022-01-31 16:24:29 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests" 
See gh-29522
 2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests 
See gh-29522
 2022-01-31 16:01:04 +01:00
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests 
See gh-29593
 2022-01-29 15:33:25 +01:00
Madhura Bhave 0597c6831e Configure health on additional path only when health exposed 
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
 2022-01-27 11:44:54 -08:00
Phillip Webb df9cf6b726 Make ErrorPageSecurityFilter compatible with Servlet 3.1 
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.

Fixes gh-29558
 2022-01-25 13:15:59 -08:00
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x 
Closes gh-29560
 2022-01-25 12:19:16 +00:00
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change 
Closes gh-28781
 2022-01-25 12:11:19 +00:00
Brian Clozel 1204c1aa32 Merge branch '2.5.x' into 2.6.x 
Closes gh-29556
 2022-01-25 09:21:49 +01:00
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext 
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-01-25 08:58:42 +01:00
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x 
Closes gh-29553
 2022-01-24 16:19:43 -06:00
Scott Frederick 000cbfa2d9 Set file permissions on all created test files 
Closes gh-29551
 2022-01-24 16:19:20 -06:00
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x 
Closes gh-29539
 2022-01-24 09:41:35 +01:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain 
See gh-29523
 2022-01-24 09:35:44 +01:00
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x 
Closes gh-29537
 2022-01-24 09:29:31 +01:00
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2 
See gh-29535
 2022-01-24 09:28:53 +01:00
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator 
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
 2022-01-20 12:36:18 +00:00
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5 
Closes gh-29498
 2022-01-20 10:53:13 +01:00
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final 
Closes gh-29497
 2022-01-20 10:53:11 +01:00
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5 
Closes gh-29496
 2022-01-20 10:29:26 +01:00
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available 
See gh-28843
 2022-01-19 15:53:07 -08:00
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated 
Closes gh-29488
 2022-01-19 19:08:31 +00:00
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x 
Closes gh-29485
 2022-01-19 17:27:36 +00:00
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java 
Closes gh-29484
 2022-01-19 17:26:55 +00:00
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x 
Closes gh-29480
 2022-01-19 13:18:50 +00:00
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether 
Closes gh-29255
 2022-01-19 13:18:05 +00:00
Stephane Nicoll d92939e773 Merge branch '2.5.x' into 2.6.x 
Closes gh-29478
 2022-01-19 12:24:15 +01:00
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans 
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
 2022-01-19 11:49:56 +01:00
Stephane Nicoll 124a3219e8 Upgrade to Pooled JMS 1.2.3 
Closes gh-29468
 2022-01-19 08:17:20 +01:00
Stephane Nicoll 60971c6fdb Upgrade to MySQL 8.0.28 
Closes gh-29467
 2022-01-19 08:17:19 +01:00
Stephane Nicoll aba3b1dc5f Upgrade to Spring Integration 5.5.8 
Closes gh-29320
 2022-01-19 08:12:33 +01:00
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3 
Closes gh-29466
 2022-01-19 08:12:08 +01:00
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29465
 2022-01-19 08:12:07 +01:00
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28 
Closes gh-29464
 2022-01-19 08:12:06 +01:00
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8 
Closes gh-29314
 2022-01-19 08:09:50 +01:00
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x 
Closes gh-29459
 2022-01-18 16:15:20 -08:00
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic 
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
 2022-01-18 16:14:52 -08:00
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x 
Closes gh-29454
 2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context 
Fixes gh-28814
 2022-01-18 20:34:08 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29322
 2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE 
Closes gh-29321
 2022-01-17 13:05:15 +00:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2 
Closes gh-29319
 2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2 
Closes gh-29318
 2022-01-17 08:44:15 +01:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10 
Closes gh-29313
 2022-01-17 08:41:47 +01:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic 
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
 2022-01-14 22:55:26 -08:00
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x 
Closes gh-29410
 2022-01-14 20:33:05 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic 
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
 2022-01-14 20:32:34 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it 
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
 2022-01-14 13:47:22 -08:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x 
Closes gh-29401
 2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization 
Closes gh-29394
 2022-01-14 15:51:08 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x 
Closes gh-29399
 2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo 
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
 2022-01-14 15:48:31 +00:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2 
Closes gh-29398
 2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33 
Closes gh-29397
 2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29396
 2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29395
 2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1 
Closes gh-29317
 2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1 
Closes gh-29283
 2022-01-14 15:44:16 +01:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33 
Closes gh-29392
 2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29391
 2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14 
Closes gh-29312
 2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8 
Closes gh-29311
 2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7 
Closes gh-29352
 2022-01-14 12:10:46 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link 
See gh-29380
 2022-01-13 15:30:21 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2 
Closes gh-29316
 2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15 
Closes gh-29327
 2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8 
Closes gh-29310
 2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15 
Closes gh-29326
 2022-01-13 14:36:10 +01:00
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x 
Closes gh-29377
 2022-01-13 08:45:48 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file 
See gh-29112
 2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests 
See gh-29112
 2022-01-13 08:42:36 +01:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x 
Closes gh-29374
 2022-01-12 15:32:00 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting 
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
 2022-01-12 14:21:52 -08:00
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x 
Closes gh-29371
 2022-01-12 14:07:31 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists 
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
 2022-01-12 14:05:30 -08:00
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x 
Closes gh-29367
 2022-01-12 13:54:23 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2 
Closes gh-29366
 2022-01-12 13:52:43 -08:00
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final 
Closes gh-29351
 2022-01-12 14:33:55 +01:00
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1 
Closes gh-29350
 2022-01-12 14:33:54 +01:00
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29349
 2022-01-12 14:33:52 +01:00
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10 
Closes gh-29348
 2022-01-12 14:33:51 +01:00
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29347
 2022-01-12 14:33:50 +01:00
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29346
 2022-01-12 14:33:49 +01:00
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29345
 2022-01-12 14:33:47 +01:00
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final 
Closes gh-29344
 2022-01-12 14:33:46 +01:00
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3 
Closes gh-29343
 2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final 
Closes gh-29341
 2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29340
 2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10 
Closes gh-29339
 2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29338
 2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29337
 2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29336
 2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final 
Closes gh-29335
 2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3 
Closes gh-29334
 2022-01-12 13:51:15 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots 
See gh-29327
 2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots 
See gh-29326
 2022-01-12 09:29:36 +01:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29322
 2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29321
 2022-01-11 20:09:39 +00:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots 
See gh-29320
 2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots 
See gh-29319
 2022-01-11 17:24:49 +01:00
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots 
See gh-29318
 2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots 
See gh-29317
 2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots 
See gh-29316
 2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15 
Closes gh-29315
 2022-01-11 17:24:46 +01:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots 
See gh-29314
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots 
See gh-29313
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots 
See gh-29312
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots 
See gh-29310
 2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15 
Closes gh-29309
 2022-01-11 17:22:18 +01:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x 
Closes gh-29268
 2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new 
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
 2022-01-05 11:49:48 +00:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors 
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
 2022-01-04 12:12:03 -08:00
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 2022-01-03 09:33:23 +01:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29198
 2022-01-02 11:25:46 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022 
See gh-29195
 2022-01-02 11:24:58 +01:00
izeye d234681348 Fix default value for management.info.env.enabled in metadata 
See gh-29187
 2021-12-30 07:32:58 +01:00
Stephane Nicoll b345dddec0 Upgrade to Log4j2 2.17.1 
Closes gh-29184
 2021-12-29 11:30:25 +01:00
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1 
Closes gh-29183
 2021-12-29 11:29:25 +01:00
izeye 7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Stephane Nicoll 8ee0640cc0 Merge branch '2.5.x' into 2.6.x 
Closes gh-29172
 2021-12-25 09:55:24 +01:00
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3 
See gh-29161
 2021-12-25 09:52:14 +01:00
Stephane Nicoll 61c978e835 Upgrade to Spring Integration 5.5.7 
Closes gh-28975
 2021-12-21 17:11:43 +01:00
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7 
Closes gh-28966
 2021-12-21 17:09:38 +01:00
Stephane Nicoll c7487749de Upgrade to Spring Session 2021.1.1 
Closes gh-28974
 2021-12-21 16:53:54 +01:00
Stephane Nicoll 2e67645fd5 Upgrade to Hazelcast 4.2.4 
Closes gh-29146
 2021-12-21 14:55:32 +01:00
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8 
Closes gh-29145
 2021-12-21 14:24:50 +01:00
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4 
Closes gh-28965
 2021-12-21 14:00:18 +01:00
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10" 
See gh-29114
 2021-12-21 09:30:44 +01:00
Stephane Nicoll 669710efe0 Upgrade to Spring Security 5.6.1 
Closes gh-28973
 2021-12-21 09:06:49 +01:00
Stephane Nicoll af77ee007a Upgrade to Spring Kafka 2.8.1 
Closes gh-29017
 2021-12-21 09:06:22 +01:00
Stephane Nicoll 66c43685f5 Upgrade to Spring AMQP 2.4.1 
Closes gh-28995
 2021-12-21 09:05:46 +01:00
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4 
Closes gh-28964
 2021-12-21 09:04:47 +01:00
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10 
Closes gh-29114
 2021-12-21 09:04:05 +01:00
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13 
Closes gh-28994
 2021-12-21 09:03:40 +01:00
Scott Frederick b3a304fbe7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29143
 2021-12-20 14:00:06 -06:00
Scott Frederick e4b0575a12 Do not consider bridge methods when binding java bean properties 
Fixes gh-28917
 2021-12-20 13:57:36 -06:00
Madhura Bhave 84f1a6ca09 Merge branch '2.5.x' into 2.6.x 
Closes gh-29138
 2021-12-20 09:21:08 -08:00
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux 
Closes gh-28955
 2021-12-20 09:19:34 -08:00
Stephane Nicoll 653fdbd0a4 Configure comment prefixes 
Closes gh-29095
 2021-12-20 17:47:50 +01:00
Stephane Nicoll 53654a0160 Merge branch '2.5.x' into 2.6.x 
Closes gh-29133
 2021-12-20 12:37:10 +01:00
Pavel Anisimov b704ee0b30 Polish reference doc 
See gh-29115
 2021-12-20 12:36:33 +01:00
Stephane Nicoll fd32ff3a51 Upgrade to XmlUnit2 2.8.4 
Closes gh-29131
 2021-12-20 10:48:31 +01:00
Stephane Nicoll fbb7f12f43 Upgrade to XmlUnit2 2.8.4 
Closes gh-29123
 2021-12-20 10:48:17 +01:00
Stephane Nicoll 64a5415edc Upgrade to Jackson Bom 2.13.1 
Closes gh-29129
 2021-12-20 10:46:31 +01:00
Stephane Nicoll d9a970a8e2 Upgrade to Infinispan 12.1.10.Final 
Closes gh-29128
 2021-12-20 10:46:30 +01:00
Stephane Nicoll a8fc4e9351 Upgrade to Hibernate 5.6.3.Final 
Closes gh-29127
 2021-12-20 10:46:29 +01:00
Stephane Nicoll 07c8ab2236 Upgrade to Ehcache3 3.9.9 
Closes gh-29126
 2021-12-20 10:46:27 +01:00
Stephane Nicoll 9ec44d80cf Upgrade to Dropwizard Metrics 4.2.7 
Closes gh-29125
 2021-12-20 10:46:25 +01:00
Stephane Nicoll 177fd6c539 Upgrade to DB2 JDBC 11.5.7.0 
Closes gh-29124
 2021-12-20 10:46:22 +01:00
Stephane Nicoll 620c6ec275 Upgrade to Infinispan 12.1.10.Final 
Closes gh-29121
 2021-12-20 09:57:12 +01:00
Stephane Nicoll d0cd7dcf60 Upgrade to Hibernate 5.4.33 
Closes gh-29120
 2021-12-20 09:57:11 +01:00
Stephane Nicoll cb81801907 Upgrade to Ehcache3 3.9.9 
Closes gh-29119
 2021-12-20 09:57:10 +01:00
Stephane Nicoll d8d97df34a Upgrade to Dropwizard Metrics 4.1.29 
Closes gh-29118
 2021-12-20 09:57:08 +01:00
Stephane Nicoll 8306287158 Upgrade to DB2 JDBC 11.5.7.0 
Closes gh-29117
 2021-12-20 09:57:06 +01:00
Stephane Nicoll bb1a1a0622 Upgrade to Spring LDAP 2.3.5 
Closes gh-28972
 2021-12-19 18:46:18 +01:00
Stephane Nicoll f619d66244 Upgrade to Spring LDAP 2.3.5 
Closes gh-28963
 2021-12-19 18:45:23 +01:00
Stephane Nicoll aab30b13b3 Start building against Spring Kafka 2.7.10 snapshots 
See gh-29114
 2021-12-19 18:30:54 +01:00
Stephane Nicoll efa93506e6 Fix checkstyle violations 2021-12-18 12:23:53 +01:00
Stephane Nicoll 012fbdd43d Upgrade to Log4j2 2.17.0 
Closes gh-28984
 2021-12-18 08:53:04 +01:00
Stephane Nicoll cb02944c71 Upgrade to Log4j2 2.17.0 
Closes gh-28983
 2021-12-18 08:52:22 +01:00
Madhura Bhave 4cc8012bfa Handle WebServerNamespace in CachingOperationInvoker 
Fixes gh-28882
 2021-12-17 17:55:06 -08:00
Madhura Bhave d9d161cd6b Allow previously authorized users to access the error page 
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
 or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.

This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.

Fixes gh-28953
 2021-12-17 16:58:58 -08:00
Stephane Nicoll c077ebecf7 Merge branch '2.5.x' into 2.6.x 
Closes gh-29103
 2021-12-17 16:37:53 +01:00
Andy Wilkinson 2fec06ac7e Find annotation without initializing factory beans 
Closes gh-28977
 2021-12-17 16:08:30 +01:00
Brian Clozel 1c35ec2c3c Merge branch '2.5.x' into 2.6.x 
Closes gh-29012
 2021-12-17 12:14:31 +01:00
Brian Clozel 5d0206320a Upgrade to Logback 1.2.9 
Closes gh-29011
 2021-12-17 12:13:02 +01:00
Stephane Nicoll bcaa59ce73 Merge branch '2.5.x' into 2.6.x 
Closes gh-29098
 2021-12-17 10:50:07 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc 
See gh-29094
 2021-12-17 10:48:55 +01:00
Stephane Nicoll 10362a9315 Merge branch '2.5.x' into 2.6.x 
Closes gh-29096
 2021-12-17 10:30:26 +01:00
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2 
Closes gh-29093
 2021-12-17 09:11:44 +01:00
Phillip Webb 587d6fa309 Polish 2021-12-16 13:55:42 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick 92b096abbf Fix message interpolation when code is used as default message 
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.

Fixes gh-28930
 2021-12-16 12:20:37 -06:00
Stephane Nicoll a7a37f4ad6 Upgrade to Spring Framework 5.3.14 
Closes gh-28970
 2021-12-16 17:50:53 +01:00
Stephane Nicoll b8bf2cbbc7 Upgrade to Spring Framework 5.3.14 
Closes gh-28961
 2021-12-16 17:50:18 +01:00
Stephane Nicoll 55859ea64c Stop accessing the datasource if initialization mode is set to never 
Closes gh-28931
 2021-12-16 16:50:22 +01:00
Stephane Nicoll 3b4d27e4d3 Merge branch '2.5.x' into 2.6.x 2021-12-15 16:41:09 +01:00
Stephane Nicoll 30ebb17b2b Polish 2021-12-15 16:38:27 +01:00
Stephane Nicoll a5734ef194 Upgrade to Reactor 2020.0.14 
Closes gh-28969
 2021-12-15 15:12:20 +01:00
Stephane Nicoll 28214e1e8c Upgrade to Reactor 2020.0.14 
Closes gh-28960
 2021-12-15 15:11:38 +01:00
Stephane Nicoll 4f14428351 Upgrade to Undertow 2.2.14.Final 
Closes gh-29072
 2021-12-15 15:11:24 +01:00
Stephane Nicoll a4fbc98667 Upgrade to Thymeleaf 3.0.14.RELEASE 
Closes gh-29070
 2021-12-15 15:11:21 +01:00
Stephane Nicoll 45e8711b5b Upgrade to Spring WS 3.1.2 
Closes gh-29069
 2021-12-15 15:11:20 +01:00
Stephane Nicoll 3bbc4649b7 Upgrade to MSSQL JDBC 9.4.1.jre8 
Closes gh-29068
 2021-12-15 15:11:19 +01:00
Stephane Nicoll 36332d42b8 Upgrade to JUnit Jupiter 5.8.2 
Closes gh-29066
 2021-12-15 15:11:16 +01:00
Stephane Nicoll 657f6e0010 Upgrade to Jedis 3.7.1 
Closes gh-29065
 2021-12-15 15:11:15 +01:00
Stephane Nicoll afd254424b Upgrade to JDOM2 2.0.6.1 
Closes gh-29064
 2021-12-15 15:11:14 +01:00
Stephane Nicoll 7156e3fb23 Upgrade to HttpCore 4.4.15 
Closes gh-29063
 2021-12-15 15:11:13 +01:00
Stephane Nicoll 0219408b7e Upgrade to HttpAsyncClient 4.1.5 
Closes gh-29062
 2021-12-15 15:11:11 +01:00
Stephane Nicoll 081d4f6d9c Upgrade to Hibernate 5.6.2.Final 
Closes gh-29061
 2021-12-15 15:11:10 +01:00
Stephane Nicoll 76b1ec3cac Upgrade to Hazelcast 4.2.3 
Closes gh-29060
 2021-12-15 15:11:09 +01:00
Stephane Nicoll 84d552f4d2 Upgrade to Flyway 8.0.5 
Closes gh-29059
 2021-12-15 15:11:08 +01:00
Stephane Nicoll fedf341d65 Upgrade to Ehcache3 3.9.8 
Closes gh-29058
 2021-12-15 15:11:07 +01:00
Stephane Nicoll 0165c40f02 Upgrade to Dropwizard Metrics 4.2.5 
Closes gh-29057
 2021-12-15 15:11:05 +01:00
Stephane Nicoll b11aa6d5cd Upgrade to Couchbase Client 3.2.4 
Closes gh-29056
 2021-12-15 15:11:04 +01:00
Stephane Nicoll d80e68adf0 Upgrade to Caffeine 2.9.3 
Closes gh-29055
 2021-12-15 15:11:03 +01:00
Stephane Nicoll c45bdd19fd Upgrade to AppEngine SDK 1.9.93 
Closes gh-29054
 2021-12-15 15:11:01 +01:00
Stephane Nicoll 97ee63b55b Upgrade to Undertow 2.2.14.Final 
Closes gh-29051
 2021-12-15 14:01:27 +01:00
Stephane Nicoll 74ce8b7516 Upgrade to Thymeleaf 3.0.14.RELEASE 
Closes gh-29049
 2021-12-15 14:01:25 +01:00
Stephane Nicoll e234ccd457 Upgrade to Spring WS 3.1.2 
Closes gh-29048
 2021-12-15 14:01:24 +01:00
Stephane Nicoll 272e184259 Upgrade to JDOM2 2.0.6.1 
Closes gh-29046
 2021-12-15 14:01:21 +01:00
Stephane Nicoll 084eae5124 Upgrade to Jackson Bom 2.12.6 
Closes gh-29045
 2021-12-15 14:01:20 +01:00
Stephane Nicoll d60c0593f3 Upgrade to HttpCore 4.4.15 
Closes gh-29044
 2021-12-15 14:01:19 +01:00
Stephane Nicoll 8c10266c62 Upgrade to HttpAsyncClient 4.1.5 
Closes gh-29043
 2021-12-15 14:01:18 +01:00
Stephane Nicoll 70805793a1 Upgrade to Hazelcast 4.1.7 
Closes gh-29042
 2021-12-15 14:01:16 +01:00
Stephane Nicoll f0a4ac6154 Upgrade to Ehcache3 3.9.8 
Closes gh-29041
 2021-12-15 14:01:15 +01:00
Stephane Nicoll 41a9b08049 Upgrade to Dropwizard Metrics 4.1.27 
Closes gh-29040
 2021-12-15 14:01:14 +01:00
Stephane Nicoll b7e233805f Upgrade to Caffeine 2.9.3 
Closes gh-29039
 2021-12-15 14:01:12 +01:00
Stephane Nicoll 6dcc289e6b Upgrade to AppEngine SDK 1.9.93 
Closes gh-29038
 2021-12-15 14:01:11 +01:00
Stephane Nicoll da60b96cf5 Merge branch '2.5.x' into 2.6.x 
Closes gh-29031
 2021-12-15 09:42:30 +01:00
copbint 0a9a6639e5 Remove redundant log4j-to-slf4j 
See gh-29019
 2021-12-15 09:40:10 +01:00
Stephane Nicoll 15ade0b5d3 Upgrade to Log4j2 2.16.0 
Closes gh-28984
 2021-12-15 09:30:10 +01:00
Stephane Nicoll 4c57d1717d Upgrade to Log4j2 2.16.0 
Closes gh-28983
 2021-12-15 09:28:44 +01:00
Stephane Nicoll 3124d9e62d Start building against Spring Kafka 2.8.1 snapshots 
See gh-29017
 2021-12-14 15:39:27 +01:00
Stephane Nicoll ba60e3d358 Merge branch '2.5.x' 
Closes gh-29002
 2021-12-14 15:31:45 +01:00
Stephane Nicoll 157b3aa25f Allow platform to be configured in DataSourceInitializers 
Closes gh-28932
 2021-12-14 15:07:32 +01:00
Stephane Nicoll d8eab45146 Upgrade to Logback 1.2.8 
Closes gh-29012
 2021-12-14 14:29:26 +01:00
Stephane Nicoll d18eae35e5 Upgrade to Logback 1.2.8 
Closes gh-29011
 2021-12-14 14:26:12 +01:00
Stephane Nicoll 6adbb50f02 Upgrade to Netty 4.1.72.Final 
Closes gh-29005
 2021-12-13 18:25:06 +01:00
Stephane Nicoll 1bda928ad3 Upgrade to Netty 4.1.72.Final 
Closes gh-29004
 2021-12-13 17:55:38 +01:00
Stephane Nicoll 32ecbb89d6 Merge branch '2.5.x' into 2.6.x 2021-12-13 09:23:33 +01:00
Stephane Nicoll 496cd3d2ba Polish 
See gh-28999
 2021-12-13 09:23:08 +01:00
Stephane Nicoll b81adecde3 Start building against Spring AMQP 2.4.1 snapshots 
See gh-28995
 2021-12-11 17:19:42 +01:00
Stephane Nicoll 93f75a7d12 Start building against Spring AMQP 2.3.13 snapshots 
See gh-28994
 2021-12-11 17:19:08 +01:00
Stephane Nicoll 4f85d8a4b0 Upgrade to Log4j2 2.15.0 
Closes gh-28984
 2021-12-10 14:46:11 +01:00
Stephane Nicoll 1d8e3a865e Upgrade to Log4j2 2.15.0 
Closes gh-28983
 2021-12-10 14:44:50 +01:00
Stephane Nicoll dfab6ee307 Merge branch '2.5.x' into 2.6.x 
Closes gh-28979
 2021-12-10 11:01:48 +01:00
Stephane Nicoll f6f5aec183 Polish "Check for the presence of Spring Security" 
See gh-28967
 2021-12-10 10:59:00 +01:00
Guirong Hu 4462f9157e Check for the presence of Spring Security 
See gh-28967
 2021-12-10 10:58:30 +01:00
Stephane Nicoll c7b606d8b6 Start building against Spring Integration 5.5.7 snapshots 
See gh-28975
 2021-12-10 08:19:23 +01:00
Stephane Nicoll 018481e381 Start building against Spring Session 2021.1.1 snapshots 
See gh-28974
 2021-12-10 08:18:55 +01:00
Stephane Nicoll 8792f1a792 Start building against Spring Security 5.6.1 snapshots 
See gh-28973
 2021-12-10 08:18:26 +01:00
Stephane Nicoll 9dc2450cd7 Start building against Spring LDAP 2.3.5 snapshots 
See gh-28972
 2021-12-10 08:17:55 +01:00
Stephane Nicoll d471397f47 Upgrade to Micrometer 1.8.1 
Closes gh-28971
 2021-12-10 08:17:17 +01:00
Stephane Nicoll 84ba9e2a8f Start building against Spring Framework 5.3.14 snapshots 
See gh-28970
 2021-12-10 08:16:47 +01:00
Stephane Nicoll ec453acf7f Start building against Reactor 2020.0.14 snapshots 
See gh-28969
 2021-12-10 08:16:21 +01:00
Stephane Nicoll f1f43e8577 Start building against Spring Integration 5.5.7 snapshots 
See gh-28966
 2021-12-10 06:54:25 +01:00
Stephane Nicoll e53bac272c Start building against Spring Session 2021.0.4 snapshots 
See gh-28965
 2021-12-10 06:54:01 +01:00
Stephane Nicoll 9894e90567 Start building against Spring Security 5.5.4 snapshots 
See gh-28964
 2021-12-10 06:53:38 +01:00
Stephane Nicoll a3b31db31d Start building against Spring LDAP 2.3.5 snapshots 
See gh-28963
 2021-12-10 06:53:13 +01:00
Stephane Nicoll 33ce2ab73b Upgrade to Micrometer 1.7.7 
Closes gh-28962
 2021-12-10 06:51:25 +01:00
Stephane Nicoll 4a35c7111f Start building against Spring Framework 5.3.14 snapshots 
See gh-28961
 2021-12-10 06:50:52 +01:00
Stephane Nicoll 7af3bd54a1 Start building against Reactor 2020.0.14 snapshots 
See gh-28960
 2021-12-10 06:50:21 +01:00
Vedran Pavic 0af4431db8 Apply SameSite session cookie property to Spring Session 
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
 2021-12-09 15:53:50 +01:00
izeye 0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes 
See gh-28944
 2021-12-09 15:09:13 +01:00
Stephane Nicoll 5599e8d340 Polish "Add consistent quotes in YAML samples of reference doc" 
See gh-28911
 2021-12-09 15:02:47 +01:00
Viktor Ardelean 0b781d87b1 Add consistent quotes in YAML samples of reference doc 
See gh-28911
 2021-12-09 15:02:23 +01:00
Artur Signell ad754abba3 Make ErrorPageSecurityFilter compatible with Servlet 3.1 
See gh-28902
 2021-12-09 12:36:35 +00:00
Stephane Nicoll 25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property 
Closes gh-28936
 2021-12-09 10:45:21 +01:00
Scott Frederick 3555837845 Merge branch '2.5.x' into 2.6.x 
Closes gh-28922
 2021-12-07 14:10:28 -06:00
Scott Frederick b0b2cd79b4 Use latest buildpack image tag when no tag is provided 
Fixes gh-28921
 2021-12-07 14:10:10 -06:00
Scott Frederick ab0cc55e20 Merge branch '2.5.x' into 2.6.x 
Closes gh-28904
 2021-12-03 11:42:03 -06:00
Scott Frederick 467c092fdc Remove classpath index manifest attribute from repackaged war files 
Fixes gh-28895
 2021-12-03 11:41:28 -06:00
Andy Wilkinson 4606e17696 Merge branch '2.5.x' into 2.6.x 
Closes gh-28891
 2021-12-02 10:30:51 +00:00
Andy Wilkinson af60a8a7cf Test our Gradle plugin against Gradle 7.3.1 
Closes gh-28890
 2021-12-02 10:29:22 +00:00
Stephane Nicoll 46a8673bf8 Merge branch '2.5.x' 
Closes gh-28839
 2021-11-29 09:44:31 +01:00
Stephane Nicoll 1876b4bcd7 Update copyright year of changed files 
See gh-28809
 2021-11-29 09:43:44 +01:00
Leo Li f3c93d30a8 Fix reference to matching-strategy property 
See gh-28809
 2021-11-29 09:39:40 +01:00
izeye c7921468fc Polish 
See gh-28836
 2021-11-29 09:38:07 +01:00
Stephane Nicoll 88aa849f90 Merge branch '2.5.x' 2021-11-29 09:37:31 +01:00
Stephane Nicoll 1bb3f906a7 Polish 
See gh-28836
 2021-11-29 09:35:51 +01:00
Stephane Nicoll e4082ee5d9 Merge branch '2.5.x' 
Closes gh-28834
 2021-11-28 11:18:57 +01:00
fml2 1d786e49e9 Fix typos in the "External Application Properties" section 
See gh-28830
 2021-11-28 11:17:22 +01:00
Stephane Nicoll 9719930496 Merge branch '2.5.x' 
Closes gh-28833
 2021-11-28 11:14:52 +01:00
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation 
See gh-28831
 2021-11-28 11:14:14 +01:00
Andy Wilkinson 4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot 
Closes gh-28817
 2021-11-26 13:01:34 +00:00
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization 
See gh-28779
 2021-11-25 09:38:44 +01:00
Madhura Bhave 27eb992252 Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
 2021-11-24 10:29:35 -08:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass 
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
 2021-11-24 10:20:29 -08:00
Madhura Bhave 49e408828c Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
 2021-11-24 10:17:02 -08:00
Madhura Bhave e6b5be900a Make ErrorPageSecurityFilter Servlet 3.1 compatible 
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.

Fixes gh-28790
 2021-11-24 09:59:27 -08:00
Madhura Bhave f621937d3b Skip error page security filter for non-error dispatch type 
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.

Fixes gh-28759
 2021-11-24 09:55:59 -08:00
Scott Frederick 4eed637481 Merge branch '2.5.x' 
Closes gh-28789
 2021-11-23 12:45:46 -06:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests 
Closes gh-28788
 2021-11-23 12:13:05 -06:00
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties 
Closes gh-28762
 2021-11-22 10:03:21 +00:00
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources 
See gh-28767
 2021-11-22 09:49:07 +01:00
Stephane Nicoll 490ec8974d Merge branch '2.5.x' 
Closes gh-28761
 2021-11-20 17:30:35 +01:00