5767e1fda1
Start building against Reactor 2020.0.16 snapshots
...
See gh-29707
2022-02-11 09:25:38 +01:00
fc23310144
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29734
2022-02-10 17:13:56 +00:00
d14450dc88
Merge branch '2.7.x'
2022-02-10 17:13:39 +00:00
fc5ede7b94
Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
...
See gh-29572
2022-02-10 17:11:04 +00:00
d6ebce4ccf
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29733
2022-02-10 17:02:39 +00:00
6901f6dab2
Test our Gradle plugin against Gradle 7.4
...
Closes gh-29673
2022-02-10 16:57:13 +00:00
131ea706c7
Auto-configure Spring rather than Nimbus opaque token introspectors
...
See gh-29572
2022-02-10 16:50:06 +00:00
52ed7f74a0
Merge branch '2.7.x'
2022-02-10 16:01:18 +00:00
4f724f14d3
Polish "Override available() in RandomAccessDataFile's InputStream"
...
See gh-29295
2022-02-10 15:25:01 +00:00
49bf620f4b
Override available() in RandomAccessDataFile's InputStream
...
See gh-29295
2022-02-10 15:23:19 +00:00
4c3289395a
Merge branch '2.7.x'
2022-02-10 15:05:51 +00:00
c761dc517b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29732
2022-02-10 15:05:15 +00:00
197ba9ebc9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29731
2022-02-10 15:04:58 +00:00
64ee54423a
Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
...
See gh-29333
2022-02-10 15:01:57 +00:00
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
44beceffaf
Merge branch '2.7.x'
2022-02-10 13:39:22 +01:00
96ce8d842e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29729
2022-02-10 13:38:50 +01:00
44ff29c4d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29728
2022-02-10 13:28:15 +01:00
096ba72a39
Add documentation for WebMvc.fn
...
See gh-29683
2022-02-10 13:14:34 +01:00
067a8dd3ec
Raise the minimum supported version of Gradle to 7.4
...
Closes gh-29674
2022-02-09 15:02:17 +00:00
819f40f81e
Merge branch '2.7.x'
2022-02-09 13:39:28 +00:00
e4b074f07b
Merge branch '2.6.x' into 2.7.x
2022-02-09 13:37:50 +00:00
f672a20f90
Polish appendix cross-references
...
See gh-29689
2022-02-09 13:24:05 +00:00
7c99fbc785
Merge branch '2.7.x'
2022-02-09 14:10:56 +01:00
94d095ce1a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29692
2022-02-09 14:10:41 +01:00
079ea41d6d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29691
2022-02-09 14:09:33 +01:00
262db65a38
Ignore invalid stream types when reading log update events
...
See gh-29675
2022-02-09 14:03:02 +01:00
3b5e7ee0a8
Merge branch '2.7.x'
2022-02-09 12:19:21 +00:00
7e8d499333
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29690
2022-02-09 12:18:57 +00:00
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
2022-02-09 12:18:35 +00:00
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
01cc07978b
Merge branch '2.7.x'
2022-02-09 11:35:13 +00:00
665e1f665e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29688
2022-02-09 11:35:03 +00:00
b46eba16e6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29687
2022-02-09 11:34:51 +00:00
48fe1513fe
Test documented build script snippets when they change
...
Closes gh-29684
2022-02-09 11:33:40 +00:00
41d49717af
Merge branch '2.7.x'
2022-02-09 11:32:54 +00:00
1e16c2f229
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29686
2022-02-09 11:32:43 +00:00
c0664efa86
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29685
2022-02-09 11:32:32 +00:00
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
96118c88db
Merge branch '2.7.x'
2022-02-08 19:23:53 +00:00
41863d4b80
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29680
2022-02-08 19:21:59 +00:00
358cdb33f7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29679
2022-02-08 19:21:48 +00:00
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
ce6b12a024
Merge branch '2.7.x'
2022-02-05 10:16:48 -08:00
26dd6b826c
Merge branch '2.6.x' into 2.7.x
2022-02-05 10:16:19 -08:00
b3a82c9de6
Merge branch '2.5.x' into 2.6.x
2022-02-05 10:16:03 -08:00
52f1799c20
Polish formatting
2022-02-05 10:15:43 -08:00
3b4832445b
Merge branch '2.7.x'
2022-02-05 14:02:00 +01:00
098a57affb
Upgrade to R2DBC Borca-RELEASE
...
See gh-28524
2022-02-05 13:37:20 +01:00
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
5f7657508f
Start building against Spring Batch 4.3.5 snapshots
...
See gh-29652
2022-02-05 13:36:38 +01:00
977a0a8356
Merge branch '2.7.x'
2022-02-05 10:07:41 +00:00
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
4f8558f568
Upgrade Kotlin docs samples to Jakarta EE 9
...
See gh-29499
2022-02-04 21:51:21 -08:00
a3615f4f77
Merge branch '2.7.x'
2022-02-04 20:04:28 -08:00
d212243eef
Polish 'Add Kotlin alternatives to Java documentation samples'
...
See gh-29499
2022-02-04 19:57:21 -08:00
197afff1d6
Add Kotlin alternatives to Java documentation samples
...
See gh-29499
2022-02-04 19:56:13 -08:00
a301d8ed5d
Merge branch '2.7.x'
2022-02-04 19:50:54 -08:00
0e906dc6e2
Use convention based code imports
...
Closes gh-29647
2022-02-04 19:46:44 -08:00
a6b7ae2110
Merge branch '2.7.x'
2022-02-04 19:45:01 -08:00
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
2022-02-04 19:44:31 -08:00
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
50047e6d8c
Merge branch '2.7.x'
2022-02-04 16:10:50 -08:00
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
b9e037b88f
Polish
2022-02-04 16:09:22 -08:00
e2d6516726
Remove dependency management for spring-boot-starter-jta-atomikos
...
Closes gh-29653
2022-02-04 13:06:27 +00:00
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +01:00
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
8885964a56
Merge branch '2.7.x'
2022-02-04 09:54:11 +01:00
37c1f47902
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29650
2022-02-04 09:53:42 +01:00
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
d1225392d3
Remove dependency management for spring-boot-starter-activemq
...
Closes gh-29645
2022-02-04 09:08:03 +01:00
0083b767e6
Merge branch '2.7.x'
2022-02-03 22:53:15 -08:00
4919683354
Use consistent packages for doc samples
...
Closes gh-29646
2022-02-03 22:50:47 -08:00
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
a05903b9d1
Polish GraphQL auto-configuration
2022-02-02 12:57:17 -08:00
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
5975cdc5ed
Polish formatting
2022-02-02 10:35:10 -08:00
f88b502f7e
Remove support for image banners
...
Closes gh-28883
2022-02-02 14:40:24 +00:00
e749f30642
Merge branch '2.7.x'
2022-02-01 16:35:39 +01:00
9028ab33f2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29617
2022-02-01 16:35:28 +01:00
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
5fe6176966
Polish "Add a note on early init with @ConditionalOnExpression"
...
See gh-29276
2022-02-01 16:32:27 +01:00
fce3cd1684
Add a note on early init with @ConditionalOnExpression
...
See gh-29276
2022-02-01 16:24:13 +01:00
b403877cc1
Merge branch '2.7.x'
2022-02-01 13:52:17 +01:00
067af65152
Fix formatting violations
2022-02-01 13:52:06 +01:00
b1c815830f
Upgrade to RxJava 3.x and remove older generations
...
As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.
Closes gh-28212
2022-02-01 11:38:50 +01:00
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
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
3a65d7b01e
Merge branch '2.7.x'
2022-01-31 16:45:11 +01:00
19e671dd7b
Merge branch '2.6.x' into 2.7.x
2022-01-31 16:45:04 +01:00
787a2f3d9b
Merge branch '2.5.x' into 2.6.x
2022-01-31 16:44:39 +01:00
ab0b29cb53
Polish "Make classloader customization easier to discover"
...
See gh-29438
2022-01-31 16:38:38 +01:00
96f48db2ab
Make classloader customization easier to discover
...
See gh-29438
2022-01-31 16:28:28 +01:00
e691cfdf3d
Merge branch '2.7.x'
2022-01-31 16:24:52 +01:00
7bebfd06b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29601
2022-01-31 16:24:40 +01:00
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
2022-01-31 16:24:29 +01:00
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
2022-01-31 16:22:28 +01:00
940d969c7c
Use a timeout when joining threads in HttpTunnelServerTests
...
See gh-29522
2022-01-31 16:01:04 +01:00
42df01f193
Merge branch '2.7.x'
2022-01-29 15:44:55 +01:00
0c0ec64ed4
Polish "Use existing constant rather than "spring.beaninfo.ignore""
...
See gh-29592
2022-01-29 15:39:43 +01:00
1a558292a8
Use existing constant rather than "spring.beaninfo.ignore"
...
See gh-29592
2022-01-29 15:39:28 +01:00
68bd6f91cf
Merge branch '2.7.x'
2022-01-29 15:34:16 +01:00
a94b176c39
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29595
2022-01-29 15:34:08 +01:00
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
2022-01-29 15:33:25 +01:00
8125b46ed5
Merge branch '2.7.x' into main
2022-01-27 12:09:51 -08:00
81bbd295e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29584
2022-01-27 12:04:26 -08:00
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
c820ad01a1
Fix checkstyle error
2022-01-25 14:52:30 -08:00
e19fa140e7
Fix merge conflict mistake
2022-01-25 13:34:10 -08:00
8ab87ace24
Merge branch '2.7.x'
2022-01-25 13:18:33 -08:00
bb024211f6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29565
2022-01-25 13:17:22 -08:00
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
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
03da915f56
Merge branch '2.7.x'
2022-01-25 09:22:49 +01:00
24c5f4b7ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29557
2022-01-25 09:22:19 +01:00
1204c1aa32
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29556
2022-01-25 09:21:49 +01:00
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
4494d3a805
Merge branch '2.7.x' into main
2022-01-24 16:21:11 -06:00
698eb94913
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29554
2022-01-24 16:20:33 -06:00
909ef6d635
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29553
2022-01-24 16:19:43 -06:00
000cbfa2d9
Set file permissions on all created test files
...
Closes gh-29551
2022-01-24 16:19:20 -06:00
191333773f
Restore support for REST Assured
...
Closes gh-29543
2022-01-24 13:46:48 +00:00
1d7b1e1a46
Start building against snapshots for Spring REST Docs 3.0.0-M2
...
See gh-29544
2022-01-24 13:46:01 +00:00
5c78c2288c
Merge branch '2.7.x'
2022-01-24 09:42:06 +01:00
f9029a3584
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29540
2022-01-24 09:41:56 +01:00
e36a56f014
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29539
2022-01-24 09:41:35 +01:00
48817587e6
Rename Boxfuse to CloudCaptain
...
See gh-29523
2022-01-24 09:35:44 +01:00
83e2ffe45c
Merge branch '2.7.x'
2022-01-24 09:30:05 +01:00
ba8c76ba08
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29538
2022-01-24 09:29:48 +01:00
267cd45235
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29537
2022-01-24 09:29:31 +01:00
d821f86b8e
Upgrade reference of gradle-git-properties to 2.3.2
...
See gh-29535
2022-01-24 09:28:53 +01:00
3c5c5d9575
Merge branch '2.7.x'
2022-01-21 14:28:25 +00:00
5b95c89303
Upgrade to Solr 8.11.1
...
Closes gh-29517
2022-01-21 14:16:38 +00:00
f025ab629a
Switch to new coordinates for Git Commit ID Maven Plugin
...
Closes gh-29515
2022-01-20 17:37:03 +00:00
7f2c346f9d
Upgrade to Yasson 2.0.4
...
Closes gh-29514
2022-01-20 17:37:02 +00:00
c927105743
Upgrade to jOOQ 3.16.2
...
Closes gh-29512
2022-01-20 17:37:02 +00:00
0623d1e4d4
Upgrade to HSQLDB 2.6.1
...
Closes gh-29511
2022-01-20 17:37:01 +00:00
35650d7b59
Upgrade to HikariCP 5.0.1
...
Closes gh-29510
2022-01-20 17:37:01 +00:00
Stephane Nicoll
Andy Wilkinson
Lukas Kuster
Gnaily
Guirong Hu
Moritz Halbritter
Moritz Halbritter
Mike Partridge
Phillip Webb
Pavel Semyonov
Henning Poettker
Mihail Cornescu
Brian Clozel
Yanming Zhou
Andreas Ahlenstorf
Leo Li
minkyu-jo
izeye
Madhura Bhave
Lachlan Roberts
Scott Frederick
Axel Fontaine
Janne Valkealahti