Commit Graph

30966 Commits (302d500ee9715ee766aba2aa3fd02bbdc790d906)
 

Author SHA1 Message Date
Phillip Webb 302d500ee9 Add StandardConfigDataResource.getProfile method
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.

Fixes gh-25940
4 years ago
Spring Buildmaster 270bf0f937 Next development version (v2.4.6-SNAPSHOT) 4 years ago
Andy Wilkinson c48a48f0a2 Merge branch '2.3.x' into 2.4.x 4 years ago
Spring Buildmaster dea62c1734 Next development version (v2.3.11.BUILD-SNAPSHOT) 4 years ago
Andy Wilkinson 01fb599f6e Revert "Attempt to overcome Docker rate limiting on CI"
This reverts commit 51d57e19d0.

See gh-25838
4 years ago
Andy Wilkinson bfe8e5ac19 Revert changes to make staging run Docker
See gh-26130
4 years ago
Andy Wilkinson 6073cf7063 Marking staging tasks as privileged so they can start Docker
See gh-26130
4 years ago
Andy Wilkinson f74123038a Start Docker before running a staging build
Closes gh-26130
4 years ago
Stephane Nicoll f814beacec Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
4 years ago
Stephane Nicoll 1de185caa4 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll e8eb68a458 Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
4 years ago
Phillip Webb 5b836f3aee Merge branch '2.3.x' into 2.4.x
Closes gh-26124
4 years ago
Phillip Webb 930c637b77 Merge pull request #25455 from nguyensach
* pr/25455:
  Polish 'Don't detect CloudPlatform when property is set'
  Don't detect CloudPlatform when property is set

Closes gh-25455
4 years ago
Phillip Webb 61ff3c98bf Polish 'Don't detect CloudPlatform when property is set'
See gh-25455
4 years ago
nguyensach 70f44d3a56 Don't detect CloudPlatform when property is set
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
4 years ago
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
4 years ago
Phillip Webb fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
4 years ago
Andy Wilkinson 1f0127036c Upgrade to Spring Integration 5.4.6
Closes gh-26113
4 years ago
Andy Wilkinson bcbb1a4346 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE
Closes gh-26112
4 years ago
Stephane Nicoll 401ebc672b Merge branch '2.3.x' into 2.4.x
Closes gh-26110
4 years ago
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
4 years ago
Stephane Nicoll 0d81b4d07e Merge branch '2.3.x' into 2.4.x
Closes gh-26108
4 years ago
Stephane Nicoll 0fb482579b Harmonize Neo4jContainer startup options
Closes gh-26084
4 years ago
Stephane Nicoll 0cedbf6e06 Upgrade to Spring Data 2020.0.8
Closes gh-25910
4 years ago
Stephane Nicoll ec0ade6322 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 1de2dd9ecb Upgrade to Spring Data Neumann-SR9
Closes gh-25905
4 years ago
Stephane Nicoll 62a70475c2 Fix class condition on deprecated class
Closes gh-26107
4 years ago
Stephane Nicoll 6a1f6ad6bb Merge pull request #26085 from rehevkor5
* pr/26085:
  Polish "Document spring.config.additional-location should be used early"
  Document spring.config.additional-location should be used early

Closes gh-26085
4 years ago
Stephane Nicoll 1855f96d07 Polish "Document spring.config.additional-location should be used early"
See gh-26085
4 years ago
Shannon Carey b0b1c04fc4 Document spring.config.additional-location should be used early
See gh-26085
4 years ago
Stephane Nicoll 8b7c512974 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 90fccd7097 Upgrade to SAAJ Impl 1.5.3
Closes gh-26104
4 years ago
Stephane Nicoll 54d23bac9d Upgrade to Micrometer 1.6.6
Closes gh-26103
4 years ago
Stephane Nicoll 3a8736a112 Upgrade to Lettuce 6.0.4.RELEASE
Closes gh-26102
4 years ago
Stephane Nicoll 0429ab4b88 Upgrade to HSQLDB 2.5.2
Closes gh-26101
4 years ago
Stephane Nicoll 00b53b5bdb Upgrade to Glassfish JAXB 2.3.4
Closes gh-26100
4 years ago
Stephane Nicoll cb2a7dd4cb Upgrade to SAAJ Impl 1.5.3
Closes gh-26099
4 years ago
Stephane Nicoll cb1d7a3bc8 Upgrade to Micrometer 1.5.13
Closes gh-26098
4 years ago
Stephane Nicoll 7c85ebc9c9 Upgrade to Lettuce 5.3.7.RELEASE
Closes gh-26097
4 years ago
Stephane Nicoll 274cfc0af0 Upgrade to HSQLDB 2.5.2
Closes gh-26096
4 years ago
Stephane Nicoll 4a5cb3f29e Upgrade to Glassfish JAXB 2.3.4
Closes gh-26095
4 years ago
Stephane Nicoll caa21b0fbe Upgrade to Flatten Maven Plugin 1.2.7
Closes gh-26094
4 years ago
Phillip Webb a2219ba4c5 Merge branch '2.3.x' into 2.4.x
Closes gh-26091
4 years ago
Phillip Webb 95a92653e1 Merge pull request #26086 from dreis2211
* pr/26086:
  Fix Docker update detection on CI

Closes gh-26086
4 years ago
dreis2211 505e6a1b4c Fix Docker update detection on CI
See gh-26086
4 years ago
Phillip Webb c0e12ce5a3 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb f29c707e6c Increase SampleSessionApplicationTests timeout
Increase timeout in `SampleSessionApplicationTests` to fix flaky local
builds.
4 years ago
Andy Wilkinson a58b25b5db Add package-info to o.s.b.test.autoconfigure.data.Cassandra
Closes gh-26081
4 years ago
Stephane Nicoll bea988686d Merge branch '2.3.x' into 2.4.x 4 years ago