Commit Graph

36483 Commits

Author SHA1 Message Date
Andy Wilkinson
3eb61c3203 Merge branch '2.7.x' 2022-03-01 12:37:36 +00:00
Andy Wilkinson
97c47123d5 Merge branch '2.6.x' into 2.7.x
Closes gh-30019
2022-03-01 12:35:57 +00:00
Andy Wilkinson
c8b849e2f6 Merge branch '2.5.x' into 2.6.x
Closes gh-30018
2022-03-01 12:32:07 +00:00
Andy Wilkinson
355f80ab98 Add links to Spring Boot for Apache Geode and its documentation
Closes gh-29697
2022-03-01 12:13:58 +00:00
Moritz Halbritter
e58ba15249 Merge branch '2.7.x' 2022-03-01 11:57:03 +01:00
Moritz Halbritter
9c958669f4 Add io.micrometer:micrometer-binders as dependency to the test suite 2022-03-01 11:56:43 +01:00
Moritz Halbritter
790171c0be Merge branch '2.7.x' 2022-03-01 10:25:31 +01:00
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
2022-03-01 09:20:07 +01:00
Andy Wilkinson
0837083800 Merge branch '2.7.x' 2022-02-28 11:27:21 +00:00
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
2022-02-28 11:27:03 +00:00
Andy Wilkinson
19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
2022-02-28 11:16:04 +00:00
dugenkui03
5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
2022-02-28 11:16:04 +00:00
Andy Wilkinson
cce48a75fc Merge branch '2.7.x' 2022-02-28 11:15:38 +00:00
Andy Wilkinson
73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
2022-02-28 11:15:24 +00:00
Andy Wilkinson
b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson
7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
2022-02-28 10:54:31 +00:00
Madhura Bhave
7a4960d4ca Merge branch '2.7.x' into main 2022-02-24 11:01:23 -08:00
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
2022-02-24 11:00:00 -08:00
Stephane Nicoll
8a7e40ce91 Merge branch '2.7.x' 2022-02-24 15:55:55 +01:00
Stephane Nicoll
90c2bf192e Upgrade to Liquibase 4.8.0
Closes gh-29987
2022-02-24 15:36:07 +01:00
Stephane Nicoll
1bb498b03c Upgrade to Flyway 8.5.1
Closes gh-29986
2022-02-24 15:36:00 +01:00
Stephane Nicoll
0c7f4d8307 Merge branch '2.7.x' 2022-02-24 15:13:32 +01:00
Stephane Nicoll
525d5fd6e5 Merge branch '2.6.x' into 2.7.x
Closes gh-29994
2022-02-24 15:12:36 +01:00
Stephane Nicoll
0941cfd5fe Merge branch '2.5.x' into 2.6.x
Closes gh-29993
2022-02-24 15:12:26 +01:00
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
2022-02-24 15:12:09 +01:00
Stephane Nicoll
c20b21043f Merge branch '2.7.x' 2022-02-24 15:02:48 +01:00
Stephane Nicoll
737f898273 Merge branch '2.6.x' into 2.7.x 2022-02-24 15:02:41 +01:00
Stephane Nicoll
24cd71634c Merge branch '2.5.x' into 2.6.x 2022-02-24 15:02:22 +01:00
Spring Builds
a36e28b4be Next development version (v2.6.5-SNAPSHOT) 2022-02-24 12:46:42 +00:00
Andy Wilkinson
7dc40e95d2 Merge branch '2.7.x' 2022-02-24 12:06:21 +00:00
Andy Wilkinson
68fed47e69 Merge pull request #29912 from eddumelendez
* gh-29912:
  Polish "Add DataCouchbaseTest annotation"
  Add DataCouchbaseTest annotation

Closes gh-29912
2022-02-24 12:05:53 +00:00
Andy Wilkinson
664ecbdcc1 Polish "Add DataCouchbaseTest annotation"
See gh-29912
2022-02-24 12:05:36 +00:00
Eddú Meléndez
36e52758a7 Add DataCouchbaseTest annotation
See gh-29912
2022-02-24 11:45:09 +00:00
Andy Wilkinson
4093fff225 Merge branch '2.7.x' 2022-02-24 11:24:23 +00:00
Andy Wilkinson
8015fb0608 Merge pull request #29911 from eddumelendez
* gh-29911:
  Polish "Add DataElasticsearchTest annotation"
  Add DataElasticsearchTest annotation

Closes gh-29911
2022-02-24 11:24:08 +00:00
Andy Wilkinson
53292a1f94 Polish "Add DataElasticsearchTest annotation"
See gh-29911
2022-02-24 11:21:24 +00:00
Eddú Meléndez
e22f78bc6a Add DataElasticsearchTest annotation
See gh-29911
2022-02-24 10:27:20 +00:00
Spring Builds
5768f5f649 Next development version (v2.5.11-SNAPSHOT) 2022-02-24 09:12:59 +00:00
Phillip Webb
5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Phillip Webb
adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb
1a3841f74e Polish 2022-02-23 21:44:14 -08:00
Phillip Webb
9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb
57009d5623 Polish 2022-02-23 21:43:42 -08:00
Scott Frederick
df549190b5 Merge branch '2.7.x' 2022-02-23 17:56:55 -06:00
Scott Frederick
ee4e7bb923 Merge branch '2.6.x' into 2.7.x
Closes gh-29982
2022-02-23 17:56:34 -06:00
Scott Frederick
59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
2022-02-23 17:56:21 -06:00
Madhura Bhave
a7c7a8ef2f Merge branch '2.7.x' into main 2022-02-23 15:30:51 -08:00
Madhura Bhave
729c6993e1 Merge branch '2.6.x' into 2.7.x
Closes gh-29981
2022-02-23 15:29:36 -08:00
Madhura Bhave
acd1ba0eca Merge branch '2.5.x' into 2.6.x
Closes gh-29980
2022-02-23 15:28:17 -08:00