Commit Graph

28053 Commits

Author SHA1 Message Date
Phillip Webb
dfd233cada Polish 2020-08-06 14:35:43 -07:00
Andy Wilkinson
1692899cd0 Merge branch '2.3.x' 2020-08-06 18:18:15 +01:00
Andy Wilkinson
d064ccabc4 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 18:18:04 +01:00
Andy Wilkinson
782adc5f5f Merge branch '2.3.x'
Closes gh-22772
2020-08-06 18:17:36 +01:00
Phillip Webb
8d06b0f368 Merge branch '2.3.x' 2020-08-06 10:15:36 -07:00
Phillip Webb
4924573074 Merge branch '2.2.x' into 2.3.x 2020-08-06 10:15:22 -07:00
Phillip Webb
fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Stephane Nicoll
dac63fc3e5 Polish 2020-08-06 17:35:01 +02:00
Andy Wilkinson
a495b83b25 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 16:25:45 +01:00
Andy Wilkinson
8b3f8a6138 Merge branch '2.3.x'
Closes gh-22768
2020-08-06 15:14:16 +01:00
Andy Wilkinson
11d1002f15 Merge branch '2.2.x' into 2.3.x
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson
07699ea6ff Retry when dependency resolution fails in ModifiedClassPathClassLoader
Closes gh-22763
2020-08-06 15:12:20 +01:00
Brian Clozel
4ef08425e6 Require RSocket 1.0+
This commit removes usage of methods and classes that were previously
deprecated in RSocket and Spring Framework and have been removed.

Closes gh-22764
2020-08-06 16:10:43 +02:00
Andy Wilkinson
4b17bfd889 Merge branch '2.3.x' 2020-08-06 13:34:31 +01:00
Andy Wilkinson
327138c227 Merge branch '2.2.x' into 2.3.x 2020-08-06 13:34:12 +01:00
Andy Wilkinson
63f7c75b61 Polish 2020-08-06 13:34:01 +01:00
Andy Wilkinson
079b5d3f50 Polish Gradle plugin after layering being enabled by default
Closes gh-20983
2020-08-06 11:37:09 +01:00
Brian Clozel
9f558181d5 Instrument SpringBootApplication for ApplicationStartup
This commit allows the configuration of a custom `ApplicationStartup`
implementation on the `SpringApplication` and
`SpringApplicationBuilder` for collecting `StartupStep` metrics.

This also instruments Spring Boot run listeners and server-specific
application context implementations for collecting Spring Boot
application events during startup.

Closes gh-22600
2020-08-06 12:08:02 +02:00
Andy Wilkinson
5cc5baa303 Starting building against Spring AMQP 2.3.0-M2 snapshots
See gh-22761
2020-08-06 10:51:44 +01:00
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