4572ae5430
Use reflection to extract Netty's default level
...
See gh-27046
2021-06-24 11:20:56 +01:00
e2d68aa8b2
Merge branch '2.4.x' into 2.5.x
...
See gh-27072
2021-06-24 09:53:04 +01:00
a7872f47da
Minimize Instantiator's public API
...
See gh-27043
2021-06-24 09:27:08 +01:00
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
641dfbdf98
Merge branch '2.4.x' into 2.5.x
...
Fixes gh-27072
2021-06-23 23:32:50 -07:00
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
d079db1dce
Polish
...
See gh-26978
2021-06-24 08:20:11 +02:00
57f5030397
Upgrade to Netty tcNative 2.0.40.Final
...
Closes gh-27070
2021-06-24 07:49:33 +02:00
43f6393e9a
Upgrade to Hazelcast 4.1.4
...
Closes gh-27069
2021-06-24 07:49:32 +02:00
6889d2adda
Upgrade to Nimbus JOSE JWT 8.22
...
Closes gh-27068
2021-06-24 07:27:08 +02:00
d4039648c7
Upgrade to OAuth2 OIDC SDK 8.36.2
...
Closes gh-27067
2021-06-24 07:27:06 +02:00
1f53e93b8d
Upgrade to Netty tcNative 2.0.40.Final
...
Closes gh-27066
2021-06-24 07:27:05 +02:00
d4fa46f1b9
Polish startup endpoint description in reference doc
...
Closes gh-26978
2021-06-24 07:19:58 +02:00
32d6b52980
Upgrade to Spring Integration 5.5.1
...
Closes gh-26974
2021-06-24 06:40:59 +02:00
dd63f98fcf
Upgrade to Spring Kafka 2.7.3
...
Closes gh-26973
2021-06-24 06:40:34 +02:00
b5cdc84273
Upgrade to Spring AMQP 2.3.9
...
Closes gh-26972
2021-06-24 06:40:03 +02:00
006995fef7
Upgrade to Spring Integration 5.4.8
...
Closes gh-26967
2021-06-24 06:39:11 +02:00
6804ae849d
Upgrade to Spring AMQP 2.3.9
...
Closes gh-26966
2021-06-24 06:38:42 +02:00
7a25e4edb8
Avoid illegal reflective access in CLI tests
...
See gh-26930
2021-06-23 21:34:54 -07:00
093e7f7e3b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27062
2021-06-23 21:13:08 -07:00
1a7569056b
Fix 'spring.datasource.name' property description
...
Closes gh-27026
2021-06-23 21:12:59 -07:00
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
84fab65b9a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27060
2021-06-23 21:00:46 -07:00
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
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
a77e116c03
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27058
2021-06-23 17:47:08 -07:00
93d316ddd1
Add additional ConfigDataProperties tests
...
Add more `isActive` tests to cover negative cases.
See gh-27017
2021-06-23 17:46:23 -07:00
b91c66b823
Fix typo in ConfigDataPropertiesTests
...
See gh-27017
2021-06-23 17:38:46 -07:00
fd83158fa5
Merge branch '2.4.x' into 2.5.x
2021-06-23 17:28:31 -07:00
63ed921554
Restore simple Library constructor
...
See gh-15808
2021-06-23 17:27:26 -07:00
af37f59136
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27056
2021-06-23 17:13:13 -07:00
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
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
01f8cb7639
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27048
2021-06-23 18:07:33 +01:00
3746155916
Align Nimbus dependency versions with Spring Security
...
Closes gh-26820
2021-06-23 17:53:09 +01:00
e0e64e69c0
Upgrade to Micrometer 1.7.1
...
Closes gh-27015
2021-06-23 17:45:25 +02:00
d0f12392ab
Upgrade to Micrometer 1.6.8
...
Closes gh-27014
2021-06-23 17:41:25 +02:00
6c2fc8471a
Upgrade to Spring Session 2021.0.1
...
Closes gh-26971
2021-06-23 15:56:28 +02:00
fb2ed6076f
Upgrade to Spring Session 2020.0.5
...
Closes gh-26964
2021-06-23 15:55:57 +02:00
254a29f9be
Upgrade to Nimbus JOSE JWT 9.10
...
Closes gh-27039
2021-06-23 10:40:06 +02:00
4a28e21047
Upgrade to OAuth2 OIDC SDK 9.9
...
Closes gh-27038
2021-06-23 10:39:48 +02:00
f89675a3f1
Upgrade to Neo4j Java Driver 4.2.7
...
Closes gh-27037
2021-06-23 08:22:15 +02:00
1a9e3bcbd6
Upgrade to Lettuce 6.1.3.RELEASE
...
Closes gh-27036
2021-06-23 08:22:14 +02:00
763870bd45
Upgrade to Dropwizard Metrics 4.1.24
...
Closes gh-27035
2021-06-23 08:22:12 +02:00
fb1cd82061
Upgrade to OAuth2 OIDC SDK 8.36.2
...
Closes gh-27034
2021-06-23 07:58:19 +02:00
ded6b26ea5
Upgrade to Neo4j Java Driver 4.1.4
...
Closes gh-27033
2021-06-23 07:58:18 +02:00
6db9fe2e36
Upgrade to Lettuce 6.0.6.RELEASE
...
Closes gh-27032
2021-06-23 07:58:17 +02:00
9bc1c4dff2
Upgrade to Dropwizard Metrics 4.1.24
...
Closes gh-27031
2021-06-23 07:58:16 +02:00
9281dcf751
Upgrade to Spring Data 2021.0.2
...
Closes gh-26970
2021-06-22 19:22:51 +02:00
47a9a94376
Upgrade to Spring HATEOAS 1.3.2
...
Closes gh-26969
2021-06-22 19:22:28 +02:00
7e09c1d8dc
Upgrade to Spring Data 2020.0.10
...
Closes gh-26963
2021-06-22 19:21:42 +02:00
58320c6af9
Upgrade to Spring HATEOAS 1.2.7
...
Closes gh-27013
2021-06-22 19:21:12 +02:00
7ca9794f3c
Upgrade to Reactor 2020.0.8
...
Closes gh-26968
2021-06-22 14:53:10 +02:00
c21099b142
Upgrade to Reactor 2020.0.8
...
Closes gh-26962
2021-06-22 14:52:39 +02:00
051638631b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27024
2021-06-22 13:02:06 +01:00
ba9244b2d4
Polish "Update docs to use @SpringBootConfiguration not @Configuration"
...
See gh-26937
2021-06-22 12:55:25 +01:00
a5f077cf79
Update docs to use @SpringBootConfiguration not @Configuration
...
See gh-26937
2021-06-22 12:55:25 +01:00
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
0a2fe3562d
Start building against Micrometer 1.7.1 snapshots
...
See gh-27015
2021-06-22 09:53:48 +02:00
b8a5d9b882
Start building against Micrometer 1.6.8 snapshots
...
See gh-27014
2021-06-22 09:35:36 +02:00
9ab8c625e5
Start building against Spring HATEOAS 1.2.7 snapshots
...
See gh-27013
2021-06-22 08:31:44 +02:00
03cd6bec6e
Avoid illegal reflective access in RabbitAutoConfigurationTests
...
See gh-26954
2021-06-22 08:22:48 +02:00
168478f68c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27010
2021-06-22 08:21:31 +02:00
2252deb69b
Document uuid support in RandomValuePropertySource
...
See gh-26975
2021-06-22 08:16:55 +02:00
8668e55631
Revert "Avoid dependency on Kotlin when depending on spring-security-config"
...
Closes gh-26728
2021-06-22 07:55:47 +02:00
5044137658
Revert "Avoid duplicate crypto classes when depending on spring-security-core"
...
Closes gh-26588
2021-06-22 07:55:11 +02:00
c67c09df32
Upgrade to Spring Security 5.5.1
...
Closes gh-26945
2021-06-22 07:54:00 +02:00
333c7a7cd8
Upgrade to Spring Security 5.4.7
...
Closes gh-26965
2021-06-22 07:39:35 +02:00
f914dc15fc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27005
2021-06-21 18:37:08 -07:00
8189e82c02
Allow nested profile-specific resolution
...
Effectively revert commit 0da0d2d46
2021-06-21 18:30:03 -07:00
07e7398d10
Include 6.9.x in version requirements message
...
Fixes gh-26952
2021-06-21 18:20:08 +01:00
5dc1065876
Revert "Upgrade to Dropwizard Metrics 4.1.23"
...
This reverts commit ce24270271
2021-06-21 16:53:34 +02:00
3ef7ba7f9b
Upgrade to SLF4J 1.7.31
...
Closes gh-26995
2021-06-21 16:40:34 +02:00
68cd28a481
Upgrade to Postgresql 42.2.22
...
Closes gh-26994
2021-06-21 16:40:34 +02:00
b3b2d9a095
Upgrade to Jetty EL 9.0.48
...
Closes gh-26993
2021-06-21 16:40:33 +02:00
fc5d781cfc
Upgrade to Jedis 3.6.1
...
Closes gh-26992
2021-06-21 16:40:33 +02:00
2a190f3589
Upgrade to Cassandra Driver 4.11.2
...
Closes gh-26990
2021-06-21 16:40:33 +02:00
8405df10b8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26997
2021-06-21 14:34:11 +01:00
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
c99d1dae08
Start building against Spring Integration 5.5.1 snapshots
...
See gh-26974
2021-06-21 13:26:01 +02:00
d015464a7e
Start building against Spring Kafka 2.7.3 snapshots
...
See gh-26973
2021-06-21 13:26:01 +02:00
516228730f
Start building against Spring Session 2021.0.1 snapshots
...
See gh-26971
2021-06-21 13:26:01 +02:00
1aa99b1549
Start building against Spring Data 2021.0.2 snapshots
...
See gh-26970
2021-06-21 13:26:00 +02:00
a487bd6423
Start building against Spring HATEOAS 1.3.2 snapshots
...
See gh-26969
2021-06-21 13:26:00 +02:00
580b1b81ab
Fix HTTP/2 over TLS with Jetty 10
...
Fixes gh-26988
2021-06-21 12:06:10 +01:00
1374491305
Upgrade to SLF4J 1.7.31
...
Closes gh-26986
2021-06-21 08:46:27 +02:00
799f6b0bdd
Upgrade to Postgresql 42.2.22
...
Closes gh-26985
2021-06-21 08:46:26 +02:00
c9a787c7ac
Upgrade to Jetty EL 8.5.68
...
Closes gh-26984
2021-06-21 08:46:25 +02:00
ce24270271
Upgrade to Dropwizard Metrics 4.1.23
...
Closes gh-26983
2021-06-21 08:46:24 +02:00
cc6c53f040
Start building against Spring Integration 5.4.8 snapshots
...
See gh-26967
2021-06-18 18:22:42 +02:00
9477231c51
Start building against Spring AMQP 2.3.9 snapshots
...
See gh-26966
2021-06-18 18:21:36 +02:00
fa37fb0a69
Start building against Spring Security 5.4.7 snapshots
...
See gh-26965
2021-06-18 18:21:08 +02:00
2f30449d11
Start building against Spring Session 2020.0.5 snapshots
...
See gh-26964
2021-06-18 18:20:41 +02:00
b462feaa58
Start building against Spring Data 2020.0.10 snapshots
...
See gh-26963
2021-06-18 18:20:02 +02:00
22c4c6ea80
Start building against Reactor 2020.0.8 snapshots
...
See gh-26962
2021-06-18 18:19:01 +02:00
12a6e4c231
Add missing space for asciidoc ordered list
...
See gh-26955
2021-06-18 08:27:45 +02:00
5d20edc666
Allow BFPP to modify database initialization ordering
...
Fixes gh-26899
2021-06-17 18:08:39 +01:00
a2772e288a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26947
2021-06-17 17:27:56 +01:00
cd808d2f18
Only get Kotlin plugin's version once we know we need it
...
Fixes gh-26946
2021-06-17 17:27:03 +01:00
566a642ce7
Merge branch '2.4.x' into 2.5.x
...
See gh-26935
2021-06-17 11:54:54 +01:00
204dd29c51
Fix test on Windows
...
See gh-26821
2021-06-17 11:54:24 +01:00
7ee3b287e1
Catch isEmbedded failure and treat database as not embedded
...
Fixes gh-26926
2021-06-17 11:42:26 +01:00
7cd2d6474c
Only check database's type when there are scripts to apply
...
Fixes gh-26925
2021-06-17 09:55:33 +01:00
5c65b1bcde
Fix asciidoctor anchor references
...
See gh-26939
2021-06-16 23:42:29 -07:00
c3b873c11d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26939
2021-06-16 22:43:13 -07:00
b5c92d5174
Allow indirect standard profile-specific imports
...
Effectively revert commit d1b256a169
2021-06-16 22:30:29 -07:00
79f47b150a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26935
2021-06-16 15:59:38 -05:00
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
bc7004d9c6
Fix WebSocket support with Jetty 10.0.x
...
Fixes gh-26847
2021-06-16 12:38:33 +01:00
d635e1e779
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26923
2021-06-16 08:28:05 +01:00
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
b75c79cc7c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26919
2021-06-15 17:30:31 -07:00
5ca687c9a6
Polish 'Make livereload websocket headers case insensitive'
...
See gh-26813
Closes gh-26813
2021-06-15 17:29:45 -07:00
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
2c2ab69315
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26917
2021-06-15 22:20:52 +01:00
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
44187bc6bf
Merge branch '2.4.x' into 2.5.x
...
See gh-26901
2021-06-15 20:01:01 +01:00
7ba575d392
Prevent RestarterTests.testRestart from triggering unwanted restarts
...
See gh-26900
2021-06-15 19:59:37 +01:00
96029dbd8a
Polish "Add Azure info to the cloud deployment docs"
...
See gh-26910
2021-06-15 08:35:56 +02:00
8321faaf16
Add Azure info to the cloud deployment docs
...
See gh-26910
2021-06-15 08:34:29 +02:00
eeefaf4314
Fix Javadoc deprecated since
...
See gh-26907
2021-06-15 08:23:13 +02:00
6a51c272b9
Test our Gradle plugin against Gradle 7.1
...
Closes gh-26904
2021-06-14 21:01:06 +01:00
017ba504d7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26901
2021-06-14 19:16:10 +01:00
32effdba0a
Try to stabilize RestarterTests.testRestart
...
Closes gh-26900
2021-06-14 19:15:09 +01:00
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
9e2339b5d0
Merge branch '2.4.x' into 2.5.x
2021-06-14 13:36:29 +01:00
16bfa669e1
Polish authors separators
2021-06-14 13:35:30 +01:00
5f26fd9ccb
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26891
2021-06-14 13:28:54 +01:00
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
5de5390ef9
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26889
2021-06-14 11:05:53 +01:00
c89430e174
Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
...
Closes gh-26888
2021-06-14 11:04:23 +01:00
3858c6299d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26886
2021-06-14 10:52:53 +01:00
7a14a53250
Try to stabilize TunnelClientTests.addListener()
...
Closes gh-26885
2021-06-14 10:52:12 +01:00
866f1e34c1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26873
2021-06-11 19:53:05 +01:00
37d395bad2
Try to stabilize flaky MetricsWebClientFilterFunction test
...
Closes gh-26855
2021-06-11 19:48:34 +01:00
0ab7144bf1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26870
2021-06-11 15:55:31 +01:00
608c4509f8
Try to stabilise SocketTargetServerConnectionTests
...
Closes gh-26857
2021-06-11 15:55:01 +01:00
00b9e7f498
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26868
2021-06-11 15:49:57 +01:00
186658cc12
Attempt to stabilize stopTriggersTunnelClose
...
Closes gh-26856
2021-06-11 15:48:50 +01:00
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
39aa27e13c
Make DB init back off without DatabasePopulator
...
Fixes gh-26850
2021-06-10 11:27:25 +01:00
2835085ffb
Polish
2021-06-10 00:21:38 -07:00
17671980dc
Merge branch '2.4.x'
2021-06-10 00:15:48 -07:00
7c4f178c17
Merge branch '2.3.x' into 2.4.x
2021-06-10 00:15:28 -07:00
3b48526732
Polish
2021-06-10 00:12:34 -07:00
18eb88b281
Upgrade to Git Commit ID Plugin 4.0.5
...
Closes gh-26845
2021-06-10 08:38:38 +02:00
f79f2b1594
Upgrade to Spring AMQP 2.3.8
...
Closes gh-26764
2021-06-10 07:58:19 +02:00
ab90a948be
Polish "Fix Optaplanner starter url"
...
See gh-26816
2021-06-10 07:53:07 +02:00
736b0678e5
Fix Optaplanner starter url
...
See gh-26816
2021-06-10 07:52:35 +02:00
a7c538faa0
Upgrade to RSocket 1.1.1
...
Closes gh-26839
2021-06-10 07:46:17 +02:00
2201315556
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26838
2021-06-10 07:46:17 +02:00
5cb1bd8245
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26837
2021-06-10 07:46:17 +02:00
2e2d1fe8d3
Merge branch '2.4.x' into main
2021-06-09 14:46:36 -07:00
e3042b38f5
Merge branch '2.3.x' into 2.4.x
2021-06-09 14:45:23 -07:00
63806d5bac
Remove duplicate copyright notice from docs
2021-06-09 14:44:44 -07:00
d79b3597bb
Upgrade to Spring AMQP 2.3.8
...
Closes gh-26762
2021-06-09 21:39:24 +01:00
d4200a7c56
Upgrade to Spring Integration 5.3.8.RELEASE
...
Closes gh-26772
2021-06-09 21:20:14 +01:00
03e1b255ea
Upgrade to Spring AMQP 2.2.18.RELEASE
...
Closes gh-26770
2021-06-09 21:18:37 +01:00
9fb7cf49e4
Upgrade to Spring Kafka 2.7.2
...
Closes gh-26765
2021-06-09 19:43:37 +01:00
4a11c6a135
Upgrade to Spring Kafka 2.6.9
...
Closes gh-26763
2021-06-09 19:29:23 +01:00
53068a2489
Upgrade to Spring Kafka 2.5.14.RELEASE
...
Closes gh-26771
2021-06-09 19:15:08 +01:00
46d7999b1d
Lower spring.sql.init.enabled's deprecation level to warning
...
See gh-26682
2021-06-09 19:11:20 +01:00
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
6a7a11ba59
Upgrade to RSocket 1.1.1
...
Closes gh-26836
2021-06-09 15:24:13 +02:00
66ae421f74
Upgrade to Neo4j Java Driver 4.1.3
...
Closes gh-26835
2021-06-09 15:24:12 +02:00
f9a0b0308d
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26834
2021-06-09 15:24:11 +02:00
6cdbed7dc3
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26833
2021-06-09 15:24:09 +02:00
872ec0bf00
Upgrade to RSocket 1.0.5
...
Closes gh-26832
2021-06-09 15:00:55 +02:00
f73e7bcc0c
Upgrade to Neo4j OGM 3.2.24
...
Closes gh-26831
2021-06-09 15:00:54 +02:00
1ef0068b38
Upgrade to Jetty 9.4.42.v20210604
...
Closes gh-26830
2021-06-09 15:00:53 +02:00
0563955324
Upgrade to Jetty Reactive HTTPClient 1.1.9
...
Closes gh-26829
2021-06-09 15:00:51 +02:00
8590eccac4
Polish
...
See gh-26682
2021-06-09 14:47:54 +02:00
d23b07a166
Upgrade to Spring Framework 5.3.8
...
Closes gh-26761
2021-06-09 12:21:45 +02:00
e9592229fc
Upgrade to Spring Framework 5.3.8
...
Closes gh-26760
2021-06-09 12:01:55 +02:00
03f8a46c80
Test our Gradle plugin against 7.1-rc-2
...
Closes gh-26825
2021-06-09 09:41:25 +01:00
c5728c9560
Merge branch '2.4.x'
...
Closes gh-26827
2021-06-09 09:13:21 +01:00
303edac6bb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26826
2021-06-09 09:13:06 +01:00
d1e1796f76
Consider overridden getRootUri() when getting root URI
...
Fixes gh-26812
2021-06-09 09:12:37 +01:00
850088de32
Merge branch '2.4.x'
...
Closes gh-26823
2021-06-08 18:17:33 -07:00
d5264664e6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26822
2021-06-08 18:17:18 -07:00
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
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
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
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
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
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
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
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
fba5ffc626
Fix FilePermissionsTests on Windows
...
See gh-26658
2021-06-08 15:58:03 -05:00
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
c52143727a
Reinstate mode for controlling DB initialization
...
Closes gh-26682
2021-06-08 15:13:55 +01:00
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
faeda6f917
Polish
2021-06-08 10:32:50 +02:00
4c71e8124d
Upgrade to Undertow 2.2.8.Final
...
Closes gh-26809
2021-06-08 08:24:55 +02:00
11d31edf0a
Upgrade to Neo4j Java Driver 4.2.6
...
Closes gh-26808
2021-06-08 08:24:54 +02:00
88b9b88cd9
Upgrade to jOOQ 3.14.11
...
Closes gh-26807
2021-06-08 08:24:53 +02:00
b755eacd86
Upgrade to Johnzon 1.2.13
...
Closes gh-26806
2021-06-08 08:24:51 +02:00
3d5caf0863
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26805
2021-06-08 08:24:50 +02:00
a74fb0c2f0
Upgrade to Infinispan 12.1.4.Final
...
Closes gh-26804
2021-06-08 08:24:50 +02:00
b4d0c3df6d
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26803
2021-06-08 08:24:49 +02:00
7ea263548c
Upgrade to Gson 2.8.7
...
Closes gh-26802
2021-06-08 08:24:48 +02:00
e2a877ca07
Upgrade to Ehcache3 3.9.4
...
Closes gh-26801
2021-06-08 08:24:47 +02:00
5a18553b50
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26800
2021-06-08 08:24:45 +02:00
b9d29130fb
Upgrade to Couchbase Client 3.1.6
...
Closes gh-26799
2021-06-08 08:24:44 +02:00
cd8a9d3705
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26798
2021-06-08 08:24:43 +02:00
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
be23a29651
Polish
2021-06-07 20:44:23 -07:00
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
bac89a3919
Upgrade to Undertow 2.2.8.Final
...
Closes gh-26791
2021-06-07 07:57:54 +02:00
d6f22f0802
Upgrade to jOOQ 3.14.11
...
Closes gh-26790
2021-06-07 07:57:53 +02:00
99169af57c
Upgrade to Johnzon 1.2.13
...
Closes gh-26789
2021-06-07 07:57:52 +02:00
fe249dd772
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26788
2021-06-07 07:57:51 +02:00
5be4a9ab50
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26787
2021-06-07 07:57:50 +02:00
e496d2e321
Upgrade to Gson 2.8.7
...
Closes gh-26786
2021-06-07 07:57:49 +02:00
16ff9318b5
Upgrade to Ehcache3 3.9.4
...
Closes gh-26785
2021-06-07 07:57:48 +02:00
90f96e2d48
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26784
2021-06-07 07:57:47 +02:00
cfaab0904b
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26783
2021-06-07 07:57:46 +02:00
abd926788f
Merge branch '2.4.x'
...
Closes gh-26782
2021-06-06 21:53:10 -07:00
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
1e680241ed
Upgrade to Johnzon 1.2.13
...
Closes gh-26781
2021-06-06 20:25:54 +02:00
3a0794da4b
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26780
2021-06-06 20:25:52 +02:00
84a4693dcf
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26779
2021-06-06 20:25:51 +02:00
790a8c1f47
Upgrade to Gson 2.8.7
...
Closes gh-26778
2021-06-06 20:25:50 +02:00
7ccbe3c5f8
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26777
2021-06-06 20:25:48 +02:00
f3049e8e94
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26776
2021-06-06 20:25:47 +02:00
5391f028a7
Start building against Spring Kafka 2.7.2 snapshots
...
See gh-26765
2021-06-06 20:23:37 +02:00
caacee5f1c
Start building against Spring AMQP 2.3.8
...
See gh-26764
2021-06-06 20:23:11 +02:00
c435f6337c
Start building against Spring Framework 5.3.8 snapshots
...
See gh-26761
2021-06-06 20:22:45 +02:00
39f259554b
Start building against Spring Integration 5.3.8 snapshots
...
See gh-26772
2021-06-05 18:24:22 +02:00
37625854b6
Start building against Spring Kafka 2.5.14 snapshots
...
See gh-26771
2021-06-05 18:23:57 +02:00
323d1e224d
Start building against Spring AMQP 2.2.18 snapshots
...
See gh-26770
2021-06-05 18:23:27 +02:00
de06bbb4dc
Start building against Spring Kafka 2.6.9 snapshots
...
See gh-26763
2021-06-04 17:50:30 +02:00
4c31ccb576
Start building against Spring AMQP 2.3.8 snapshots
...
See gh-26762
2021-06-04 17:50:30 +02:00
d2fe417bbb
Start building against Spring Framework 5.3.8 snapshots
...
See gh-26760
2021-06-04 17:50:30 +02:00
5ac5038176
Merge branch '2.4.x'
2021-06-04 17:49:52 +02:00
aea8597114
Merge branch '2.3.x' into 2.4.x
2021-06-04 17:49:40 +02:00
6490edc16d
Polish
2021-06-04 17:46:42 +02:00
aff1366731
Polish "Fix typo in 'Reacting to the Maven plugin' title"
...
See gh-26751
2021-06-04 09:51:48 +02:00
9eea502c3e
Fix typo in 'Reacting to the Maven plugin' title
...
See gh-26751
2021-06-04 09:46:47 +02:00
e73062aefa
Merge branch '2.4.x'
...
Closes gh-26755
2021-06-03 22:24:17 -07:00
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
3c7a0d3bf2
Merge branch '2.4.x'
...
Closes gh-26754
2021-06-03 22:23:27 -07:00
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
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
Andy Wilkinson
Phillip Webb
Stephane Nicoll
dreis2211
fengyuanwei
Madhura Bhave
Brian Clozel
Yanming Zhou
Sviatoslav Hryb
Scott Frederick
Francis Lavoie
Andy Clement
izeye
Geoffrey De Smet
Abel Salgado Romero