Phillip Webb
fe95c2a80c
Merge branch '2.5.x'
...
Closes gh-27059
2021-06-23 17:47:19 -07:00
Phillip Webb
a77e116c03
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27058
2021-06-23 17:47:08 -07:00
Phillip Webb
93d316ddd1
Add additional ConfigDataProperties tests
...
Add more `isActive` tests to cover negative cases.
See gh-27017
2021-06-23 17:46:23 -07:00
fengyuanwei
b91c66b823
Fix typo in ConfigDataPropertiesTests
...
See gh-27017
2021-06-23 17:38:46 -07:00
Phillip Webb
e85b0c7012
Merge branch '2.5.x'
2021-06-23 17:29:41 -07:00
Phillip Webb
fd83158fa5
Merge branch '2.4.x' into 2.5.x
2021-06-23 17:28:31 -07:00
Phillip Webb
63ed921554
Restore simple Library constructor
...
See gh-15808
2021-06-23 17:27:26 -07:00
Phillip Webb
5fc0e1ca81
Merge branch '2.5.x'
...
Closes gh-27057
2021-06-23 17:23:25 -07:00
Phillip Webb
af37f59136
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27056
2021-06-23 17:13:13 -07:00
Madhura Bhave
b790c82732
Apply exclusions to existing war entries
...
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.
Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin
Fixes gh-15808
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-06-23 15:08:31 -07:00
Brian Clozel
7d720a63a5
Merge branch '2.5.x'
...
Closes gh-27050
2021-06-23 19:39:03 +02:00
Brian Clozel
bf17f50a1f
Align NettyProperties with Netty's defaults
...
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.
This commit changes the default configuration property value and ensures
that both stay in sync.
Fixes gh-27046
2021-06-23 19:36:40 +02:00
Andy Wilkinson
01f8cb7639
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27048
2021-06-23 18:07:33 +01:00
Andy Wilkinson
3746155916
Align Nimbus dependency versions with Spring Security
...
Closes gh-26820
2021-06-23 17:53:09 +01:00
Stephane Nicoll
e0e64e69c0
Upgrade to Micrometer 1.7.1
...
Closes gh-27015
2021-06-23 17:45:25 +02:00
Stephane Nicoll
d0f12392ab
Upgrade to Micrometer 1.6.8
...
Closes gh-27014
2021-06-23 17:41:25 +02:00
Stephane Nicoll
6c2fc8471a
Upgrade to Spring Session 2021.0.1
...
Closes gh-26971
2021-06-23 15:56:28 +02:00
Stephane Nicoll
fb2ed6076f
Upgrade to Spring Session 2020.0.5
...
Closes gh-26964
2021-06-23 15:55:57 +02:00
Stephane Nicoll
254a29f9be
Upgrade to Nimbus JOSE JWT 9.10
...
Closes gh-27039
2021-06-23 10:40:06 +02:00
Stephane Nicoll
4a28e21047
Upgrade to OAuth2 OIDC SDK 9.9
...
Closes gh-27038
2021-06-23 10:39:48 +02:00
Stephane Nicoll
f89675a3f1
Upgrade to Neo4j Java Driver 4.2.7
...
Closes gh-27037
2021-06-23 08:22:15 +02:00
Stephane Nicoll
1a9e3bcbd6
Upgrade to Lettuce 6.1.3.RELEASE
...
Closes gh-27036
2021-06-23 08:22:14 +02:00
Stephane Nicoll
763870bd45
Upgrade to Dropwizard Metrics 4.1.24
...
Closes gh-27035
2021-06-23 08:22:12 +02:00
Stephane Nicoll
fb1cd82061
Upgrade to OAuth2 OIDC SDK 8.36.2
...
Closes gh-27034
2021-06-23 07:58:19 +02:00
Stephane Nicoll
ded6b26ea5
Upgrade to Neo4j Java Driver 4.1.4
...
Closes gh-27033
2021-06-23 07:58:18 +02:00
Stephane Nicoll
6db9fe2e36
Upgrade to Lettuce 6.0.6.RELEASE
...
Closes gh-27032
2021-06-23 07:58:17 +02:00
Stephane Nicoll
9bc1c4dff2
Upgrade to Dropwizard Metrics 4.1.24
...
Closes gh-27031
2021-06-23 07:58:16 +02:00
Stephane Nicoll
9281dcf751
Upgrade to Spring Data 2021.0.2
...
Closes gh-26970
2021-06-22 19:22:51 +02:00
Stephane Nicoll
47a9a94376
Upgrade to Spring HATEOAS 1.3.2
...
Closes gh-26969
2021-06-22 19:22:28 +02:00
Stephane Nicoll
7e09c1d8dc
Upgrade to Spring Data 2020.0.10
...
Closes gh-26963
2021-06-22 19:21:42 +02:00
Stephane Nicoll
58320c6af9
Upgrade to Spring HATEOAS 1.2.7
...
Closes gh-27013
2021-06-22 19:21:12 +02:00
Stephane Nicoll
c309f3428c
Upgrade to Reactor 2020.0.8
...
Closes gh-27027
2021-06-22 14:54:30 +02:00
Stephane Nicoll
7ca9794f3c
Upgrade to Reactor 2020.0.8
...
Closes gh-26968
2021-06-22 14:53:10 +02:00
Stephane Nicoll
c21099b142
Upgrade to Reactor 2020.0.8
...
Closes gh-26962
2021-06-22 14:52:39 +02:00
Andy Wilkinson
4290193a65
Merge branch '2.5.x'
...
Closes gh-27025
2021-06-22 13:20:11 +01:00
Andy Wilkinson
051638631b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27024
2021-06-22 13:02:06 +01:00
Andy Wilkinson
ba9244b2d4
Polish "Update docs to use @SpringBootConfiguration not @Configuration"
...
See gh-26937
2021-06-22 12:55:25 +01:00
Yanming Zhou
a5f077cf79
Update docs to use @SpringBootConfiguration not @Configuration
...
See gh-26937
2021-06-22 12:55:25 +01:00
Andy Wilkinson
515072b2e1
Merge branch '2.5.x'
...
Closes gh-27018
2021-06-22 10:29:42 +01:00
Andy Wilkinson
cf940fd374
Disable Log4j2's shutdown hook by default
...
Previously, Log4j2's own shutdown hook was only disabled when Log4j2
detected javax.servlet.Servlet on the classpath and, therefore,
determined that it was running in a web application. In an application
without Servlet on the classpath, this could lead to both Log4j2's shut
down hook and and logging system's shutdown handler both stopping
Log4j2. This could result in a failure as the second attempt at stopping
would result in reinitialization which would fail as the JVM is already
shutting down.
This commit introduces a new Log4j2 PropertySource implementation,
registered via META-INF/services, that sets the
log4j.shutdownHookEnabled property to false. This will ensure that
Log4j2's own shutdown hook is disabled by default whenever Spring Boot
is on the classpath and not just in Servlet-based web applications.
Fixes gh-26953
2021-06-22 10:17:25 +01:00
Stephane Nicoll
0a2fe3562d
Start building against Micrometer 1.7.1 snapshots
...
See gh-27015
2021-06-22 09:53:48 +02:00
Stephane Nicoll
b8a5d9b882
Start building against Micrometer 1.6.8 snapshots
...
See gh-27014
2021-06-22 09:35:36 +02:00
Stephane Nicoll
9ab8c625e5
Start building against Spring HATEOAS 1.2.7 snapshots
...
See gh-27013
2021-06-22 08:31:44 +02:00
Stephane Nicoll
49951e8be1
Merge branch '2.5.x'
...
Closes gh-27012
2021-06-22 08:26:33 +02:00
dreis2211
03cd6bec6e
Avoid illegal reflective access in RabbitAutoConfigurationTests
...
See gh-26954
2021-06-22 08:22:48 +02:00
Stephane Nicoll
142a68292c
Merge branch '2.5.x'
...
Closes gh-27011
2021-06-22 08:21:41 +02:00
Stephane Nicoll
168478f68c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27010
2021-06-22 08:21:31 +02:00
Sviatoslav Hryb
2252deb69b
Document uuid support in RandomValuePropertySource
...
See gh-26975
2021-06-22 08:16:55 +02:00
Stephane Nicoll
abd5c76570
Merge branch '2.5.x'
...
Closes gh-27009
2021-06-22 07:57:18 +02:00
Stephane Nicoll
0b54424433
Revert "Avoid duplicate crypto classes when depending on spring-security-core"
...
Closes gh-26588
2021-06-22 07:56:00 +02:00
Stephane Nicoll
8668e55631
Revert "Avoid dependency on Kotlin when depending on spring-security-config"
...
Closes gh-26728
2021-06-22 07:55:47 +02:00
Stephane Nicoll
5044137658
Revert "Avoid duplicate crypto classes when depending on spring-security-core"
...
Closes gh-26588
2021-06-22 07:55:11 +02:00
Stephane Nicoll
038617e97f
Merge branch '2.5.x'
...
Closes gh-27007
2021-06-22 07:54:23 +02:00
Stephane Nicoll
c67c09df32
Upgrade to Spring Security 5.5.1
...
Closes gh-26945
2021-06-22 07:54:00 +02:00
Stephane Nicoll
333c7a7cd8
Upgrade to Spring Security 5.4.7
...
Closes gh-26965
2021-06-22 07:39:35 +02:00
Phillip Webb
86dc156162
Merge branch '2.5.x'
...
Closes gh-27006
2021-06-21 18:37:43 -07:00
Phillip Webb
f914dc15fc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27005
2021-06-21 18:37:08 -07:00
Phillip Webb
8189e82c02
Allow nested profile-specific resolution
...
Effectively revert commit 0da0d2d46
so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is again called when resolving
imports declared in a profile-specific file.
Fixes gh-26960
2021-06-21 18:30:03 -07:00
Andy Wilkinson
752a92960c
Merge branch '2.5.x'
...
Closes gh-27001
2021-06-21 18:20:18 +01:00
Andy Wilkinson
07e7398d10
Include 6.9.x in version requirements message
...
Fixes gh-26952
2021-06-21 18:20:08 +01:00
Stephane Nicoll
5dc1065876
Revert "Upgrade to Dropwizard Metrics 4.1.23"
...
This reverts commit ce24270271
.
See gh-26983
2021-06-21 16:53:34 +02:00
Stephane Nicoll
3ef7ba7f9b
Upgrade to SLF4J 1.7.31
...
Closes gh-26995
2021-06-21 16:40:34 +02:00
Stephane Nicoll
68cd28a481
Upgrade to Postgresql 42.2.22
...
Closes gh-26994
2021-06-21 16:40:34 +02:00
Stephane Nicoll
b3b2d9a095
Upgrade to Jetty EL 9.0.48
...
Closes gh-26993
2021-06-21 16:40:33 +02:00
Stephane Nicoll
fc5d781cfc
Upgrade to Jedis 3.6.1
...
Closes gh-26992
2021-06-21 16:40:33 +02:00
Stephane Nicoll
2a190f3589
Upgrade to Cassandra Driver 4.11.2
...
Closes gh-26990
2021-06-21 16:40:33 +02:00
Andy Wilkinson
9025529dcf
Merge branch '2.5.x'
...
Closes gh-26998
2021-06-21 14:34:24 +01:00
Andy Wilkinson
8405df10b8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26997
2021-06-21 14:34:11 +01:00
Andy Wilkinson
e18eb08222
Fix additional metadata locations with config cache
...
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.
Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.
Closes gh-26880
2021-06-21 14:31:04 +01:00
Stephane Nicoll
c99d1dae08
Start building against Spring Integration 5.5.1 snapshots
...
See gh-26974
2021-06-21 13:26:01 +02:00
Stephane Nicoll
d015464a7e
Start building against Spring Kafka 2.7.3 snapshots
...
See gh-26973
2021-06-21 13:26:01 +02:00
Stephane Nicoll
516228730f
Start building against Spring Session 2021.0.1 snapshots
...
See gh-26971
2021-06-21 13:26:01 +02:00
Stephane Nicoll
1aa99b1549
Start building against Spring Data 2021.0.2 snapshots
...
See gh-26970
2021-06-21 13:26:00 +02:00
Stephane Nicoll
a487bd6423
Start building against Spring HATEOAS 1.3.2 snapshots
...
See gh-26969
2021-06-21 13:26:00 +02:00
Andy Wilkinson
a983a4ae07
Merge branch '2.5.x'
...
Closes gh-26989
2021-06-21 12:07:06 +01:00
Andy Wilkinson
580b1b81ab
Fix HTTP/2 over TLS with Jetty 10
...
Fixes gh-26988
2021-06-21 12:06:10 +01:00
Stephane Nicoll
1374491305
Upgrade to SLF4J 1.7.31
...
Closes gh-26986
2021-06-21 08:46:27 +02:00
Stephane Nicoll
799f6b0bdd
Upgrade to Postgresql 42.2.22
...
Closes gh-26985
2021-06-21 08:46:26 +02:00
Stephane Nicoll
c9a787c7ac
Upgrade to Jetty EL 8.5.68
...
Closes gh-26984
2021-06-21 08:46:25 +02:00
Stephane Nicoll
ce24270271
Upgrade to Dropwizard Metrics 4.1.23
...
Closes gh-26983
2021-06-21 08:46:24 +02:00
Stephane Nicoll
cc6c53f040
Start building against Spring Integration 5.4.8 snapshots
...
See gh-26967
2021-06-18 18:22:42 +02:00
Stephane Nicoll
9477231c51
Start building against Spring AMQP 2.3.9 snapshots
...
See gh-26966
2021-06-18 18:21:36 +02:00
Stephane Nicoll
fa37fb0a69
Start building against Spring Security 5.4.7 snapshots
...
See gh-26965
2021-06-18 18:21:08 +02:00
Stephane Nicoll
2f30449d11
Start building against Spring Session 2020.0.5 snapshots
...
See gh-26964
2021-06-18 18:20:41 +02:00
Stephane Nicoll
b462feaa58
Start building against Spring Data 2020.0.10 snapshots
...
See gh-26963
2021-06-18 18:20:02 +02:00
Stephane Nicoll
22c4c6ea80
Start building against Reactor 2020.0.8 snapshots
...
See gh-26962
2021-06-18 18:19:01 +02:00
Stephane Nicoll
63fe89f641
Merge branch '2.5.x'
...
Closes gh-26957
2021-06-18 08:29:36 +02:00
Yanming Zhou
12a6e4c231
Add missing space for asciidoc ordered list
...
See gh-26955
2021-06-18 08:27:45 +02:00
Scott Frederick
fffe2e4f97
Include caller info in NoSuchMethodError failure analysis
...
Fixes gh-26895
2021-06-17 13:46:51 -05:00
Andy Wilkinson
b1c04e91d7
Merge branch '2.5.x'
...
Closes gh-26951
2021-06-17 19:43:57 +01:00
Andy Wilkinson
5d20edc666
Allow BFPP to modify database initialization ordering
...
Fixes gh-26899
2021-06-17 18:08:39 +01:00
Andy Wilkinson
897a7196c0
Merge branch '2.5.x'
...
Closes gh-26948
2021-06-17 17:28:07 +01:00
Andy Wilkinson
a2772e288a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26947
2021-06-17 17:27:56 +01:00
Andy Wilkinson
cd808d2f18
Only get Kotlin plugin's version once we know we need it
...
Fixes gh-26946
2021-06-17 17:27:03 +01:00
Andy Wilkinson
69b730521a
Merge branch '2.5.x'
...
See gh-26936
2021-06-17 11:55:26 +01:00
Andy Wilkinson
566a642ce7
Merge branch '2.4.x' into 2.5.x
...
See gh-26935
2021-06-17 11:54:54 +01:00
Andy Wilkinson
204dd29c51
Fix test on Windows
...
See gh-26821
2021-06-17 11:54:24 +01:00
Andy Wilkinson
2d44119894
Merge branch '2.5.x'
...
Closes gh-26943
2021-06-17 11:43:15 +01:00
Andy Wilkinson
7ee3b287e1
Catch isEmbedded failure and treat database as not embedded
...
Fixes gh-26926
2021-06-17 11:42:26 +01:00
Andy Wilkinson
fb8f7afce5
Merge branch '2.5.x'
...
Closes gh-26942
2021-06-17 11:24:28 +01:00
Andy Wilkinson
7cd2d6474c
Only check database's type when there are scripts to apply
...
Fixes gh-26925
2021-06-17 09:55:33 +01:00
Phillip Webb
ad8ce2aa05
Merge branch '2.5.x'
2021-06-16 23:43:14 -07:00
Phillip Webb
5c65b1bcde
Fix asciidoctor anchor references
...
See gh-26939
2021-06-16 23:42:29 -07:00
Phillip Webb
7bd6611e4c
Merge branch '2.5.x'
...
Closes gh-26940
2021-06-16 22:43:52 -07:00
Phillip Webb
c3b873c11d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26939
2021-06-16 22:43:13 -07:00
Phillip Webb
b5c92d5174
Allow indirect standard profile-specific imports
...
Effectively revert commit d1b256a169
so that profile-specific imports
can again be used with or without a parent import.
Fixes gh-26858
2021-06-16 22:30:29 -07:00
Scott Frederick
256a523e84
Merge branch '2.5.x'
...
Closes gh-26936
2021-06-16 16:00:09 -05:00
Scott Frederick
79f47b150a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26935
2021-06-16 15:59:38 -05:00
Scott Frederick
5147fcacdf
Improve BeanNotOfRequiredTypeFailureAnalyzer output
...
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.
Fixes gh-26821
2021-06-16 14:44:11 -05:00
Andy Wilkinson
76ac18f282
Merge branch '2.5.x'
...
Closes gh-26929
2021-06-16 13:06:44 +01:00
Andy Wilkinson
bc7004d9c6
Fix WebSocket support with Jetty 10.0.x
...
Fixes gh-26847
2021-06-16 12:38:33 +01:00
Andy Wilkinson
1c49ca6ff2
Merge branch '2.5.x'
...
Closes gh-26924
2021-06-16 08:28:17 +01:00
Andy Wilkinson
d635e1e779
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26923
2021-06-16 08:28:05 +01:00
Andy Wilkinson
fe078c8afc
Avoid capturing URI template when interceptor won't use it
...
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.
This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.
Fixes gh-26915
2021-06-16 08:27:51 +01:00
Phillip Webb
18dc99dadb
Merge branch '2.5.x'
...
Closes gh-26920
2021-06-15 17:31:21 -07:00
Phillip Webb
b75c79cc7c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26919
2021-06-15 17:30:31 -07:00
Phillip Webb
5ca687c9a6
Polish 'Make livereload websocket headers case insensitive'
...
See gh-26813
Closes gh-26813
2021-06-15 17:29:45 -07:00
Francis Lavoie
8755512719
Make livereload websocket headers case insensitive
...
Update livereload `Connection` handling code so that websocket headers
are no longer case sensitive.
See gh-26813
2021-06-15 16:50:34 -07:00
Andy Wilkinson
63976367be
Merge branch '2.5.x'
...
Closes gh-26918
2021-06-15 22:21:34 +01:00
Andy Wilkinson
2c2ab69315
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26917
2021-06-15 22:20:52 +01:00
Andy Wilkinson
a1e279f736
Make Flyway and Liquibase auto-config back off without spring-jdbc
...
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.
This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.
Closes gh-26849
2021-06-15 22:00:11 +01:00
Andy Wilkinson
e0d0be97c5
Merge branch '2.5.x'
...
See gh-26902
2021-06-15 20:01:35 +01:00
Andy Wilkinson
44187bc6bf
Merge branch '2.4.x' into 2.5.x
...
See gh-26901
2021-06-15 20:01:01 +01:00
Andy Wilkinson
7ba575d392
Prevent RestarterTests.testRestart from triggering unwanted restarts
...
See gh-26900
2021-06-15 19:59:37 +01:00
Stephane Nicoll
a1a86e75ac
Merge branch '2.5.x'
...
Closes gh-26912
2021-06-15 08:38:51 +02:00
Stephane Nicoll
96029dbd8a
Polish "Add Azure info to the cloud deployment docs"
...
See gh-26910
2021-06-15 08:35:56 +02:00
Andy Clement
8321faaf16
Add Azure info to the cloud deployment docs
...
See gh-26910
2021-06-15 08:34:29 +02:00
Stephane Nicoll
caa87f1a90
Merge branch '2.5.x'
...
Closes gh-26911
2021-06-15 08:24:30 +02:00
izeye
eeefaf4314
Fix Javadoc deprecated since
...
See gh-26907
2021-06-15 08:23:13 +02:00
Stephane Nicoll
52fedb2bb4
Add support for InfluxDB 2.x
...
Closes gh-25891
2021-06-15 08:21:37 +02:00
Andy Wilkinson
043cf88687
Merge branch '2.5.x'
...
Closes gh-26905
2021-06-14 21:02:19 +01:00
Andy Wilkinson
6a51c272b9
Test our Gradle plugin against Gradle 7.1
...
Closes gh-26904
2021-06-14 21:01:06 +01:00
Andy Wilkinson
3b613a4f2d
Merge branch '2.5.x'
...
Closes gh-26902
2021-06-14 19:16:52 +01:00
Andy Wilkinson
017ba504d7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26901
2021-06-14 19:16:10 +01:00
Andy Wilkinson
32effdba0a
Try to stabilize RestarterTests.testRestart
...
Closes gh-26900
2021-06-14 19:15:09 +01:00
Madhura Bhave
aa873d3a22
Reorder documentation overview section
...
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:48:49 -07:00
Madhura Bhave
91ca9763e0
Reorder documentation overview section
...
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:25:01 -07:00
Andy Wilkinson
0ec598c99d
Merge branch '2.5.x'
2021-06-14 13:36:37 +01:00
Andy Wilkinson
9e2339b5d0
Merge branch '2.4.x' into 2.5.x
2021-06-14 13:36:29 +01:00
Andy Wilkinson
16bfa669e1
Polish authors separators
2021-06-14 13:35:30 +01:00
Andy Wilkinson
bc715c64b1
Merge branch '2.5.x'
...
Closes gh-26892
2021-06-14 13:33:19 +01:00
Andy Wilkinson
5f26fd9ccb
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26891
2021-06-14 13:28:54 +01:00
Andy Wilkinson
f6b7730dac
Use Asciidoctor's revision line to provide document's version
...
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.
Closes gh-26851
2021-06-14 13:24:01 +01:00
Andy Wilkinson
6982bbdc2b
Merge branch '2.5.x'
...
Closes gh-26890
2021-06-14 11:06:44 +01:00
Andy Wilkinson
5de5390ef9
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26889
2021-06-14 11:05:53 +01:00
Andy Wilkinson
c89430e174
Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
...
Closes gh-26888
2021-06-14 11:04:23 +01:00
Andy Wilkinson
06c6eee7c5
Merge branch '2.5.x'
...
Closes gh-26887
2021-06-14 10:53:42 +01:00
Andy Wilkinson
3858c6299d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26886
2021-06-14 10:52:53 +01:00
Andy Wilkinson
7a14a53250
Try to stabilize TunnelClientTests.addListener()
...
Closes gh-26885
2021-06-14 10:52:12 +01:00
Stephane Nicoll
e7df0a8bf2
Remove dependency management for Nimbus
...
Closes gh-26819
2021-06-14 10:18:26 +02:00
Stephane Nicoll
a0cf1eed41
Add support for customizing the auto-configured ClientResources
...
Closes gh-26792
2021-06-14 09:32:43 +02:00
Stephane Nicoll
f8555b9071
Add metrics for task execution and scheduling
...
Closes gh-23818
2021-06-14 09:07:40 +02:00
Stephane Nicoll
6505e03cb2
Polish "Add auto-configuration for Spring Data Envers"
...
See gh-22610
2021-06-14 08:28:17 +02:00
Stefano Cordio
91da8c9fc6
Add auto-configuration for Spring Data Envers
...
See gh-22610
2021-06-14 08:28:16 +02:00
Stephane Nicoll
d17c475504
Polish "Enable Redis connection pool if commons-pool2 is available"
...
See gh-26326
2021-06-14 08:25:21 +02:00
weixsun
55ff163018
Enable Redis connection pool if commons-pool2 is available
...
See gh-26326
2021-06-14 08:25:21 +02:00
Stephane Nicoll
05acfaa690
Polish "Upgrade to Flyway 7.9.2"
...
See gh-26456
2021-06-14 08:22:09 +02:00
Kedar Joshi
e6236b76bb
Upgrade to Flyway 7.9.2
...
See gh-26456
2021-06-14 08:22:01 +02:00
Stephane Nicoll
d5d23d73e7
Polish "Allow SpringApplicationBuilder to specify a ResourceLoader"
...
See gh-26690
2021-06-14 08:17:52 +02:00
Jamin Hitchcock
7b0ba35025
Allow SpringApplicationBuilder to specify a ResourceLoader
...
See gh-26690
2021-06-14 08:17:02 +02:00
Stephane Nicoll
fc0438eda8
Polish "Allow direct use of exposed WebSessionIdResolver bean"
...
See gh-26437
2021-06-14 08:13:58 +02:00
weixsun
65ce1454e0
Allow direct use of exposed WebSessionIdResolver bean
...
See gh-26437
2021-06-14 08:13:58 +02:00
Stephane Nicoll
b7f126020e
Update copyright year of change file
...
See gh-26422
2021-06-12 18:00:24 +02:00
Marcus Klimstra
10ffaffb7b
Improve configuration of Start and Stop goals
...
See gh-26422
2021-06-12 18:00:24 +02:00
Stephane Nicoll
6b4efcce11
Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder"
...
See gh-26341
2021-06-12 17:51:57 +02:00
nguyensach
850c653862
Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder
...
See gh-26341
2021-06-12 17:51:57 +02:00
Stephane Nicoll
69c2621a14
Polish "Add support for @Value annotation"
...
See gh-26337
2021-06-12 17:40:34 +02:00
Mark Jeffrey
14d86034a1
Add support for @Value annotation
...
This commit adds support for `@Value` from project Lombok for metadata
generation. This is very similar to the existing `@Data` support.
See gh-26337
2021-06-12 17:40:34 +02:00
Stephane Nicoll
d847f4c69e
Polish "Add configuration property for Tomcat's rejectIllegalHeader"
...
See gh-26311
2021-06-12 17:27:11 +02:00
David Byron
e5a539d80e
Add configuration property for Tomcat's rejectIllegalHeader
...
See gh-26311
2021-06-12 17:27:10 +02:00
Stephane Nicoll
a1183c4641
Polish "Reproducible build for spring-boot-maven-plugin:build-info"
...
See gh-26221
2021-06-12 17:11:14 +02:00
Slawomir Jaranowski
2dec6dd552
Reproducible build for spring-boot-maven-plugin:build-info
...
See gh-26221
2021-06-12 17:11:14 +02:00
Andy Wilkinson
2bea21ed4f
Merge branch '2.5.x'
...
Closes gh-26874
2021-06-11 19:53:32 +01:00
Andy Wilkinson
866f1e34c1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26873
2021-06-11 19:53:05 +01:00
Andy Wilkinson
37d395bad2
Try to stabilize flaky MetricsWebClientFilterFunction test
...
Closes gh-26855
2021-06-11 19:48:34 +01:00
Stephane Nicoll
a90c7181b7
Polish "Add auto-configuration for DiskSpaceMetrics"
...
See gh-26001
2021-06-11 17:01:36 +02:00
bono007
e3f03dd50a
Add auto-configuration for DiskSpaceMetrics
...
See gh-26001
2021-06-11 17:01:36 +02:00
Andy Wilkinson
151e0eb2b6
Merge branch '2.5.x'
...
Closes gh-26871
2021-06-11 15:55:42 +01:00
Andy Wilkinson
0ab7144bf1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26870
2021-06-11 15:55:31 +01:00
Andy Wilkinson
608c4509f8
Try to stabilise SocketTargetServerConnectionTests
...
Closes gh-26857
2021-06-11 15:55:01 +01:00
Andy Wilkinson
5123d7c937
Merge branch '2.4.x'
...
Closes gh-26869
2021-06-11 15:50:33 +01:00
Andy Wilkinson
00b9e7f498
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26868
2021-06-11 15:49:57 +01:00
Andy Wilkinson
186658cc12
Attempt to stabilize stopTriggersTunnelClose
...
Closes gh-26856
2021-06-11 15:48:50 +01:00
Stephane Nicoll
9e46061aa6
Allow to chain ContextConsumer implementations
...
Closes gh-26723
2021-06-11 16:04:34 +02:00
Andy Wilkinson
f3f119b111
Don't shutdown logging system before contexts
...
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.
Fixes gh-26660
2021-06-10 07:56:48 -07:00
Andy Wilkinson
39aa27e13c
Make DB init back off without DatabasePopulator
...
Fixes gh-26850
2021-06-10 11:27:25 +01:00
Phillip Webb
2835085ffb
Polish
2021-06-10 00:21:38 -07:00
Phillip Webb
17671980dc
Merge branch '2.4.x'
2021-06-10 00:15:48 -07:00
Phillip Webb
7c4f178c17
Merge branch '2.3.x' into 2.4.x
2021-06-10 00:15:28 -07:00
Phillip Webb
3b48526732
Polish
2021-06-10 00:12:34 -07:00
Stephane Nicoll
18eb88b281
Upgrade to Git Commit ID Plugin 4.0.5
...
Closes gh-26845
2021-06-10 08:38:38 +02:00
Stephane Nicoll
f79f2b1594
Upgrade to Spring AMQP 2.3.8
...
Closes gh-26764
2021-06-10 07:58:19 +02:00
Stephane Nicoll
ab90a948be
Polish "Fix Optaplanner starter url"
...
See gh-26816
2021-06-10 07:53:07 +02:00
Geoffrey De Smet
736b0678e5
Fix Optaplanner starter url
...
See gh-26816
2021-06-10 07:52:35 +02:00
Stephane Nicoll
a7c538faa0
Upgrade to RSocket 1.1.1
...
Closes gh-26839
2021-06-10 07:46:17 +02:00
Stephane Nicoll
2201315556
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26838
2021-06-10 07:46:17 +02:00
Stephane Nicoll
5cb1bd8245
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26837
2021-06-10 07:46:17 +02:00
Madhura Bhave
2e2d1fe8d3
Merge branch '2.4.x' into main
2021-06-09 14:46:36 -07:00
Madhura Bhave
e3042b38f5
Merge branch '2.3.x' into 2.4.x
2021-06-09 14:45:23 -07:00
Madhura Bhave
63806d5bac
Remove duplicate copyright notice from docs
2021-06-09 14:44:44 -07:00
Andy Wilkinson
d79b3597bb
Upgrade to Spring AMQP 2.3.8
...
Closes gh-26762
2021-06-09 21:39:24 +01:00
Andy Wilkinson
d4200a7c56
Upgrade to Spring Integration 5.3.8.RELEASE
...
Closes gh-26772
2021-06-09 21:20:14 +01:00
Andy Wilkinson
03e1b255ea
Upgrade to Spring AMQP 2.2.18.RELEASE
...
Closes gh-26770
2021-06-09 21:18:37 +01:00
Andy Wilkinson
9fb7cf49e4
Upgrade to Spring Kafka 2.7.2
...
Closes gh-26765
2021-06-09 19:43:37 +01:00
Andy Wilkinson
4a11c6a135
Upgrade to Spring Kafka 2.6.9
...
Closes gh-26763
2021-06-09 19:29:23 +01:00
Andy Wilkinson
53068a2489
Upgrade to Spring Kafka 2.5.14.RELEASE
...
Closes gh-26771
2021-06-09 19:15:08 +01:00
Andy Wilkinson
46d7999b1d
Lower spring.sql.init.enabled's deprecation level to warning
...
See gh-26682
2021-06-09 19:11:20 +01:00
Andy Wilkinson
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
Stephane Nicoll
6a7a11ba59
Upgrade to RSocket 1.1.1
...
Closes gh-26836
2021-06-09 15:24:13 +02:00
Stephane Nicoll
66ae421f74
Upgrade to Neo4j Java Driver 4.1.3
...
Closes gh-26835
2021-06-09 15:24:12 +02:00
Stephane Nicoll
f9a0b0308d
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26834
2021-06-09 15:24:11 +02:00
Stephane Nicoll
6cdbed7dc3
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26833
2021-06-09 15:24:09 +02:00
Stephane Nicoll
872ec0bf00
Upgrade to RSocket 1.0.5
...
Closes gh-26832
2021-06-09 15:00:55 +02:00
Stephane Nicoll
f73e7bcc0c
Upgrade to Neo4j OGM 3.2.24
...
Closes gh-26831
2021-06-09 15:00:54 +02:00
Stephane Nicoll
1ef0068b38
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26830
2021-06-09 15:00:53 +02:00
Stephane Nicoll
0563955324
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26829
2021-06-09 15:00:51 +02:00
Stephane Nicoll
8590eccac4
Polish
...
See gh-26682
2021-06-09 14:47:54 +02:00
Stephane Nicoll
d23b07a166
Upgrade to Spring Framework 5.3.8
...
Closes gh-26761
2021-06-09 12:21:45 +02:00
Stephane Nicoll
e9592229fc
Upgrade to Spring Framework 5.3.8
...
Closes gh-26760
2021-06-09 12:01:55 +02:00
Andy Wilkinson
03f8a46c80
Test our Gradle plugin against 7.1-rc-2
...
Closes gh-26825
2021-06-09 09:41:25 +01:00
Andy Wilkinson
c5728c9560
Merge branch '2.4.x'
...
Closes gh-26827
2021-06-09 09:13:21 +01:00
Andy Wilkinson
303edac6bb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26826
2021-06-09 09:13:06 +01:00
Andy Wilkinson
d1e1796f76
Consider overridden getRootUri() when getting root URI
...
Fixes gh-26812
2021-06-09 09:12:37 +01:00
Phillip Webb
850088de32
Merge branch '2.4.x'
...
Closes gh-26823
2021-06-08 18:17:33 -07:00
Phillip Webb
d5264664e6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26822
2021-06-08 18:17:18 -07:00
Phillip Webb
1f6983c4c9
Make CompositeHealth.getDetails() public
...
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.
Fixes gh-26797
2021-06-08 18:17:09 -07:00
Phillip Webb
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
Phillip Webb
703eaa71f4
Remove main class configuration fallback
...
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.
Closes gh-26794
2021-06-08 18:00:50 -07:00
Phillip Webb
b7ac1e6cd7
Rename derivefrom to align with DataSourceBuilder
...
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.
Fixes gh-26810
2021-06-08 15:44:01 -07:00
Phillip Webb
f8c3e0e5aa
Respect custom username/password properties
...
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.
Fixes gh-26676
2021-06-08 14:58:39 -07:00
Phillip Webb
d19b2681ab
Rework build-image-customization table in docs
...
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.
Closes gh-25739
2021-06-08 14:46:53 -07:00
Phillip Webb
6ab2df5698
Order DataSourceScriptDatabaseInitializer last
...
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.
Closes gh-26692
2021-06-08 14:10:59 -07:00
Phillip Webb
dafd511284
Support DatabaseInitializerDetector ordering
...
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.
Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.
See gh-26692
2021-06-08 14:10:55 -07:00
Scott Frederick
fba5ffc626
Fix FilePermissionsTests on Windows
...
See gh-26658
2021-06-08 15:58:03 -05:00
Andy Wilkinson
8df6392ca5
Polish
...
The use of the file's absolute path caused test failures on Windows.
See gh-26682
2021-06-08 18:28:09 +01:00
Andy Wilkinson
c52143727a
Reinstate mode for controlling DB initialization
...
Closes gh-26682
2021-06-08 15:13:55 +01:00
Andy Wilkinson
1a0e008a8c
Prevent Netty tcNative from loading classes with wrong class loader
...
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.
It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.
Closes gh-26749
2021-06-08 11:20:02 +01:00
Stephane Nicoll
faeda6f917
Polish
2021-06-08 10:32:50 +02:00
Stephane Nicoll
4c71e8124d
Upgrade to Undertow 2.2.8.Final
...
Closes gh-26809
2021-06-08 08:24:55 +02:00
Stephane Nicoll
11d31edf0a
Upgrade to Neo4j Java Driver 4.2.6
...
Closes gh-26808
2021-06-08 08:24:54 +02:00
Stephane Nicoll
88b9b88cd9
Upgrade to jOOQ 3.14.11
...
Closes gh-26807
2021-06-08 08:24:53 +02:00
Stephane Nicoll
b755eacd86
Upgrade to Johnzon 1.2.13
...
Closes gh-26806
2021-06-08 08:24:51 +02:00
Stephane Nicoll
3d5caf0863
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26805
2021-06-08 08:24:50 +02:00
Stephane Nicoll
a74fb0c2f0
Upgrade to Infinispan 12.1.4.Final
...
Closes gh-26804
2021-06-08 08:24:50 +02:00
Stephane Nicoll
b4d0c3df6d
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26803
2021-06-08 08:24:49 +02:00
Stephane Nicoll
7ea263548c
Upgrade to Gson 2.8.7
...
Closes gh-26802
2021-06-08 08:24:48 +02:00
Stephane Nicoll
e2a877ca07
Upgrade to Ehcache3 3.9.4
...
Closes gh-26801
2021-06-08 08:24:47 +02:00
Stephane Nicoll
5a18553b50
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26800
2021-06-08 08:24:45 +02:00
Stephane Nicoll
b9d29130fb
Upgrade to Couchbase Client 3.1.6
...
Closes gh-26799
2021-06-08 08:24:44 +02:00
Stephane Nicoll
cd8a9d3705
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26798
2021-06-08 08:24:43 +02:00
Phillip Webb
f5b93da90f
Fix conversion failures when using DefaultResolver
...
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.
Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.
Fixes gh-26732
2021-06-07 22:07:22 -07:00
Phillip Webb
be23a29651
Polish
2021-06-07 20:44:23 -07:00
Andy Wilkinson
87d35250a5
Test our Gradle plugin against 7.1-rc-1
...
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.
Closes gh-26793
2021-06-07 13:35:52 +01:00
Stephane Nicoll
bac89a3919
Upgrade to Undertow 2.2.8.Final
...
Closes gh-26791
2021-06-07 07:57:54 +02:00
Stephane Nicoll
d6f22f0802
Upgrade to jOOQ 3.14.11
...
Closes gh-26790
2021-06-07 07:57:53 +02:00
Stephane Nicoll
99169af57c
Upgrade to Johnzon 1.2.13
...
Closes gh-26789
2021-06-07 07:57:52 +02:00
Stephane Nicoll
fe249dd772
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26788
2021-06-07 07:57:51 +02:00
Stephane Nicoll
5be4a9ab50
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26787
2021-06-07 07:57:50 +02:00
Stephane Nicoll
e496d2e321
Upgrade to Gson 2.8.7
...
Closes gh-26786
2021-06-07 07:57:49 +02:00
Stephane Nicoll
16ff9318b5
Upgrade to Ehcache3 3.9.4
...
Closes gh-26785
2021-06-07 07:57:48 +02:00
Stephane Nicoll
90f96e2d48
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26784
2021-06-07 07:57:47 +02:00
Stephane Nicoll
cfaab0904b
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26783
2021-06-07 07:57:46 +02:00
Phillip Webb
abd926788f
Merge branch '2.4.x'
...
Closes gh-26782
2021-06-06 21:53:10 -07:00
Phillip Webb
7396e1e743
Fix property ordering within '.' and '/config'
...
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.
Prior to this commit, the default search locations considered for
application properties/yaml files was the following:
optional:classpath:/
optional:classpath:/config/
optional:file:./
optional:file:./config/
optional:file:./config/*/
Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.
This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files
optional:classpath:/;optional:classpath:/config/
optional:file:./;optional:file:./config/;optional:file:./config/*/
Closes gh-26593
2021-06-06 21:05:54 -07:00
Stephane Nicoll
1e680241ed
Upgrade to Johnzon 1.2.13
...
Closes gh-26781
2021-06-06 20:25:54 +02:00
Stephane Nicoll
3a0794da4b
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26780
2021-06-06 20:25:52 +02:00
Stephane Nicoll
84a4693dcf
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26779
2021-06-06 20:25:51 +02:00
Stephane Nicoll
790a8c1f47
Upgrade to Gson 2.8.7
...
Closes gh-26778
2021-06-06 20:25:50 +02:00
Stephane Nicoll
7ccbe3c5f8
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26777
2021-06-06 20:25:48 +02:00
Stephane Nicoll
f3049e8e94
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26776
2021-06-06 20:25:47 +02:00
Stephane Nicoll
5391f028a7
Start building against Spring Kafka 2.7.2 snapshots
...
See gh-26765
2021-06-06 20:23:37 +02:00
Stephane Nicoll
caacee5f1c
Start building against Spring AMQP 2.3.8
...
See gh-26764
2021-06-06 20:23:11 +02:00
Stephane Nicoll
c435f6337c
Start building against Spring Framework 5.3.8 snapshots
...
See gh-26761
2021-06-06 20:22:45 +02:00
Stephane Nicoll
39f259554b
Start building against Spring Integration 5.3.8 snapshots
...
See gh-26772
2021-06-05 18:24:22 +02:00
Stephane Nicoll
37625854b6
Start building against Spring Kafka 2.5.14 snapshots
...
See gh-26771
2021-06-05 18:23:57 +02:00
Stephane Nicoll
323d1e224d
Start building against Spring AMQP 2.2.18 snapshots
...
See gh-26770
2021-06-05 18:23:27 +02:00
Stephane Nicoll
de06bbb4dc
Start building against Spring Kafka 2.6.9 snapshots
...
See gh-26763
2021-06-04 17:50:30 +02:00
Stephane Nicoll
4c31ccb576
Start building against Spring AMQP 2.3.8 snapshots
...
See gh-26762
2021-06-04 17:50:30 +02:00
Stephane Nicoll
d2fe417bbb
Start building against Spring Framework 5.3.8 snapshots
...
See gh-26760
2021-06-04 17:50:30 +02:00
Stephane Nicoll
5ac5038176
Merge branch '2.4.x'
2021-06-04 17:49:52 +02:00
Stephane Nicoll
aea8597114
Merge branch '2.3.x' into 2.4.x
2021-06-04 17:49:40 +02:00
Stephane Nicoll
6490edc16d
Polish
2021-06-04 17:46:42 +02:00
Stephane Nicoll
aff1366731
Polish "Fix typo in 'Reacting to the Maven plugin' title"
...
See gh-26751
2021-06-04 09:51:48 +02:00
Abel Salgado Romero
9eea502c3e
Fix typo in 'Reacting to the Maven plugin' title
...
See gh-26751
2021-06-04 09:46:47 +02:00
Phillip Webb
e73062aefa
Merge branch '2.4.x'
...
Closes gh-26755
2021-06-03 22:24:17 -07:00
Phillip Webb
0da0d2d469
Prevent nested profile-specific resolution
...
Update the `ConfigDataEnvironment` so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is no longer called when
resolving imports declared in a profile-specific file.
Fixes gh-26753
2021-06-03 22:24:01 -07:00
Phillip Webb
3c7a0d3bf2
Merge branch '2.4.x'
...
Closes gh-26754
2021-06-03 22:23:27 -07:00
Phillip Webb
d1b256a169
Prevent indirect standard profile-specific imports
...
Update `StandardConfigDataLocationResolver` so that profile-specific
imports can only be used when there is no parent import.
Prior to this commit, given the following application.properties file:
spring.profiles.active=p1,p2
spring.config.import=other.properties
We would attempt to import `other.properties`, `other-p1.properties`
and `other-p2.properties`. This seems quite confusing and when we really
only need to support profile-specific properties for the initial root
set of locations.
Fixes gh-26752
2021-06-03 22:22:44 -07:00
Stephane Nicoll
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
Phillip Webb
02494d63d2
Merge branch '2.4.x'
...
Closes gh-26744
2021-06-02 17:26:05 -07:00
Phillip Webb
1cda557d03
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26743
2021-06-02 17:25:51 -07:00
Phillip Webb
1beee5700c
Don't close early when SecurityManager present
...
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.
Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.
Closes gh-25538
2021-06-02 17:24:05 -07:00
Madhura Bhave
554cf9d7c7
Merge branch '2.4.x' into main
...
Closes gh-26741
2021-06-02 12:24:36 -07:00
Madhura Bhave
2ff3fe22e5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26740
2021-06-02 12:20:02 -07:00
Madhura Bhave
d0e2925dcc
Fix link to Spring Data JPA docs
...
Fixes gh-26736
2021-06-02 12:18:57 -07:00
Scott Frederick
f560e86f03
Write buildpack directories to builder layer
...
When a custom buildpack is provided for image building, the contents
of the buildpack directory, tgz file, or image are copied as tar
entries to a new layer in the ephemeral builder image. Prior to this
commit, only file entries from the buildpack source were copied as
builder layer tar entries; intermediate directory entries from the
source were not copied. This results in directories being created in
the builder container using default permissions. This worked on most
Linux-like OSs where the default permissions allow others-read
access. On some OSs like Arch Linux where the default directory
permissions do not allow others-read, this prevented the lifecycle
processes from reading the buildpack files.
This commit explicitly creates all intermediate directory tar entries
in the builder image layer to ensure that the buildpack directories
and files can be read by the lifecycle processes.
Fixes gh-26658
2021-06-02 14:09:53 -05:00
Madhura Bhave
e2cba40db0
Merge branch '2.4.x' into main
...
Closes gh-26739
2021-06-02 12:02:53 -07:00
Madhura Bhave
b102fdd392
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26738
2021-06-02 12:02:11 -07:00
Madhura Bhave
15324956a8
Align int and long in RandomValuePropertySource
...
This commit aligns int and long so that a random number is generated
by delegating to ints/longs in the JDK's Random API. In the case of a
single bound value, it needs to be greater than 0 because 0 is used as
the lower bound.
Fixes gh-26628
2021-06-02 12:00:25 -07:00
Stephane Nicoll
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
Stephane Nicoll
1f95989e85
Merge branch '2.4.x'
...
Closes gh-26735
2021-06-02 13:56:13 +02:00
Stephane Nicoll
363c43e315
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26734
2021-06-02 13:52:03 +02:00
Stephane Nicoll
3f23b9265d
Clarify when a connection pool is created for Redis
...
Closes gh-26733
2021-06-02 13:49:16 +02:00
Stephane Nicoll
7b490f003c
Avoid dependency on Kotlin when depending on spring-security-config
...
Closes gh-26727
2021-06-01 17:45:14 +02:00
Stephane Nicoll
97c5a08ca5
Merge branch '2.4.x'
...
Closes gh-26725
2021-06-01 15:38:48 +02:00
Stephane Nicoll
c8959180fe
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26724
2021-06-01 15:38:27 +02:00
Stephane Nicoll
7e4defbcba
Properly guard LogbackLoggingSystem
...
Previously, LoggingSystem#get would chose Logback by the sole presence
of a class in logback-core, with the assumption that logback-classic is
also on the classpath. An app that only had the former would therefore
fail.
This commit updates the condition to check for a class in
logback-classic instead.
Closes gh-26711
2021-06-01 15:35:22 +02:00
Stephane Nicoll
d0185e7531
Merge branch '2.4.x'
...
Closes gh-26717
2021-05-31 07:47:59 +02:00
Stephane Nicoll
897fd63faf
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26716
2021-05-31 07:47:45 +02:00
weixsun
4b3bf75a4c
Remove redudant space
...
See gh-26713
2021-05-31 07:47:07 +02:00
Phillip Webb
d3f0f04f05
Merge branch '2.4.x'
...
Closes gh-26703
2021-05-28 14:53:27 -07:00
Phillip Webb
49d3ecc2b2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26702
2021-05-28 14:53:12 -07:00
Phillip Webb
617f7b9587
Improve ImageName/ImageReference parse performance
...
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.
Fixes gh-23115
2021-05-28 14:52:27 -07:00
Madhura Bhave
54c3194164
Merge branch '2.4.x' into main
...
Closes gh-26701
2021-05-28 14:38:28 -07:00
Madhura Bhave
5314bda48d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26700
2021-05-28 14:30:44 -07:00
Madhura Bhave
f55e4c08f5
Add note about Kubernetes termination grace period
...
Closes gh-26469
2021-05-28 14:30:04 -07:00
Stephane Nicoll
b8b0430139
Merge branch '2.4.x'
...
Closes gh-26697
2021-05-28 13:29:42 +02:00
Stephane Nicoll
7f5adb7e9d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26696
2021-05-28 13:29:29 +02:00
Stephane Nicoll
454d72d9b2
Document spring.profiles.default in the reference guide
...
Closes gh-26592
2021-05-28 13:29:27 +02:00
Stephane Nicoll
67fe60ba8a
Add missing static on JerseyInfrastructureConfiguration
...
Closes gh-26695
2021-05-28 13:26:37 +02:00
Phillip Webb
5258c26f90
Merge branch '2.4.x'
2021-05-27 13:15:19 -07:00
Phillip Webb
49c30854af
Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
...
Rename the now public constant for consistency with the JavaPlugin.
See gh-26686
2021-05-27 13:14:16 -07:00
Phillip Webb
ac0c1b1456
Merge branch '2.4.x'
...
Closes gh-26687
2021-05-27 12:08:49 -07:00
Phillip Webb
1e0ae9d5e3
Make PRODUCTION_RUNTIME_CLASSPATH_NAME public
...
Change `SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME` from package
private to public so that it can be accessed in user build scripts.
Fixes gh-26686
2021-05-27 12:07:35 -07:00
Phillip Webb
42865daca9
Merge branch '2.4.x'
2021-05-27 11:49:42 -07:00
Phillip Webb
8661f74f2e
Revert "Test optional directories without sub-directories"
...
This reverts commit 3f858ed8a4
since the test already existed.
2021-05-27 11:48:58 -07:00
Phillip Webb
91eb37dd84
Merge branch '2.4.x'
...
Closes gh-26679
2021-05-26 21:33:18 -07:00
Phillip Webb
3f858ed8a4
Test optional directories without sub-directories
...
Add an additional test to ensure that optional wildcard
directory patterns do not fail.
See gh-26677
2021-05-26 21:31:14 -07:00
izeye
38b9a833bd
Fix "Allow optional directories without sub-directories"
...
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29e
which was incorrectly checking `isOptional`.
See gh-26677
2021-05-26 21:19:05 -07:00
Phillip Webb
1a10162777
Change state change logging to DEBUG
...
Update `ApplicationAvailabilityBean` so that state change logging is
at DEBUG rather than INFO.
Fixes gh-26624
2021-05-26 16:31:35 -07:00
Phillip Webb
78ac7b3861
Polish
2021-05-26 16:19:26 -07:00
Phillip Webb
b6d31fb6a1
Use correct type for deriveFromProperties
...
Fix `DataSourceBuilder` so that the type used to access `deriveFrom`
properties is based on the actual instance type rather than the
user-defined type which could have been changed.
Fixes gh-26644
2021-05-26 15:55:10 -07:00
Scott Frederick
eed620fc80
Allow `driverClassName` to be optional
...
Update `DataSourceBuilder` so that the `driverClassName` may be optional
and silently ignored if it set but the underlying type does not have
a getter/setter.
This restores Spring Boot 2.4 behavior.
Fixes gh-26631
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-26 15:52:32 -07:00
Scott Frederick
c679b4ccd6
Don't attempt to set null values
...
Update `DataSourceBuilder` so that setters are not longer called for
`null` values. This restores Spring Boot 2.4 behavior.
Fixes gh-26633
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-26 15:52:27 -07:00
Scott Frederick
a31e976ec6
Support fallback URL properties
...
Update `DataSourceBuilder` so that the url property attempts both
`getUrl()` / `setUrl(...)` and `getURL()`/`setURL(...)`.
Fixes gh-26647
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-26 15:52:18 -07:00
Phillip Webb
e55948456f
Respect custom username/password properties
...
Fix a bug in `DataSourceInitializationConfiguration` that was stopping
custom username/password properties from being applied.
Fixes gh-26676
2021-05-26 15:51:34 -07:00
Scott Frederick
7d6093680d
Polish
2021-05-26 15:51:30 -07:00
Stephane Nicoll
e5ee1eb86f
Merge branch '2.4.x'
...
See gh-26654
2021-05-26 09:27:52 +02:00
Stephane Nicoll
130261f0df
Merge branch '2.3.x' into 2.4.x
...
See gh-26653
2021-05-26 09:21:17 +02:00
Stephane Nicoll
3fbf5eeb5b
Document spring.profiles.default in the reference guide
...
Closes gh-26592
2021-05-26 09:20:58 +02:00
Phillip Webb
249c675fff
Merge branch '2.4.x'
...
Closes gh-26672
2021-05-25 19:37:14 -07:00
Andy Wilkinson
01dd68e29e
Allow optional directories without sub-directories
...
Update `StandardConfigDataLocationResolver` so that directory resources
are only required when the location is not optional.
Closes gh-26627
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-25 19:36:50 -07:00
Stephane Nicoll
3c6bf14c16
Polish
2021-05-25 16:46:05 +02:00
Stephane Nicoll
f3d4fdb9c4
Merge branch '2.4.x'
...
Closes gh-26655
2021-05-25 10:46:40 +02:00
Stephane Nicoll
fe1e2319b2
Polish "Clarify Kotlin version requirements in documentation"
...
See gh-26421
2021-05-25 10:45:08 +02:00
Lovekesh Garg
944ba34556
Clarify Kotlin version requirements in documentation
...
See gh-26421
2021-05-25 10:44:51 +02:00
Stephane Nicoll
d5b41e288f
Merge branch '2.4.x'
...
Closes gh-26654
2021-05-25 10:37:49 +02:00
Stephane Nicoll
9ff372c915
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26653
2021-05-25 10:37:40 +02:00
Stephane Nicoll
b5ebf836e3
Document spring.profiles.default
...
Closes gh-26592
2021-05-25 10:32:59 +02:00
Madhura Bhave
4416859a81
Merge branch '2.4.x' into main
2021-05-24 21:11:42 -07:00
Madhura Bhave
4955c80da5
Remove test that is no long necessary
2021-05-24 21:10:50 -07:00
Madhura Bhave
ae24d66af7
Merge branch '2.4.x' into main
...
Closes gh-26649
2021-05-24 16:42:32 -07:00
Madhura Bhave
8f2b180eb6
Use Sso Binding from SAML metadata uri if present
...
If the property is explicitly configured, that gets used.
If none are present, we rely on Spring Security's default value of
REDIRECT.
Fixes gh-26454
2021-05-24 16:37:31 -07:00
Stephane Nicoll
cb7c3774a7
Merge branch '2.4.x'
...
Closes gh-26646
2021-05-24 11:39:57 +02:00
Stephane Nicoll
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
Oliver B. Fischer
11af8a816c
Add link to Maven Git Commit Id Plugin
...
See gh-26635
2021-05-23 16:37:44 +02:00
Andy Wilkinson
7a7050879c
Avoid eager initialization when configuring Data repository metrics
...
Fixes gh-26630
2021-05-21 13:54:35 +01:00
Phillip Webb
15042e2710
Merge branch '2.4.x'
...
Closes gh-26623
2021-05-20 14:43:11 -07:00
Phillip Webb
6bf069d9e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26622
2021-05-20 14:42:54 -07:00
Phillip Webb
004363ceaf
Use WebMvcConfigurer to add resource handlers
...
Move resource handler auto-configuration logic back to the
`WebMvcConfigurer` so that they also get applied to child contexts.
Closes gh-25743
2021-05-20 14:16:23 -07:00
Phillip Webb
ab958d2394
Include io.spring.asciidoctor.backends group
...
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.
See gh-26293
2021-05-19 22:58:31 -07:00
Phillip Webb
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
2021-05-19 21:19:24 -07:00
Phillip Webb
1702c9fc3d
Rework title anchors for gradle docs
...
Closes gh-26618
2021-05-19 21:19:24 -07:00
Phillip Webb
f692b0e937
Rework title anchors for actuator docs
...
Closes gh-26615
2021-05-19 21:19:24 -07:00
Phillip Webb
2dbf39c738
Polish asciidoc formatting
2021-05-19 21:19:24 -07:00
Madhura Bhave
a28072bab4
Merge branch '2.4.x' into main
...
Closes gh-26614
2021-05-19 16:17:34 -07:00
Madhura Bhave
27fee5fa95
Configure filter to process preflight requests for webflux actuator endpoints
...
Fixes gh-24541
2021-05-19 16:16:16 -07:00
Madhura Bhave
99ed291184
Merge branch '2.4.x' into main
2021-05-19 15:27:48 -07:00
Madhura Bhave
29d1e22b91
Fix rawtypes
2021-05-19 15:26:53 -07:00
Madhura Bhave
3ef9b7e634
Merge branch '2.4.x' into main
...
Closes gh-26612
2021-05-19 15:01:45 -07:00
Madhura Bhave
743ac4c394
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26611
2021-05-19 14:55:53 -07:00
Madhura Bhave
b26e842050
Configure CORS in default security configuration for MVC
...
Fixes gh-11987
2021-05-19 14:40:57 -07:00
Madhura Bhave
110c36e607
Merge branch '2.4.x' into main
...
Closes gh-26610
2021-05-19 13:21:39 -07:00
Madhura Bhave
80610fa250
Restore order of additional and active profiles
...
This commit restores the order of additional and active profiles
so that active profiles now take precedence.
Fixes gh-26189
2021-05-19 13:21:03 -07:00
Phillip Webb
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
Andy Wilkinson
d39bb997f2
Upgrade to Spring Session 2021.0.0
...
Closes gh-26389
2021-05-19 19:05:49 +01:00
Andy Wilkinson
879f362c29
Merge branch '2.4.x'
...
Closes gh-26608
2021-05-19 19:04:45 +01:00
Andy Wilkinson
64e76badc2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26607
2021-05-19 19:03:12 +01:00
Andy Wilkinson
b6e860b2d4
Prevent Jetty from delaying shutdown beyond grace period
...
Fixes gh-22689
2021-05-19 19:02:24 +01:00
Andy Wilkinson
66d087877d
Merge branch '2.4.x'
...
Closes gh-26606
2021-05-19 16:46:27 +01:00
Andy Wilkinson
6874c42d3c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26605
2021-05-19 16:46:09 +01:00
weixsun
d2bdcddb5f
Fix outdated defaults for Info endpoint
...
See gh-26591
2021-05-19 17:42:13 +02:00
Andy Wilkinson
2a89b11df3
Exclude SmartInitializingSingletones from lazy initialization
...
Fixes gh-26470
2021-05-19 16:26:48 +01:00
Stephane Nicoll
b971ac8550
Upgrade to Netty 4.1.65.Final
...
Closes gh-26604
2021-05-19 17:24:04 +02:00
Stephane Nicoll
4caab742ca
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26603
2021-05-19 17:24:01 +02:00
Stephane Nicoll
a5f9e3912f
Upgrade to Spring WS 3.1.1
...
Closes gh-26390
2021-05-19 17:19:57 +02:00
Stephane Nicoll
6a45026097
Upgrade to Netty 4.1.65.Final
...
Closes gh-26602
2021-05-19 16:12:50 +02:00
Stephane Nicoll
8904649fcf
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26601
2021-05-19 16:12:49 +02:00
Stephane Nicoll
5edb788241
Upgrade to Netty 4.1.65.Final
...
Closes gh-26600
2021-05-19 15:51:26 +02:00
Stephane Nicoll
0d1b3fb078
Upgrade to Neo4j OGM 3.2.23
...
Closes gh-26599
2021-05-19 15:51:25 +02:00
Stephane Nicoll
22ec27dcd3
Upgrade to Json-smart 2.3.1
...
Closes gh-26598
2021-05-19 15:51:23 +02:00
Stephane Nicoll
32381ad61c
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26597
2021-05-19 15:51:22 +02:00
Stephane Nicoll
e71b4aac7b
Upgrade to Spring Batch 4.3.3
...
Closes gh-26392
2021-05-19 15:48:38 +02:00
Stephane Nicoll
e5ab626638
Upgrade to Spring Batch 4.3.3
...
Closes gh-26391
2021-05-19 15:47:47 +02:00
Stephane Nicoll
7769e77775
Upgrade to Spring Batch 4.2.7
...
Closes gh-26426
2021-05-19 15:47:06 +02:00
Andy Wilkinson
b9abcba778
Merge branch '2.4.x'
...
Closes gh-26596
2021-05-19 13:38:20 +01:00
Andy Wilkinson
ff45e4c418
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26595
2021-05-19 13:15:18 +01:00
Andy Wilkinson
936c31c7a7
Prevent metrics failures from adversely affecting web responses
...
Fixes gh-24151
2021-05-19 13:14:52 +01:00
Andy Wilkinson
55b507bccf
Upgrade to Spring Integration 5.5.0
...
Closes gh-26388
2021-05-19 08:34:34 +01:00
Andy Wilkinson
04e3165c15
Upgrade to Spring Integration 5.4.7
...
Closes gh-26587
2021-05-19 08:33:14 +01:00
Phillip Webb
34b288e5fe
Add prefix to appendix property anchor links
...
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.
Closes gh-26375
2021-05-18 21:19:24 -07:00
Phillip Webb
86a5c90d20
Simplify anchor-rewrite.properties
2021-05-18 21:19:09 -07:00
Andy Wilkinson
abd809366b
Upgrade to Spring Asciidoctor Extensions 0.6.0
...
Closes gh-26306
2021-05-18 21:44:24 +01:00
Phillip Webb
e08d4f1fe6
Move "Use Jedis Instead of Lettuce" How-to
...
See gh-26262
2021-05-18 11:53:26 -07:00
Phillip Webb
499a29c415
Move "Testcontainers" How-to
...
See gh-26262
2021-05-18 11:49:03 -07:00
Phillip Webb
72d50ed2f8
Move "Testing With Spring Security" How-to
...
See gh-26262
2021-05-18 11:49:02 -07:00
Phillip Webb
5f7e3d3952
Polish
2021-05-18 11:39:20 -07:00
Andy Wilkinson
88b383c6bb
Polish "Update docs and internal dep mgmt following Spock 2.0's release"
...
See gh-26586
2021-05-18 10:00:05 +01:00
dreis2211
5a6c355397
Update docs and internal dep mgmt following Spock 2.0's release
...
See gh-26586
2021-05-18 09:59:29 +01:00
Andy Wilkinson
2edd06fb6e
Start building against Spring Integration 5.4.7 snapshots
...
See gh-26587
2021-05-18 09:34:33 +01:00
Andy Wilkinson
d8b0aadf3b
Upgrade to Spring Security 5.5.0
...
Closes gh-26387
2021-05-18 09:28:09 +01:00
Andy Wilkinson
33a5c31fe3
Avoid duplicate crypto classes when depending on spring-security-core
...
See gh-26387
2021-05-18 09:27:48 +01:00
Stephane Nicoll
9dd9a2fa33
Upgrade to Spring AMQP 2.3.7
...
Closes gh-26384
2021-05-18 08:34:35 +02:00
Stephane Nicoll
56ba14ad2d
Upgrade to Spring Kafka 2.7.1
...
Closes gh-26386
2021-05-18 08:34:01 +02:00
Stephane Nicoll
83ad93844b
Upgrade to Spring AMQP 2.3.7
...
Closes gh-26383
2021-05-18 08:33:05 +02:00
Stephane Nicoll
2205024e9d
Upgrade to Spring Kafka 2.6.8
...
Closes gh-26385
2021-05-18 08:32:38 +02:00
Stephane Nicoll
678916fb3d
Upgrade to Spring Kafka 2.5.13
...
Closes gh-26429
2021-05-18 08:29:35 +02:00
Phillip Webb
5c28f8f6a8
Merge branch '2.4.x'
...
Closes gh-26585
2021-05-17 21:35:04 -07:00
Phillip Webb
0e3ef4071e
Allow optional ConfigDataLocationResolver results
...
Update `ConfigData` so that it signal if is considered optional. This
update allows `ConfigDataLocationResolvers` to return results that
behave in the same way as `optional:` prefixed locations without the
user themselves needing to prefix the location string.
Closes gh-25894
2021-05-17 21:31:58 -07:00
Phillip Webb
0c8d819150
Merge branch '2.4.x'
...
Closes gh-26584
2021-05-17 17:10:10 -07:00
Phillip Webb
0699fdcc8a
Polish 'Allow remote devtools access with Spring Security'
...
See gh-25868
2021-05-17 16:54:27 -07:00
Hatef Palizgar
9b2e13aace
Allow remote devtools access with Spring Security
...
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.
Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.
See gh-25868
2021-05-17 16:51:18 -07:00
Phillip Webb
ba0fe1edbd
Merge branch '2.4.x'
...
Closes gh-26581
Closes gh-26582
Closes gh-26583
2021-05-17 16:28:52 -07:00
Madhura Bhave
c45bb2bd95
Handle empty locations from patterns
...
Update `StandardConfigDataLocationResolver` to deal with patterns when
resolving empty directories. This update also fixes the handling of
mandatory pattern locations which would previously throw an exception.
The error message returned when a location with a pattern does not
contain any subdirectories has also been improved.
Fixes gh-26468
Fixes gh-26577
Fixes gh-26415
2021-05-17 16:23:46 -07:00
Phillip Webb
2bbad94910
Restore hasProgrammaticallySetProfiles code
...
Restore code lost on merge.
See gh-26580
2021-05-17 15:34:45 -07:00
Phillip Webb
634d27679a
Merge branch '2.4.x'
...
Closes gh-26580
2021-05-17 13:30:33 -07:00
Madhura Bhave
cfa26735d2
Merge programmatically set active profiles
...
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.
Fixes gh-26151
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-17 13:29:12 -07:00
Andy Wilkinson
36b6235e86
Upgrade to Spring AMQP 2.2.17.RELEASE
...
Closes gh-26428
2021-05-17 18:02:53 +01:00
Stephane Nicoll
e9174c1e3d
Update copyright year of changed files
...
See gh-26478
2021-05-17 16:08:20 +02:00
weixsun
935199b6ba
Polish AbstractServletWebServerFactory
...
See gh-26478
2021-05-17 16:08:19 +02:00
Andy Wilkinson
d41fa13463
Merge branch '2.4.x'
...
Closes gh-26575
2021-05-17 14:39:35 +01:00
Andy Wilkinson
4eab9476a6
Polish "Detect use of spring.profiles.include as a YAML list"
...
See gh-26205
2021-05-17 14:13:29 +01:00
ChangYong
80ad6385f1
Detect use of spring.profiles.include as a YAML list
...
See gh-26205
2021-05-17 14:04:51 +01:00
Andy Wilkinson
4517f6057e
Merge branch '2.4.x'
...
Closes gh-26573
2021-05-17 13:50:13 +01:00
Andy Wilkinson
1d5abf5af7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26572
2021-05-17 13:49:25 +01:00
Andy Wilkinson
eecb7dd101
Remove stale jboss-transaction-spi dependencies
...
Closes gh-26569
2021-05-17 13:49:16 +01:00
Andy Wilkinson
513dd82bed
Upgrade to Kotlin Coroutines 1.5.0
...
Closes gh-26568
2021-05-17 13:39:59 +01:00
Andy Wilkinson
af506685be
Upgrade to Thymeleaf Layout Dialect 2.5.3
...
Closes gh-26566
2021-05-17 13:39:58 +01:00
Andy Wilkinson
17506c7e13
Upgrade to Solr 8.8.2
...
Closes gh-26565
2021-05-17 13:39:58 +01:00
Andy Wilkinson
6d786ecfe1
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26564
2021-05-17 13:39:58 +01:00
Andy Wilkinson
d3e8d1533f
Upgrade to R2DBC Bom Arabba-SR10
...
Closes gh-26563
2021-05-17 13:39:58 +01:00
Andy Wilkinson
b62a011643
Upgrade to Postgresql 42.2.20
...
Closes gh-26562
2021-05-17 13:39:58 +01:00
Andy Wilkinson
f6d89fd940
Upgrade to Pooled JMS 1.2.2
...
Closes gh-26561
2021-05-17 13:39:58 +01:00
Andy Wilkinson
ef89622a10
Upgrade to Netty tcNative 2.0.39.Final
...
Closes gh-26560
2021-05-17 13:39:57 +01:00