Madhura Bhave
e6b5be900a
Make ErrorPageSecurityFilter Servlet 3.1 compatible
...
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.
Fixes gh-28790
2021-11-24 09:59:27 -08:00
Madhura Bhave
f621937d3b
Skip error page security filter for non-error dispatch type
...
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.
Fixes gh-28759
2021-11-24 09:55:59 -08:00
Scott Frederick
4eed637481
Merge branch '2.5.x'
...
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson
196c92e12c
Merge branch '2.5.x'
2021-11-22 10:04:24 +00:00
Andy Wilkinson
03e283a2e6
Mention WebProperties in deprecation of ResourceProperties
...
Closes gh-28762
2021-11-22 10:03:21 +00:00
Stephane Nicoll
cdc2851bc1
Merge pull request #28767 from quaff
...
* pr/28767:
LettuceMetricsAutoConfiguration should not build ClientResources
Closes gh-28767
2021-11-22 09:53:10 +01:00
Yanming Zhou
da2dfbe0aa
LettuceMetricsAutoConfiguration should not build ClientResources
...
See gh-28767
2021-11-22 09:49:07 +01:00
Stephane Nicoll
490ec8974d
Merge branch '2.5.x'
...
Closes gh-28761
2021-11-20 17:30:35 +01:00
Stephane Nicoll
dfc75036ec
Merge pull request #28756 from charissathomas
...
* pr/28756:
Polish "Add package info for Spring Data metrics support"
Create package-info.java
Closes gh-28756
2021-11-20 17:30:24 +01:00
Stephane Nicoll
667bca05ec
Polish "Add package info for Spring Data metrics support"
...
See gh-28756
2021-11-20 17:29:52 +01:00
charissathomas
42ae5114ef
Create package-info.java
...
Closes #28731
2021-11-20 17:29:22 +01:00
Phillip Webb
902dd0baf5
Use local docker mirror for test containers
...
See gh-24343
2021-11-19 12:16:12 -08:00
Phillip Webb
10269365c2
Reinstate CI image generation mirrors
...
See gh-25135
2021-11-19 12:15:53 -08:00
Andy Wilkinson
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson
70e42e09c6
Merge branch '2.5.x'
...
Closes gh-28750
2021-11-19 13:43:32 +00:00
Andy Wilkinson
c68e66c63f
Merge pull request #28747 from jprinet
...
* gh-28747:
Upgrade Gradle Enterprise plugin to 3.7.2
Closes gh-28747
2021-11-19 13:43:19 +00:00
Jerome Prinet
80e6bb2939
Upgrade Gradle Enterprise plugin to 3.7.2
...
See gh-28747
2021-11-19 13:42:47 +00:00
Andy Wilkinson
381c094c41
Merge branch '2.5.x'
2021-11-19 13:39:37 +00:00
Andy Wilkinson
8f0e12dc34
Revert accidentally committed changes
...
This partially reverts commit c083e0b049 .
2021-11-19 13:39:22 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
4a0fa62d2e
Polish "Replace "you're""
...
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant
e629e77b29
Replace "you're"
...
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.
Also checked for words that end with "'ll" and "n't" but did not find
any.
See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Spring Builds
96eaef4290
Next development version (v2.6.1-SNAPSHOT)
2021-11-19 07:16:27 +00:00
Phillip Webb
e9beac6fd6
Drop CI registry mirror settings
2021-11-18 22:08:29 -08:00
Phillip Webb
b6d0b44703
Fix @SuppressWarnings
2021-11-18 17:26:18 -08:00
Madhura Bhave
dd1d1482dc
Deny unauthorized access to the error page
...
Fixes gh-26356
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson
8bd3d53085
Merge branch '2.5.x'
...
Closes gh-28738
2021-11-18 13:58:46 +00:00
Andy Wilkinson
c4e2252c6d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28737
2021-11-18 13:58:35 +00:00
Andy Wilkinson
da8261921a
Upgrade to concourse/oci-build-task 0.9.1
...
Closes gh-28736
2021-11-18 13:58:09 +00:00
Andy Wilkinson
7ed19a3b59
Merge branch '2.5.x'
...
Closes gh-28735
2021-11-18 12:21:11 +00:00
Andy Wilkinson
88457d9cfa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28734
2021-11-18 12:20:50 +00:00
Andy Wilkinson
7d19ea4ca1
Limit log output produced by spring-boot-deployment-tests:intTest
...
Closes gh-28730
2021-11-18 12:18:34 +00:00
Andy Wilkinson
11e1916766
Merge branch '2.5.x'
...
Closes gh-28733
2021-11-18 12:04:47 +00:00
Andy Wilkinson
5ccd70c73a
Update LATEST_GA settings in preparation for 2.6.0
...
Closes gh-28729
2021-11-18 12:02:00 +00:00
Andy Wilkinson
29725ec68a
Update links to Spring Security's reference docs
...
Closes gh-28618
2021-11-18 11:59:48 +00:00
Andy Wilkinson
5f52f1cc81
Merge branch '2.5.x'
2021-11-18 11:39:22 +00:00
Andy Wilkinson
a1a04ebf11
Merge branch '2.4.x' into 2.5.x
2021-11-18 11:35:16 +00:00
Spring Builds
9e9215d05a
Next development version (v2.5.8-SNAPSHOT)
2021-11-18 11:03:25 +00:00
Spring Builds
54b11cb3fb
Next development version (v2.4.14-SNAPSHOT)
2021-11-18 08:02:52 +00:00
Madhura Bhave
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll
e17461ed8b
Merge branch '2.5.x'
2021-11-17 16:43:56 +01:00
Stephane Nicoll
7fbb9d471b
Polish "Upgrade to Neo4j Java Driver 4.2.8"
...
See gh-28717
2021-11-17 16:14:25 +01:00