Moritz Halbritter
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
Moritz Halbritter
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
Stephane Nicoll
3b2288899b
Merge branch '2.7.x'
2022-02-21 09:55:21 +01:00
Stephane Nicoll
14c9147621
Merge pull request #29661 from mourezwell
...
* pr/29661:
Polish "Add support for Redis sentinel username"
Add support for Redis sentinel username
Closes gh-29661
2022-02-21 09:55:08 +01:00
Stephane Nicoll
3ffd88158e
Polish "Add support for Redis sentinel username"
...
See gh-29661
2022-02-21 09:52:29 +01:00
mourezwell
202a426bd6
Add support for Redis sentinel username
...
See gh-29661
2022-02-21 09:52:15 +01:00
Stephane Nicoll
414b7539de
Merge branch '2.7.x'
2022-02-21 09:34:05 +01:00
Stephane Nicoll
ebbd16788e
Merge pull request #29884 from garyrussell
...
* pr/29884:
Add support for Kafka immediateStop property
Closes gh-29884
2022-02-21 09:33:40 +01:00
Gary Russell
d56403b64f
Add support for Kafka immediateStop property
...
See gh-29884
2022-02-21 09:29:41 +01:00
Stephane Nicoll
d59b89cd82
Merge branch '2.7.x'
2022-02-21 09:25:57 +01:00
Stephane Nicoll
c5307a8bfe
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29916
2022-02-21 09:25:21 +01:00
Stephane Nicoll
c52f6f09ad
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29915
2022-02-21 09:25:08 +01:00
Stephane Nicoll
ca23c68b1c
Merge pull request #29896 from gcoppex
...
* pr/29896:
Polish "Clarify log message with a profile containing a comma"
Clarify log message with a profile containing a comma
Closes gh-29896
2022-02-21 09:24:52 +01:00
Stephane Nicoll
92cd51e6b0
Polish "Clarify log message with a profile containing a comma"
...
See gh-29896
2022-02-21 09:00:27 +01:00
gcoppex
c8466a14e9
Clarify log message with a profile containing a comma
...
See gh-29896
2022-02-21 08:28:10 +01:00
Andy Wilkinson
3f489a374c
Merge branch '2.7.x'
2022-02-19 11:36:31 +00:00
Andy Wilkinson
5f2ae858b6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29910
2022-02-19 11:36:20 +00:00
Andy Wilkinson
95d67a985b
Merge branch 'gh-29639' into 2.6.x
...
Closes gh-29909
2022-02-19 11:36:09 +00:00
Andy Wilkinson
5baa71f1b3
Allow beans with circular dependencies to be spied
...
Closes gh-29639
2022-02-19 11:35:58 +00:00
Andy Wilkinson
9a3f053034
Allow beans with circular dependencies to be spied
...
Closes gh-29639
2022-02-19 11:35:28 +00:00
Andy Wilkinson
63ff839660
Merge branch '2.7.x'
2022-02-19 08:05:47 +00:00
Andy Wilkinson
630da366bd
Upgrade to Spring Data 2021.2.0-M3
...
Closes gh-29765
2022-02-19 08:05:24 +00:00
Andy Wilkinson
23b62653dd
Merge branch '2.6.x' into 2.7.x
2022-02-19 08:05:14 +00:00
Andy Wilkinson
f919c9983c
Upgrade to Spring Data 2021.1.2
...
Closes gh-29721
2022-02-19 08:02:55 +00:00
Andy Wilkinson
1b1571be0f
Merge branch '2.5.x' into 2.6.x
2022-02-19 08:00:23 +00:00
Andy Wilkinson
1c4fc7d3fa
Upgrade to Spring Data 2021.0.9
...
Closes gh-29711
2022-02-19 07:59:10 +00:00
Andy Wilkinson
8209980ca0
Merge branch '2.7.x'
2022-02-18 19:02:54 +00:00
Andy Wilkinson
027093d852
Use a templated source file for SpringBootVersion
...
Closes gh-29670
2022-02-18 18:08:09 +00:00
Stephane Nicoll
2dd2aed1fd
Merge branch '2.7.x'
2022-02-18 17:30:14 +01:00
Stephane Nicoll
1f8700fbd1
Merge branch '2.6.x' into 2.7.x
2022-02-18 17:29:45 +01:00
Stephane Nicoll
2374347bab
Upgrade to Spring LDAP 2.4.0-M2
...
Closes gh-29764
2022-02-18 17:29:32 +01:00
Stephane Nicoll
c1aa8b1869
Merge branch '2.5.x' into 2.6.x
2022-02-18 17:28:51 +01:00
Stephane Nicoll
47510924e5
Upgrade to Spring LDAP 2.3.6
...
Closes gh-29720
2022-02-18 17:28:16 +01:00
Stephane Nicoll
6bf172f0f2
Upgrade to Spring LDAP 2.3.6
...
Closes gh-29710
2022-02-18 17:02:39 +01:00
Moritz Halbritter
829ff4d03f
Merge branch '2.7.x'
2022-02-18 14:49:24 +01:00
Moritz Halbritter
2afa02c856
Fix missing test slice configuration
...
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.
See gh-29873
2022-02-18 14:49:07 +01:00
Brian Clozel
78dde15da4
Merge branch '2.7.x'
2022-02-18 13:56:11 +01:00
Brian Clozel
940558c2a6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29906
2022-02-18 13:55:53 +01:00
Brian Clozel
16c47595e7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29905
2022-02-18 13:55:27 +01:00
Brian Clozel
00114f9d61
Deregister failed contexts from SpringApplicationShutdownHook
...
Prior to this change, SpringApplication would register contexts to
SpringApplicationShutdownHook and only deregister them when they're
properly closed. A failed refresh attempt does not deregister the
context from the shutdown hook.
When a test suite runs lots of tests failing because of failed contexts,
this can build up and consume lots of resources.
This commit fixes this leak and deregisters failed contexts.
Fixes gh-29874
2022-02-18 13:54:14 +01:00
Moritz Halbritter
f5f6a1fe83
Merge branch '2.7.x'
2022-02-18 13:15:11 +01:00
Moritz Halbritter
4f49e8c990
Polish JavaDoc
2022-02-18 13:14:42 +01:00
Andy Wilkinson
6a1fe01a63
Merge branch '2.7.x'
2022-02-18 11:45:44 +00:00
Andy Wilkinson
d18f536bc8
Remove separate netty-tcnative dependency management
...
Closes gh-29816
2022-02-18 11:45:00 +00:00
Andy Wilkinson
1e1b2a062e
Merge branch '2.7.x'
2022-02-18 11:42:32 +00:00
Andy Wilkinson
0e5a82522c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29904
2022-02-18 11:42:21 +00:00
Andy Wilkinson
9da6fb4a5a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson
c676b8b84d
Remove KafkaPropertiesKafka24Tests
...
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.
Closes gh-29882
2022-02-18 11:41:24 +00:00
Andy Wilkinson
41d516cb4f
Merge branch '2.7.x'
2022-02-18 11:23:54 +00:00
Andy Wilkinson
b6fea07001
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29902
2022-02-18 11:23:28 +00:00
