Commit Graph

35006 Commits (7156e3fb23b69d29ed7c686cc83f2b839d05c663)
 

Author SHA1 Message Date
Stephane Nicoll 9719930496 Merge branch '2.5.x'
Closes gh-28833
3 years ago
Stephane Nicoll e4d1718eab Merge pull request #28831 from mikrethor
* pr/28831:
  Fix output of "spring --version" in reference documentation

Closes gh-28831
3 years ago
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation
See gh-28831
3 years ago
Andy Wilkinson 4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot
Closes gh-28817
3 years ago
Stephane Nicoll cd4d08d8c0 Merge pull request #28779 from ztomic
* pr/28779:
  Fix MariaDB mapping for Quartz DataSource initialization

Closes gh-28779
3 years ago
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization
See gh-28779
3 years ago
Stephane Nicoll aac6289067 Merge branch '2.5.x' 3 years ago
Stephane Nicoll bc76756894 Upgrade CI to Docker 20.10.11
Closes gh-28806
3 years ago
Stephane Nicoll 74b7098c8d Upgrade CI to Docker 20.10.11
Closes gh-28807
3 years ago
Phillip Webb 82f5d13514 Merge branch '2.5.x' 3 years ago
Madhura Bhave 27eb992252 Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
3 years ago
Phillip Webb beb68671bb Update copyright year of changed files 3 years ago
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
3 years ago
Madhura Bhave 49e408828c Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
3 years ago
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
3 years ago
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
3 years ago
Scott Frederick 4eed637481 Merge branch '2.5.x'
Closes gh-28789
3 years ago
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
3 years ago
Andy Wilkinson 196c92e12c Merge branch '2.5.x' 3 years ago
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
3 years ago
Stephane Nicoll cdc2851bc1 Merge pull request #28767 from quaff
* pr/28767:
  LettuceMetricsAutoConfiguration should not build ClientResources

Closes gh-28767
3 years ago
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources
See gh-28767
3 years ago
Stephane Nicoll 490ec8974d Merge branch '2.5.x'
Closes gh-28761
3 years ago
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
3 years ago
Stephane Nicoll 667bca05ec Polish "Add package info for Spring Data metrics support"
See gh-28756
3 years ago
charissathomas 42ae5114ef Create package-info.java
Closes #28731
3 years ago
Phillip Webb 902dd0baf5 Use local docker mirror for test containers
See gh-24343
3 years ago
Phillip Webb 10269365c2 Reinstate CI image generation mirrors
See gh-25135
3 years ago
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
3 years ago
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
3 years ago
Andy Wilkinson 258222781a Merge branch '2.5.x'
Closes gh-28752
3 years ago
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
3 years ago
Andy Wilkinson 70e42e09c6 Merge branch '2.5.x'
Closes gh-28750
3 years ago
Andy Wilkinson c68e66c63f Merge pull request #28747 from jprinet
* gh-28747:
  Upgrade Gradle Enterprise plugin to 3.7.2

Closes gh-28747
3 years ago
Jerome Prinet 80e6bb2939 Upgrade Gradle Enterprise plugin to 3.7.2
See gh-28747
3 years ago
Andy Wilkinson 381c094c41 Merge branch '2.5.x' 3 years ago
Andy Wilkinson 8f0e12dc34 Revert accidentally committed changes
This partially reverts commit c083e0b049.
3 years ago
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
3 years ago
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
3 years ago
Andy Wilkinson 4a0fa62d2e Polish "Replace "you're""
See gh-28710
3 years ago
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
3 years ago
Andy Wilkinson 00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
3 years ago
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
3 years ago
Spring Builds 96eaef4290 Next development version (v2.6.1-SNAPSHOT) 3 years ago
Phillip Webb e9beac6fd6 Drop CI registry mirror settings 3 years ago
Phillip Webb b6d0b44703 Fix @SuppressWarnings 3 years ago
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
3 years ago
Andy Wilkinson 8bd3d53085 Merge branch '2.5.x'
Closes gh-28738
3 years ago
Andy Wilkinson c4e2252c6d Merge branch '2.4.x' into 2.5.x
Closes gh-28737
3 years ago
Andy Wilkinson da8261921a Upgrade to concourse/oci-build-task 0.9.1
Closes gh-28736
3 years ago