Commit Graph

36477 Commits (790171c0be5dacabe68299c3c6958b0cd3e569a1)
 

Author SHA1 Message Date
Moritz Halbritter 790171c0be Merge branch '2.7.x' 3 years ago
Moritz Halbritter 7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
3 years ago
Andy Wilkinson 0837083800 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 74726bddcf Merge pull request #29976 from dugenkui03
* gh-29976:
  Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
  Remove redundant ResourceLoaders from GraphQL auto-configuration

Closes gh-29976
3 years ago
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
3 years ago
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
3 years ago
Andy Wilkinson cce48a75fc Merge branch '2.7.x' 3 years ago
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
3 years ago
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
3 years ago
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
3 years ago
Madhura Bhave 7a4960d4ca Merge branch '2.7.x' into main 3 years ago
Madhura Bhave e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1"
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
3 years ago
Stephane Nicoll 8a7e40ce91 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 90c2bf192e Upgrade to Liquibase 4.8.0
Closes gh-29987
3 years ago
Stephane Nicoll 1bb498b03c Upgrade to Flyway 8.5.1
Closes gh-29986
3 years ago
Stephane Nicoll 0c7f4d8307 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 525d5fd6e5 Merge branch '2.6.x' into 2.7.x
Closes gh-29994
3 years ago
Stephane Nicoll 0941cfd5fe Merge branch '2.5.x' into 2.6.x
Closes gh-29993
3 years ago
Stephane Nicoll b60b5feefe Add explicit dependency on inject-api
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.

Closes gh-29990
3 years ago
Stephane Nicoll c20b21043f Merge branch '2.7.x' 3 years ago
Stephane Nicoll 737f898273 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 24cd71634c Merge branch '2.5.x' into 2.6.x 3 years ago
Spring Builds a36e28b4be Next development version (v2.6.5-SNAPSHOT) 3 years ago
Andy Wilkinson 7dc40e95d2 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 68fed47e69 Merge pull request #29912 from eddumelendez
* gh-29912:
  Polish "Add DataCouchbaseTest annotation"
  Add DataCouchbaseTest annotation

Closes gh-29912
3 years ago
Andy Wilkinson 664ecbdcc1 Polish "Add DataCouchbaseTest annotation"
See gh-29912
3 years ago
Eddú Meléndez 36e52758a7 Add DataCouchbaseTest annotation
See gh-29912
3 years ago
Andy Wilkinson 4093fff225 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8015fb0608 Merge pull request #29911 from eddumelendez
* gh-29911:
  Polish "Add DataElasticsearchTest annotation"
  Add DataElasticsearchTest annotation

Closes gh-29911
3 years ago
Andy Wilkinson 53292a1f94 Polish "Add DataElasticsearchTest annotation"
See gh-29911
3 years ago
Eddú Meléndez e22f78bc6a Add DataElasticsearchTest annotation
See gh-29911
3 years ago
Spring Builds 5768f5f649 Next development version (v2.5.11-SNAPSHOT) 3 years ago
Phillip Webb 5454e2e26a Merge branch '2.7.x' 3 years ago
Phillip Webb 9f00c3acf5 Polish 3 years ago
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 1a3841f74e Polish 3 years ago
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 57009d5623 Polish 3 years ago
Scott Frederick df549190b5 Merge branch '2.7.x' 3 years ago
Scott Frederick ee4e7bb923 Merge branch '2.6.x' into 2.7.x
Closes gh-29982
3 years ago
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
3 years ago
Madhura Bhave a7c7a8ef2f Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 729c6993e1 Merge branch '2.6.x' into 2.7.x
Closes gh-29981
3 years ago
Madhura Bhave acd1ba0eca Merge branch '2.5.x' into 2.6.x
Closes gh-29980
3 years ago
Madhura Bhave 67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved
Closes gh-23164
3 years ago
Madhura Bhave f9d33ec1e2 Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 0ecf43dbe2 Merge branch '2.6.x' into 2.7.x
Closes gh-29979
3 years ago
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x
Closes gh-29978
3 years ago
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data
Closes gh-29606
3 years ago
Stephane Nicoll 7f71f71963 Merge branch '2.7.x' 3 years ago