Andy Wilkinson
792c4f46ef
Merge branch '2.3.x'
...
Closes gh-22759
2020-08-06 09:22:11 +01:00
Andy Wilkinson
c121f9f61f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22758
2020-08-06 09:21:29 +01:00
Andy Wilkinson
b53f54f2cf
Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
...
Closes gh-22281
2020-08-06 09:21:11 +01:00
Stephane Nicoll
1864f47db8
Upgrade Java 15 version in CI image
...
Closes gh-22753
2020-08-06 09:41:42 +02:00
Stephane Nicoll
1afbf77f29
Upgrade Java 8 version in CI image
...
Closes gh-22756
2020-08-06 09:40:41 +02:00
Stephane Nicoll
774bca065d
Merge branch '2.3.x'
2020-08-06 09:40:15 +02:00
Stephane Nicoll
235f5e1103
Upgrade Java 8 version in CI image
...
Closes gh-22754
2020-08-06 09:39:38 +02:00
Stephane Nicoll
895383e182
Merge branch '2.2.x' into 2.3.x
2020-08-06 09:39:05 +02:00
Stephane Nicoll
6232ece61d
Upgrade Java 8 version in CI image
...
Closes gh-22752
2020-08-06 09:38:19 +02:00
Stephane Nicoll
63718d4e72
Merge branch '2.1.x' into 2.2.x
2020-08-06 09:37:55 +02:00
Stephane Nicoll
64264b5240
Upgrade Java 8 version in CI image
...
Closes gh-22755
2020-08-06 09:37:04 +02:00
Madhura Bhave
f0ef47dfad
Fix additional deprecations
2020-08-05 15:09:51 -07:00
Madhura Bhave
0d79bd08a6
Fix deprecations
2020-08-05 15:01:44 -07:00
Madhura Bhave
5f386e456b
Fix test
2020-08-05 14:59:27 -07:00
Madhura Bhave
b9abcf1615
Fail hard if spring.profiles.include is used with new config processing
...
Closes gh-22693
2020-08-05 14:41:32 -07:00
Brian Clozel
e719a246df
Upgrade to Spring Security 5.4.0-RC1
...
Closes gh-22668
2020-08-05 21:33:36 +02:00
Andy Wilkinson
9c417d280c
Merge branch '2.3.x'
...
Closes gh-22749
2020-08-05 18:15:59 +01:00
Andy Wilkinson
a160755da5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22748
2020-08-05 18:15:45 +01:00
Andy Wilkinson
bfe250e5d3
Clarify docs on schema and data SQL scripts with Flyway and Liquibase
...
Closes gh-20920
2020-08-05 18:14:39 +01:00
Andy Wilkinson
0e83b2f4c4
Merge branch '2.3.x'
...
Closes gh-22747
2020-08-05 17:47:38 +01:00
Andy Wilkinson
c40835eba0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22746
2020-08-05 17:47:24 +01:00
Andy Wilkinson
71ffb44a3c
Remove WebClient's in-memory buffer size limit for endpoint tests
...
Previously, the endpoints' responses could occasionally exceed
WebClient's in-memory buffer limt, for example if the threads endpoint
was reporting a large number of threads or the threads had large
stacks.
This commit disables WebClient's in-memory buffer size limit so that
the tests passing is not dependent on the size of the endpoints'
responses.
Closes gh-22743
2020-08-05 17:37:44 +01:00
Stephane Nicoll
516582f6d3
Merge branch '2.3.x'
...
Closes gh-22744
2020-08-05 18:05:07 +02:00
Stephane Nicoll
cccf9c24e2
Merge pull request #22740 from izeye
...
* pr/22740:
Polish
Closes gh-22740
2020-08-05 18:00:19 +02:00
Johnny Lim
1017774ed5
Polish
...
See gh-22740
2020-08-05 17:59:03 +02:00
Stephane Nicoll
b51e612c39
Merge pull request #17490 from ayudovin
...
* pr/17490:
Polish "Add test slice for Spring Data Cassandra"
Add test slice for Spring Data Cassandra
Closes gh-17490
2020-08-05 17:54:34 +02:00
Stephane Nicoll
313b2bef6f
Polish "Add test slice for Spring Data Cassandra"
...
See gh-17490
2020-08-05 16:46:52 +02:00
ayudovin
ae152b176b
Add test slice for Spring Data Cassandra
...
See gh-17490
2020-08-05 16:46:52 +02:00
Andy Wilkinson
7df49187fa
Merge branch '2.3.x'
...
Closes gh-22738
2020-08-05 09:05:28 +01:00
Andy Wilkinson
94644f3814
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22737
2020-08-05 09:05:10 +01:00
Andy Wilkinson
2238b0d797
Try to make FileSystemWatcherTests.waitsForQuietPeriod() more robust
...
Previously, waitsForQuietPeriod would iterate 10 times, touching a new
file and then sleeping for 100ms at it did so. With a quiet period of
200ms, this was intended to result in a single change set containing
10 files. However, the test would fail occasionally as multiple change
sets were detected. The test is multi-threaded and is, therefore, at
the mercy of the scheduler. If the thread that is iterating and
touching the files takes over 200ms to be scheduled – exceeding the
watcher's quiet period – the watcher may detect a change set while the
changes are still being made. Eliminating this possibilty would require
the test to participate in the watcher's synchronization, which would
require some changes to its implementation. Instead, this commit
aims to avoid the problem by sleeping for 1/10 of the time (10ms) and
expecting a single change set of 100 files. The hope is that the much
shorter sleep time will result in the file touching thread being
scheduled well within the 200ms quiet period.
Closes gh-22732
2020-08-05 09:00:49 +01:00
Stephane Nicoll
b476bf82d8
Merge pull request #22258 from danilopiazza
...
* pr/22258:
Polish "Support configuration of entityId for a SAML Relying Party"
Support configuration of entityId for a SAML Relying Party
Closes gh-22258
2020-08-05 09:44:50 +02:00
Stephane Nicoll
621f026499
Polish "Support configuration of entityId for a SAML Relying Party"
...
See gh-22258
2020-08-05 09:41:54 +02:00
Danilo Piazzalunga
5352ec1cba
Support configuration of entityId for a SAML Relying Party
...
See gh-22258
2020-08-05 09:41:38 +02:00
Stephane Nicoll
0bc5b20d56
Merge pull request #22569 from bono007
...
* pr/22569:
Polish "Add support for selecting the Redis client to use"
Add support for selecting the Redis client to use
Closes gh-22569
2020-08-05 09:27:02 +02:00
Stephane Nicoll
589669d0cc
Polish "Add support for selecting the Redis client to use"
...
See gh-22569
2020-08-05 09:21:52 +02:00
bono007
ac651442fa
Add support for selecting the Redis client to use
...
See gh-22569
2020-08-05 09:05:06 +02:00
Scott Frederick
f247fec310
Merge branch '2.3.x'
...
Closes gh-22735
2020-08-04 15:30:17 -05:00
Scott Frederick
21b2dd2740
Allow empty env entries when building an image
...
Prior to this commit, an entry in the environment map provided to the
build plugin image building goal or task that had a null value would
result in a failure with a message that was difficult to diagnose.
This commit treats env map entries with a null value as an empty
entry to prevent the failure and also make it easier to provide an
explicit empty entry in the Maven XML.
Fixes gh-22703
2020-08-04 15:29:29 -05:00
Andy Wilkinson
bc44cd6705
Polish
2020-08-04 18:43:45 +01:00
Andy Wilkinson
07b6f83c7a
Merge branch '2.3.x'
2020-08-04 18:24:28 +01:00
Andy Wilkinson
1233288df0
Disable JarLaunchScriptIntegrationTests without Docker
...
See gh-21388
2020-08-04 18:23:06 +01:00
Andy Wilkinson
6e00022b2d
Start building against Spring Integration 5.4.0-M2 snapshots
...
See gh-22729
2020-08-04 18:14:23 +01:00
Andy Wilkinson
02f888bccf
Start building against Spring Kafka 2.6.0-M1 snapshots
...
See gh-22730
2020-08-04 18:14:23 +01:00
Andy Wilkinson
7f53aef568
Upgrade to Kafka 2.6.0
...
Closes gh-22731
2020-08-04 18:14:23 +01:00
Stephane Nicoll
a8130da3a3
Merge pull request #22571 from bono007
...
* pr/22571:
Polish "Add option to disable Redis Cluster dynamic sources refresh"
Add option to disable Redis Cluster dynamic sources refresh
Closes gh-22571
2020-08-04 16:42:56 +02:00
Stephane Nicoll
903dc93887
Polish "Add option to disable Redis Cluster dynamic sources refresh"
...
See gh-22571
2020-08-04 16:42:33 +02:00
bono007
3cfde51a8c
Add option to disable Redis Cluster dynamic sources refresh
...
This commit adds an option to enable/disable the DynamicRefreshSources
setting on the Lettuce cluster toplogy refresh options.
See gh-22571
2020-08-04 16:42:33 +02:00
Andy Wilkinson
f854a79893
Merge branch '2.3.x'
...
Closes gh-22727
2020-08-04 15:36:39 +01:00
Andy Wilkinson
34eab5da95
Disable caching of changing modules
...
Closes gh-22726
2020-08-04 15:36:01 +01:00