Stephane Nicoll
9006fdec50
Start building against Spring Batch 4.3.5 snapshots
...
See gh-29724
2022-02-11 10:10:12 +01:00
Stephane Nicoll
56ed5fb68c
Start building against Spring Security 5.6.2
...
See gh-29723
2022-02-11 10:10:12 +01:00
Stephane Nicoll
1ce07cfe2b
Start building against Spring Data 2021.1.2 snapshots
...
See gh-29721
2022-02-11 09:35:25 +01:00
Stephane Nicoll
2b87d8364d
Start building against Spring LDAP 2.3.6 snapshots
...
See gh-29720
2022-02-11 09:35:01 +01:00
Stephane Nicoll
f6cf198767
Start building against Spring Framework 5.3.16 snapshots
...
See gh-29719
2022-02-11 09:34:35 +01:00
Stephane Nicoll
cebba5a6d0
Start building against Micrometer 1.8.3 snapshots
...
See gh-29718
2022-02-11 09:34:14 +01:00
Stephane Nicoll
0297437fc5
Start building against Reactor 2020.0.16 snapshots
...
See gh-29717
2022-02-11 09:33:13 +01:00
Stephane Nicoll
e242dc5ce8
Start building against Spring Session 2021.0.5 snapshots
...
See gh-29715
2022-02-11 09:29:06 +01:00
Stephane Nicoll
7afd33589f
Start building against Spring Batch 4.3.5 snapshots
...
See gh-29714
2022-02-11 09:28:41 +01:00
Stephane Nicoll
3c3ebafa31
Start building against Spring Security 5.5.5 snapshots
...
See gh-29713
2022-02-11 09:28:17 +01:00
Stephane Nicoll
b892bb4415
Start building against Spring Kafka 2.7.11 snapshots
...
See gh-29712
2022-02-11 09:27:52 +01:00
Stephane Nicoll
cd94b27f2d
Start building against Spring Data 2021.0.9 snapshots
...
See gh-29711
2022-02-11 09:27:28 +01:00
Stephane Nicoll
29d502da5b
Start building against Spring LDAP 2.3.6 snapshots
...
See gh-29710
2022-02-11 09:27:05 +01:00
Stephane Nicoll
d15149c1a3
Start building against Spring Framework 5.3.16 snapshots
...
See gh-29709
2022-02-11 09:26:35 +01:00
Stephane Nicoll
0f630debb3
Start building against Micrometer 1.7.9 snapshots
...
See gh-29708
2022-02-11 09:26:11 +01:00
Stephane Nicoll
5767e1fda1
Start building against Reactor 2020.0.16 snapshots
...
See gh-29707
2022-02-11 09:25:38 +01:00
Andy Wilkinson
fc23310144
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29734
2022-02-10 17:13:56 +00:00
Andy Wilkinson
fc5ede7b94
Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
...
See gh-29572
2022-02-10 17:11:04 +00:00
Andy Wilkinson
d6ebce4ccf
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29733
2022-02-10 17:02:39 +00:00
Andy Wilkinson
6901f6dab2
Test our Gradle plugin against Gradle 7.4
...
Closes gh-29673
2022-02-10 16:57:13 +00:00
Lukas Kuster
131ea706c7
Auto-configure Spring rather than Nimbus opaque token introspectors
...
See gh-29572
2022-02-10 16:50:06 +00:00
Andy Wilkinson
4f724f14d3
Polish "Override available() in RandomAccessDataFile's InputStream"
...
See gh-29295
2022-02-10 15:25:01 +00:00
Gnaily
49bf620f4b
Override available() in RandomAccessDataFile's InputStream
...
See gh-29295
2022-02-10 15:23:19 +00:00
Andy Wilkinson
c761dc517b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29732
2022-02-10 15:05:15 +00:00
Andy Wilkinson
197ba9ebc9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29731
2022-02-10 15:04:58 +00:00
Andy Wilkinson
64ee54423a
Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
...
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu
cec69feb95
Configure ForwardedHeaderFilter with Tomcat's use relative redirects
...
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.
This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.
See gh-29333
2022-02-10 15:01:56 +00:00
Moritz Halbritter
96ce8d842e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29729
2022-02-10 13:38:50 +01:00
Moritz Halbritter
44ff29c4d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29728
2022-02-10 13:28:15 +01:00
Moritz Halbritter
096ba72a39
Add documentation for WebMvc.fn
...
See gh-29683
2022-02-10 13:14:34 +01:00
Andy Wilkinson
e4b074f07b
Merge branch '2.6.x' into 2.7.x
2022-02-09 13:37:50 +00:00
Andy Wilkinson
f672a20f90
Polish appendix cross-references
...
See gh-29689
2022-02-09 13:24:05 +00:00
Moritz Halbritter
94d095ce1a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29692
2022-02-09 14:10:41 +01:00
Moritz Halbritter
079ea41d6d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29691
2022-02-09 14:09:33 +01:00
Moritz Halbritter
262db65a38
Ignore invalid stream types when reading log update events
...
See gh-29675
2022-02-09 14:03:02 +01:00
Andy Wilkinson
7e8d499333
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29690
2022-02-09 12:18:57 +00:00
Andy Wilkinson
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter
52d9ba58d8
Move appendix subsections under appendix section
...
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.
See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson
665e1f665e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29688
2022-02-09 11:35:03 +00:00
Andy Wilkinson
b46eba16e6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29687
2022-02-09 11:34:51 +00:00
Andy Wilkinson
48fe1513fe
Test documented build script snippets when they change
...
Closes gh-29684
2022-02-09 11:33:40 +00:00
Andy Wilkinson
1e16c2f229
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29686
2022-02-09 11:32:43 +00:00
Andy Wilkinson
c0664efa86
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29685
2022-02-09 11:32:32 +00:00
Mike Partridge
2e9dcdd96d
Replace use of classifier with archiveClassifier
...
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.
See gh-29611
2022-02-09 11:31:22 +00:00
Andy Wilkinson
41863d4b80
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29680
2022-02-08 19:21:59 +00:00
Andy Wilkinson
358cdb33f7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29679
2022-02-08 19:21:48 +00:00
Andy Wilkinson
43ca2d2cb0
Access classpath lazily to allow later changes to be picked up
...
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.
This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.
Closes gh-29672
2022-02-08 19:21:37 +00:00
Phillip Webb
26dd6b826c
Merge branch '2.6.x' into 2.7.x
2022-02-05 10:16:19 -08:00
Phillip Webb
b3a82c9de6
Merge branch '2.5.x' into 2.6.x
2022-02-05 10:16:03 -08:00
Phillip Webb
52f1799c20
Polish formatting
2022-02-05 10:15:43 -08:00
Stephane Nicoll
098a57affb
Upgrade to R2DBC Borca-RELEASE
...
See gh-28524
2022-02-05 13:37:20 +01:00
Stephane Nicoll
8c8c9c5f28
Upgrade to H2 2.1.210
...
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.
Closes gh-29651
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
Stephane Nicoll
5f7657508f
Start building against Spring Batch 4.3.5 snapshots
...
See gh-29652
2022-02-05 13:36:38 +01:00
Andy Wilkinson
2fec7b8562
Only use Kotlin 1.6 API and language versions in docs project
...
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.
Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb
d212243eef
Polish 'Add Kotlin alternatives to Java documentation samples'
...
See gh-29499
2022-02-04 19:57:21 -08:00
Pavel Semyonov
197afff1d6
Add Kotlin alternatives to Java documentation samples
...
See gh-29499
2022-02-04 19:56:13 -08:00
Phillip Webb
0e906dc6e2
Use convention based code imports
...
Closes gh-29647
2022-02-04 19:46:44 -08:00
Phillip Webb
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
2022-02-04 19:44:31 -08:00
Phillip Webb
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
Phillip Webb
b9e037b88f
Polish
2022-02-04 16:09:22 -08:00
Henning Poettker
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
Stephane Nicoll
37c1f47902
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29650
2022-02-04 09:53:42 +01:00
Stephane Nicoll
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
Phillip Webb
4919683354
Use consistent packages for doc samples
...
Closes gh-29646
2022-02-03 22:50:47 -08:00
Phillip Webb
a05903b9d1
Polish GraphQL auto-configuration
2022-02-02 12:57:17 -08:00
Phillip Webb
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
Phillip Webb
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
Phillip Webb
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
Phillip Webb
5975cdc5ed
Polish formatting
2022-02-02 10:35:10 -08:00
Stephane Nicoll
9028ab33f2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29617
2022-02-01 16:35:28 +01:00
Stephane Nicoll
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll
5fe6176966
Polish "Add a note on early init with @ConditionalOnExpression"
...
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu
fce3cd1684
Add a note on early init with @ConditionalOnExpression
...
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll
067af65152
Fix formatting violations
2022-02-01 13:52:06 +01:00
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
Stephane Nicoll
19e671dd7b
Merge branch '2.6.x' into 2.7.x
2022-01-31 16:45:04 +01:00
Stephane Nicoll
787a2f3d9b
Merge branch '2.5.x' into 2.6.x
2022-01-31 16:44:39 +01:00
Stephane Nicoll
ab0b29cb53
Polish "Make classloader customization easier to discover"
...
See gh-29438
2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf
96f48db2ab
Make classloader customization easier to discover
...
See gh-29438
2022-01-31 16:28:28 +01:00
Stephane Nicoll
7bebfd06b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29601
2022-01-31 16:24:40 +01:00
Stephane Nicoll
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
2022-01-31 16:24:29 +01:00
Stephane Nicoll
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
2022-01-31 16:22:28 +01:00
Leo Li
940d969c7c
Use a timeout when joining threads in HttpTunnelServerTests
...
See gh-29522
2022-01-31 16:01:04 +01:00
Stephane Nicoll
0c0ec64ed4
Polish "Use existing constant rather than "spring.beaninfo.ignore""
...
See gh-29592
2022-01-29 15:39:43 +01:00
minkyu-jo
1a558292a8
Use existing constant rather than "spring.beaninfo.ignore"
...
See gh-29592
2022-01-29 15:39:28 +01:00
Stephane Nicoll
a94b176c39
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29595
2022-01-29 15:34:08 +01:00
izeye
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
2022-01-29 15:33:25 +01:00
Madhura Bhave
81bbd295e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29584
2022-01-27 12:04:26 -08:00
Madhura Bhave
0597c6831e
Configure health on additional path only when health exposed
...
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.
This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.
Fixes gh-29532
2022-01-27 11:44:54 -08:00
Phillip Webb
bb024211f6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29565
2022-01-25 13:17:22 -08:00
Phillip Webb
df9cf6b726
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.
Fixes gh-29558
2022-01-25 13:15:59 -08:00
Andy Wilkinson
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
Brian Clozel
24c5f4b7ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29557
2022-01-25 09:22:19 +01:00
Brian Clozel
1204c1aa32
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29556
2022-01-25 09:21:49 +01:00
Lachlan Roberts
f1bbce1aac
Do not modify AliasChecks list from Jetty WebAppContext
...
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-01-25 08:58:42 +01:00
Scott Frederick
698eb94913
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29554
2022-01-24 16:20:33 -06:00
Scott Frederick
909ef6d635
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29553
2022-01-24 16:19:43 -06:00
Scott Frederick
000cbfa2d9
Set file permissions on all created test files
...
Closes gh-29551
2022-01-24 16:19:20 -06:00
Stephane Nicoll
f9029a3584
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29540
2022-01-24 09:41:56 +01:00
Stephane Nicoll
e36a56f014
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29539
2022-01-24 09:41:35 +01:00
Axel Fontaine
48817587e6
Rename Boxfuse to CloudCaptain
...
See gh-29523
2022-01-24 09:35:44 +01:00
Stephane Nicoll
ba8c76ba08
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29538
2022-01-24 09:29:48 +01:00
Stephane Nicoll
267cd45235
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29537
2022-01-24 09:29:31 +01:00
Janne Valkealahti
d821f86b8e
Upgrade reference of gradle-git-properties to 2.3.2
...
See gh-29535
2022-01-24 09:28:53 +01:00
Andy Wilkinson
5b95c89303
Upgrade to Solr 8.11.1
...
Closes gh-29517
2022-01-21 14:16:38 +00:00
Stephane Nicoll
5cbaf2ba44
Upgrade to MariaDB 2.7.5
...
Closes gh-29506
2022-01-20 16:43:12 +01:00
Stephane Nicoll
e74eba8cea
Upgrade to Hibernate 5.6.4.Final
...
Closes gh-29505
2022-01-20 16:43:11 +01:00
Stephane Nicoll
8d0263c329
Upgrade to Flyway 8.4.2
...
Closes gh-29504
2022-01-20 16:43:11 +01:00
Andy Wilkinson
2c049f2b40
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29501
2022-01-20 12:36:49 +00:00
Madhura Bhave
3460c24a16
Ignore context path when calling privilege evaluator
...
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.
This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.
Closes gh-29299
Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
2022-01-20 12:36:18 +00:00
Stephane Nicoll
c488be5adc
Upgrade to MariaDB 2.7.5
...
Closes gh-29498
2022-01-20 10:53:13 +01:00
Stephane Nicoll
5dbde1b294
Upgrade to Hibernate 5.6.4.Final
...
Closes gh-29497
2022-01-20 10:53:11 +01:00
Stephane Nicoll
6ae5bfb728
Upgrade to MariaDB 2.7.5
...
Closes gh-29496
2022-01-20 10:29:26 +01:00
Phillip Webb
5b1486cc26
Merge branch '2.5.x' into 2.6.x
2022-01-19 15:54:19 -08:00
Phillip Webb
d211b0f3b3
Disable test is Docker is not available
...
See gh-28843
2022-01-19 15:53:07 -08:00
Andy Wilkinson
1e4b786ff9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29489
2022-01-19 19:09:09 +00:00
Andy Wilkinson
6bea2172cb
Switch tests to properties that are not deprecated
...
Closes gh-29488
2022-01-19 19:08:31 +00:00
Andy Wilkinson
0829dcd572
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29486
2022-01-19 17:27:51 +00:00
Andy Wilkinson
ee9c399eba
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29485
2022-01-19 17:27:36 +00:00
Andy Wilkinson
1b3d088056
Move JdbcSessionDataSourceInitializerTests into src/test/java
...
Closes gh-29484
2022-01-19 17:26:55 +00:00
Brian Clozel
cbcc49408c
Upgrade to Spring Session 2021.2.0-M1
...
Closes gh-29226
2022-01-19 17:40:22 +01:00
Brian Clozel
1e4e4f168d
Upgrade to Spring for GraphQL 1.0.0-M5
...
Closes gh-29285
2022-01-19 16:46:12 +01:00
Andy Wilkinson
6fa4b942ee
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29481
2022-01-19 13:19:13 +00:00
Andy Wilkinson
52f612b3eb
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29480
2022-01-19 13:18:50 +00:00
Andy Wilkinson
9cb66d55d1
Refer to Maven Resolver rather than Aether
...
Closes gh-29255
2022-01-19 13:18:05 +00:00
Stephane Nicoll
f510805f00
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29479
2022-01-19 12:24:32 +01:00
Stephane Nicoll
d92939e773
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29478
2022-01-19 12:24:15 +01:00
Stephane Nicoll
4eb458f7d8
Prevent early resolution of factory beans
...
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.
Closes gh-29475
2022-01-19 11:49:56 +01:00
Stephane Nicoll
4166429fd0
Add missing dependency management for Flyway
...
Closes gh-29474
2022-01-19 09:03:32 +01:00
Stephane Nicoll
6a70daa361
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29473
2022-01-19 08:37:17 +01:00
Stephane Nicoll
92f1e119b4
Upgrade to MySQL 8.0.28
...
Closes gh-29472
2022-01-19 08:37:16 +01:00
Stephane Nicoll
23d3b0f8ea
Upgrade to Liquibase 4.7.0
...
Closes gh-29471
2022-01-19 08:37:15 +01:00
Stephane Nicoll
801e7c4c03
Upgrade to Flyway 8.4.1
...
Closes gh-29470
2022-01-19 08:37:13 +01:00
Stephane Nicoll
dad1e0b18d
Upgrade to Embedded Mongo 3.2.8
...
Closes gh-29469
2022-01-19 08:37:11 +01:00
Stephane Nicoll
124a3219e8
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29468
2022-01-19 08:17:20 +01:00
Stephane Nicoll
60971c6fdb
Upgrade to MySQL 8.0.28
...
Closes gh-29467
2022-01-19 08:17:19 +01:00
Stephane Nicoll
c2f8823e4e
Upgrade to Spring Integration 5.5.8
...
Closes gh-29286
2022-01-19 08:13:28 +01:00
Stephane Nicoll
aba3b1dc5f
Upgrade to Spring Integration 5.5.8
...
Closes gh-29320
2022-01-19 08:12:33 +01:00
Stephane Nicoll
cdd479556f
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29466
2022-01-19 08:12:08 +01:00
Stephane Nicoll
849fb8e435
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29465
2022-01-19 08:12:07 +01:00
Stephane Nicoll
3a043603e8
Upgrade to MySQL 8.0.28
...
Closes gh-29464
2022-01-19 08:12:06 +01:00
Stephane Nicoll
2782c3b077
Upgrade to Spring Integration 5.5.8
...
Closes gh-29314
2022-01-19 08:09:50 +01:00
Phillip Webb
a77411ebd8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29460
2022-01-18 16:16:18 -08:00
Phillip Webb
3b4409305a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29459
2022-01-18 16:15:20 -08:00
Phillip Webb
3d46b06e8d
Fix config data placeholder resolution active document logic
...
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.
The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.
Fixes gh-29386
2022-01-18 16:14:52 -08:00
Andy Wilkinson
654d142c95
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29455
2022-01-18 20:35:06 +00:00
Andy Wilkinson
4ee260aa8c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29454
2022-01-18 20:34:51 +00:00
Andy Wilkinson
1c6471ef60
Register AprLifecycleListener with Server not Context
...
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Stephane Nicoll
5c9e59493d
Upgrade to Spring Data 2021.2.0-M2
...
Closes gh-29223
2022-01-18 09:57:10 +01:00
rstoyanchev
68f4938367
Update GraphQL QBE auto-config
...
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.
Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson
e23aaba32b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29323
2022-01-17 13:21:19 +00:00
Andy Wilkinson
27cd1c06a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29322
2022-01-17 13:20:29 +00:00
Andy Wilkinson
75187349e8
Upgrade to Spring REST Docs 2.0.6.RELEASE
...
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll
3bbdbd9e5f
Upgrade to Spring Security 5.7.0-M1
...
Closes gh-29225
2022-01-17 08:47:25 +01:00
Stephane Nicoll
ce6cc77ea7
Upgrade to Spring Kafka 2.8.2
...
Closes gh-29224
2022-01-17 08:46:43 +01:00
Stephane Nicoll
77e9047d31
Upgrade to Spring AMQP 2.4.2
...
Closes gh-29284
2022-01-17 08:46:16 +01:00
Stephane Nicoll
a9feb923d7
Update to Spring Kafka 2.8.2
...
Closes gh-29319
2022-01-17 08:44:50 +01:00
Stephane Nicoll
200c05ff98
Upgrade to Spring AMQP 2.4.2
...
Closes gh-29318
2022-01-17 08:44:15 +01:00
Stephane Nicoll
e545441f01
Upgrade to Spring Kafka 2.7.10
...
Closes gh-29313
2022-01-17 08:41:47 +01:00
Stephane Nicoll
2f7d62eae9
Upgrade to SLF4J 1.7.33
...
Closes gh-29427
2022-01-15 17:50:04 +01:00
Stephane Nicoll
781ad288b0
Upgrade to SendGrid 4.8.2
...
Closes gh-29426
2022-01-15 17:50:04 +01:00
Stephane Nicoll
a15ff0692c
Upgrade to Rabbit AMQP Client 5.14.1
...
Closes gh-29425
2022-01-15 17:50:04 +01:00
Stephane Nicoll
6be4146907
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29424
2022-01-15 17:50:04 +01:00
Stephane Nicoll
0cb553c0da
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29423
2022-01-15 17:50:04 +01:00
Stephane Nicoll
998c7996aa
Upgrade to Netty 4.1.73.Final
...
Closes gh-29422
2022-01-15 17:50:03 +01:00
Stephane Nicoll
3830e7a3bb
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29421
2022-01-15 17:50:03 +01:00
Stephane Nicoll
5676e796d0
Upgrade to MongoDB 4.4.1
...
Closes gh-29420
2022-01-15 17:50:03 +01:00
Stephane Nicoll
db389d7cac
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29419
2022-01-15 17:50:03 +01:00
Stephane Nicoll
da3de9684a
Upgrade to Maven Compiler Plugin 3.9.0
...
Closes gh-29418
2022-01-15 17:50:03 +01:00
Stephane Nicoll
28ecf53762
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29417
2022-01-15 17:50:03 +01:00
Stephane Nicoll
b2c92457ab
Upgrade to Jedis 3.8.0
...
Closes gh-29416
2022-01-15 17:50:02 +01:00
Stephane Nicoll
2c403cb0e8
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29415
2022-01-15 17:50:02 +01:00
Stephane Nicoll
cf3935073f
Upgrade to Byte Buddy 1.12.7
...
Closes gh-29414
2022-01-15 17:50:02 +01:00
Stephane Nicoll
998a74bf97
Upgrade to Build Helper Maven Plugin 3.3.0
...
Closes gh-29413
2022-01-15 17:50:02 +01:00
Stephane Nicoll
388b12a048
Upgrade to Spring LDAP 2.4.0-M1
...
Closes gh-29222
2022-01-15 17:50:02 +01:00
Stephane Nicoll
7c85d2bc07
Upgrade to Spring HATEOAS 1.5.0-M1
...
Closes gh-29353
2022-01-15 15:07:27 +01:00
Phillip Webb
a2e473ec31
Merge branch '2.6.x' into 2.7.x
2022-01-14 22:56:43 -08:00
Phillip Webb
6afd9b665d
Merge branch '2.5.x' into 2.6.x
2022-01-14 22:56:30 -08:00
Phillip Webb
bccc9c1861
Refine ConfigurationPropertySources attach logic
...
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.
See gh-29409
2022-01-14 22:55:26 -08:00
Phillip Webb
e4e16f81ec
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29411
2022-01-14 20:33:19 -08:00
Phillip Webb
28cf6f5c59
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29410
2022-01-14 20:33:05 -08:00
Phillip Webb
79d9549805
Fix ConfigurationPropertySources attach logic
...
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.
Fixes gh-29409
2022-01-14 20:32:34 -08:00
Phillip Webb
9c481952d8
Remove deprecated convertEnvironment method
2022-01-14 17:38:23 -08:00
Phillip Webb
9764b3eba0
Change getEnvironment() to return null by default
...
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.
Closes gh-29405
2022-01-14 17:35:58 -08:00
Phillip Webb
c84d3c14fb
Allow test property sources to override command line args
...
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.
Closes gh-29404
2022-01-14 16:30:28 -08:00
Phillip Webb
9278a502c7
Merge branch '2.6.x' into 2.7.x
2022-01-14 13:57:25 -08:00
Phillip Webb
14fe9347b5
Merge branch '2.5.x' into 2.6.x
2022-01-14 13:56:47 -08:00
Phillip Webb
3f7bf7d34f
Modify SpringApplication Environment rather than setting it
...
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.
Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.
With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.
Fixes gh-29169
2022-01-14 13:47:22 -08:00
Brian Clozel
cdee953252
Polish
2022-01-14 21:07:29 +01:00
Brian Clozel
68806bfef8
Fix build after Spring for GraphQL changes
...
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson
b67cc62c37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29402
2022-01-14 15:55:54 +00:00
Andy Wilkinson
d29a5a2f43
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29401
2022-01-14 15:55:41 +00:00
Andy Wilkinson
e8cbec0836
Clarify documentation of RestTemplate customization
...
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson
ece4c8ad93
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson
d051146eb4
Use Testcontainers instead on Embedded Mongo
...
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.
Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll
1666b1c284
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29398
2022-01-14 15:54:48 +01:00
Stephane Nicoll
c2fa4ffd7e
Upgrade to SLF4J 1.7.33
...
Closes gh-29397
2022-01-14 15:49:56 +01:00
Stephane Nicoll
afcba76c3c
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29396
2022-01-14 15:49:55 +01:00
Stephane Nicoll
dac4888137
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29395
2022-01-14 15:49:54 +01:00
Stephane Nicoll
af79829cab
Upgrade to Spring Data 2021.1.1
...
Closes gh-29317
2022-01-14 15:44:45 +01:00
Stephane Nicoll
1e44e4e52e
Upgrade to Spring HATEOAS 1.4.1
...
Closes gh-29283
2022-01-14 15:44:16 +01:00
Stephane Nicoll
5883b22e01
Upgrade to SLF4J 1.7.33
...
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll
1e22504d21
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll
251f4e8a3f
Upgrade to Spring AMQP 2.3.14
...
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll
777361421c
Upgrade to Spring Data 2021.0.8
...
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll
37a44f45a0
Upgrade to Spring HATEOAS 1.3.7
...
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll
77a9d0b6f1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29381
2022-01-13 15:31:31 +01:00
Omkar Shetkar
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll
d82fbcb43b
Upgrade to Micrometer 1.9.0-M2
...
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll
7a0f7c498f
Upgrade to Spring Framework 5.3.15
...
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll
832d8845df
Upgrade to Micrometer 1.8.2
...
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll
f65d766fbe
Upgrade to Spring Framework 5.3.15
...
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll
aa0a788800
Upgrade to Micrometer 1.7.8
...
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll
5428106925
Upgrade to Spring Framework 5.3.15
...
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll
1bf13371c4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29378
2022-01-13 08:45:59 +01:00
Stephane Nicoll
8384019a41
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29377
2022-01-13 08:45:48 +01:00
Stephane Nicoll
5f03ace40f
Update copyright year of changed file
...
See gh-29112
2022-01-13 08:43:03 +01:00
izeye
74c522c745
Polish SpringBootContextLoaderTests
...
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
2022-01-12 15:43:44 -08:00
Phillip Webb
e7fe371927
Merge branch '2.5.x' into 2.6.x
2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5
Update copyright year of changed files
2022-01-12 15:42:25 -08:00
Phillip Webb
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb
91d2b1b988
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
to use a side-effect free
Environment implementation rather than converting the Environment early.
Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.
Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
9cf55808fb
Ensure run user actually exists
...
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.
Fixes gh-29370
2022-01-12 14:05:30 -08:00
Phillip Webb
ae4d9ccb2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29368
2022-01-12 13:54:39 -08:00
Phillip Webb
3ae7c45900
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29367
2022-01-12 13:54:23 -08:00
Phillip Webb
827309f36f
Upgrade to Testcontainers 1.16.2
...
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll
ee938cf822
Upgrade to Netty 4.1.73.Final
...
Closes gh-29351
2022-01-12 14:33:55 +01:00
Stephane Nicoll
d8739c463b
Upgrade to MongoDB 4.4.1
...
Closes gh-29350
2022-01-12 14:33:54 +01:00
Stephane Nicoll
e14c13c75f
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29349
2022-01-12 14:33:52 +01:00
Stephane Nicoll
8cdccb6cb3
Upgrade to Logback 1.2.10
...
Closes gh-29348
2022-01-12 14:33:51 +01:00
Stephane Nicoll
61e08e3510
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29347
2022-01-12 14:33:50 +01:00
Stephane Nicoll
b19593ee47
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29346
2022-01-12 14:33:49 +01:00
Stephane Nicoll
98118bc480
Upgrade to Jaybird 4.0.5.java8
...
Closes gh-29345
2022-01-12 14:33:47 +01:00
Stephane Nicoll
838cded308
Upgrade to Infinispan 12.1.11.Final
...
Closes gh-29344
2022-01-12 14:33:46 +01:00
Stephane Nicoll
4309b78f02
Upgrade to HttpCore5 5.1.3
...
Closes gh-29343
2022-01-12 14:33:45 +01:00
Stephane Nicoll
ca39780ff3
Upgrade to Netty 4.1.73.Final
...
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll
cb1db78c37
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29340
2022-01-12 13:51:23 +01:00