Commit Graph

15161 Commits

Author SHA1 Message Date
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 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
2021-11-22 10:03:21 +00: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 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
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 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
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 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
2021-11-18 11:59:48 +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 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll a6163f6acf Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll fc69be302a Upgrade to HttpClient5 5.1.2
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
2021-11-17 15:02:25 +01:00
Stephane Nicoll ba3d0d7771 Upgrade to Spring Session 2021.1.0
Closes gh-28522
2021-11-17 14:14:08 +01:00
Andy Wilkinson ea0613c7d7 Merge branch '2.5.x'
Closes gh-28261
2021-11-17 10:07:18 +00:00
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:04:51 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
2021-11-17 08:51:20 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
2021-11-16 16:24:32 +01:00
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7
Closes gh-28699
2021-11-16 11:02:02 +01:00
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
2021-11-16 11:02:02 +01:00
Stephane Nicoll 4b64f36356 Upgrade to Spring Security 5.6.0
Closes gh-28520
2021-11-16 09:43:30 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Stephane Nicoll cdc14250c4 Merge branch '2.5.x'
Closes gh-28691
2021-11-16 08:34:39 +01:00