Commit Graph

34922 Commits (cb6bd220430e7883a6c4bffd139592f02e358250)
 

Author SHA1 Message Date
Andy Wilkinson cb6bd22043 Merge branch '2.6.x' 3 years ago
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 3 years ago
Andy Wilkinson 354a18c9a6 Prepare 2.6.x branch 3 years ago
Scott Frederick 3b12a5efe9 Update system tests for Paketo Java buildpack 6.0.0
Paketo Java buildpack version 6.0.0 adds a buildpack and removes
support for the SBOM in the format that the system tests attempt
to verify.

Fixes gh-28823
3 years ago
Spring Builds 4bd6327cac Next development version (v2.6.2-SNAPSHOT) 3 years ago
Stephane Nicoll 46a8673bf8 Merge branch '2.5.x'
Closes gh-28839
3 years ago
Stephane Nicoll db944600c1 Merge pull request #28809 from polarbear567
* pr/28809:
  Update copyright year of changed files
  Fix reference to matching-strategy property

Closes gh-28809
3 years ago
Stephane Nicoll 1876b4bcd7 Update copyright year of changed files
See gh-28809
3 years ago
Leo Li f3c93d30a8 Fix reference to matching-strategy property
See gh-28809
3 years ago
Stephane Nicoll 10251c1516 Merge pull request #28836 from izeye
* pr/28836:
  Polish

Closes gh-28836
3 years ago
izeye c7921468fc Polish
See gh-28836
3 years ago
Stephane Nicoll 88aa849f90 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 1bb3f906a7 Polish
See gh-28836
3 years ago
Stephane Nicoll e4082ee5d9 Merge branch '2.5.x'
Closes gh-28834
3 years ago
Stephane Nicoll 8d3c545220 Merge pull request #28830 from fml2
* pr/28830:
  Fix typos in the "External Application Properties" section

Closes gh-28830
3 years ago
fml2 1d786e49e9 Fix typos in the "External Application Properties" section
See gh-28830
3 years ago
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