Phillip Webb
6686a49b1f
Merge branch '2.5.x'
...
Closes gh-27074
2021-06-24 00:04:44 -07:00
Phillip Webb
b093db104c
Pass ResourceLoader.getClassLoader() to Instantiator
...
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.
Closes gh-27071
2021-06-24 00:03:16 -07:00
Phillip Webb
fe34bcdd52
Merge branch '2.5.x'
...
Closes gh-27073
2021-06-23 23:33:18 -07:00
Phillip Webb
641dfbdf98
Merge branch '2.4.x' into 2.5.x
...
Fixes gh-27072
2021-06-23 23:32:50 -07:00
Phillip Webb
5088927f80
Pass ClassLoader to Instantiator
...
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.
Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.
Fixes gh-27043
2021-06-23 23:30:53 -07:00
Stephane Nicoll
7d8e7468bf
Merge branch '2.5.x'
...
See gh-27065
2021-06-24 08:22:02 +02:00
Stephane Nicoll
d079db1dce
Polish
...
See gh-26978
2021-06-24 08:20:11 +02:00
Stephane Nicoll
57f5030397
Upgrade to Netty tcNative 2.0.40.Final
...
Closes gh-27070
2021-06-24 07:49:33 +02:00
Stephane Nicoll
43f6393e9a
Upgrade to Hazelcast 4.1.4
...
Closes gh-27069
2021-06-24 07:49:32 +02:00
Stephane Nicoll
6889d2adda
Upgrade to Nimbus JOSE JWT 8.22
...
Closes gh-27068
2021-06-24 07:27:08 +02:00
Stephane Nicoll
d4039648c7
Upgrade to OAuth2 OIDC SDK 8.36.2
...
Closes gh-27067
2021-06-24 07:27:06 +02:00
Stephane Nicoll
1f53e93b8d
Upgrade to Netty tcNative 2.0.40.Final
...
Closes gh-27066
2021-06-24 07:27:05 +02:00
Stephane Nicoll
d4fa46f1b9
Polish startup endpoint description in reference doc
...
Closes gh-26978
2021-06-24 07:19:58 +02:00
Stephane Nicoll
32d6b52980
Upgrade to Spring Integration 5.5.1
...
Closes gh-26974
2021-06-24 06:40:59 +02:00
Stephane Nicoll
dd63f98fcf
Upgrade to Spring Kafka 2.7.3
...
Closes gh-26973
2021-06-24 06:40:34 +02:00
Stephane Nicoll
b5cdc84273
Upgrade to Spring AMQP 2.3.9
...
Closes gh-26972
2021-06-24 06:40:03 +02:00
Stephane Nicoll
006995fef7
Upgrade to Spring Integration 5.4.8
...
Closes gh-26967
2021-06-24 06:39:11 +02:00
Stephane Nicoll
6804ae849d
Upgrade to Spring AMQP 2.3.9
...
Closes gh-26966
2021-06-24 06:38:42 +02:00
Phillip Webb
cb3a41c4db
Merge branch '2.5.x'
...
Closes gh-27064
2021-06-23 21:36:28 -07:00
dreis2211
7a25e4edb8
Avoid illegal reflective access in CLI tests
...
See gh-26930
2021-06-23 21:34:54 -07:00
Phillip Webb
6b241d04c0
Merge branch '2.5.x'
...
Closes gh-27063
2021-06-23 21:13:18 -07:00
Phillip Webb
093e7f7e3b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27062
2021-06-23 21:13:08 -07:00
Phillip Webb
1a7569056b
Fix 'spring.datasource.name' property description
...
Closes gh-27026
2021-06-23 21:12:59 -07:00
Phillip Webb
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -07:00
Phillip Webb
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
Phillip Webb
b141fcf51d
Merge branch '2.5.x'
...
Closes gh-27061
2021-06-23 21:01:05 -07:00
Phillip Webb
84fab65b9a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27060
2021-06-23 21:00:46 -07:00
Phillip Webb
ea62967ef4
Improve "reason" message in BindFailureAnalyzer
...
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.
Closes gh-27028
2021-06-23 20:54:01 -07:00
Phillip Webb
0e28e24123
Rethrow ConverterNotFoundException when possible
...
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.
See gh-27028
2021-06-23 20:53:35 -07:00
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