309e9d4d0a
Upgrade to AppEngine SDK 1.9.81
...
Closes gh-22785
2020-08-07 09:57:53 +01:00
66fa39355d
Upgrade to ActiveMQ 5.16.0
...
Closes gh-22784
2020-08-07 09:57:52 +01:00
d1a0d9f11b
Merge branch '2.3.x'
...
Closes gh-22783
2020-08-07 09:51:32 +01:00
8f27ad9726
Remove version from name of Ant-built jar
...
Previously, the project version was included in the name of the
Ant-built jar and the integration test assumed that there would be a
single jar in the output directory. This assumption did not hold true
if the project's version had changed and the project had been built
again without a clean. This resulted in two jars, one for the previous
version and one for the current version, in the output directory. This
caused a test failure.
This commit updates the build.xml to remove the version from the name
of the Ant-built jar and updates the integration test to find it.
Closes gh-22782
2020-08-07 09:49:14 +01:00
915c3ec712
Merge branch '2.3.x'
...
Closes gh-22781
2020-08-07 09:44:33 +01:00
95b504ccad
Make processResources out-of-date on version change
...
Closes gh-22780
2020-08-07 09:44:16 +01:00
6d82e9e97f
Merge branch '2.3.x'
...
Closes gh-22775
2020-08-06 18:00:05 -07:00
3f82ca40e2
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22774
2020-08-06 17:59:30 -07:00
f39f33bb8d
Fix documentation related to the health endpoint's inner details
...
Closes gh-22490
2020-08-06 17:57:56 -07:00
f8c8b65cbf
Add ConfigDataEnvironmentPostProcessor.applyTo
...
Add static methods to `ConfigDataEnvironmentPostProcessor` so that
post-processing can be applied to `Environment` instances directly.
Closes gh-22601
2020-08-06 14:35:43 -07:00
f7f4ff0ac9
Update copyright year of changed files
2020-08-06 14:35:43 -07:00
dfd233cada
Polish
2020-08-06 14:35:43 -07:00
1692899cd0
Merge branch '2.3.x'
2020-08-06 18:18:15 +01:00
d064ccabc4
Ensure Maven plugin descriptor inputs are out-of-date on version change
...
Closes gh-22766
2020-08-06 18:18:04 +01:00
782adc5f5f
Merge branch '2.3.x'
...
Closes gh-22772
2020-08-06 18:17:36 +01:00
8d06b0f368
Merge branch '2.3.x'
2020-08-06 10:15:36 -07:00
4924573074
Merge branch '2.2.x' into 2.3.x
2020-08-06 10:15:22 -07:00
fdd6a89a61
Polish
2020-08-06 10:14:01 -07:00
dac63fc3e5
Polish
2020-08-06 17:35:01 +02:00
a495b83b25
Ensure Maven plugin descriptor inputs are out-of-date on version change
...
Closes gh-22766
2020-08-06 16:25:45 +01:00
8b3f8a6138
Merge branch '2.3.x'
...
Closes gh-22768
2020-08-06 15:14:16 +01:00
11d1002f15
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22767
2020-08-06 15:13:55 +01:00
07699ea6ff
Retry when dependency resolution fails in ModifiedClassPathClassLoader
...
Closes gh-22763
2020-08-06 15:12:20 +01:00
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
4b17bfd889
Merge branch '2.3.x'
2020-08-06 13:34:31 +01:00
327138c227
Merge branch '2.2.x' into 2.3.x
2020-08-06 13:34:12 +01:00
63f7c75b61
Polish
2020-08-06 13:34:01 +01:00
079b5d3f50
Polish Gradle plugin after layering being enabled by default
...
Closes gh-20983
2020-08-06 11:37:09 +01:00
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
5cc5baa303
Starting building against Spring AMQP 2.3.0-M2 snapshots
...
See gh-22761
2020-08-06 10:51:44 +01:00
792c4f46ef
Merge branch '2.3.x'
...
Closes gh-22759
2020-08-06 09:22:11 +01:00
c121f9f61f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22758
2020-08-06 09:21:29 +01:00
b53f54f2cf
Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
...
Closes gh-22281
2020-08-06 09:21:11 +01:00
1864f47db8
Upgrade Java 15 version in CI image
...
Closes gh-22753
2020-08-06 09:41:42 +02:00
1afbf77f29
Upgrade Java 8 version in CI image
...
Closes gh-22756
2020-08-06 09:40:41 +02:00
774bca065d
Merge branch '2.3.x'
2020-08-06 09:40:15 +02:00
235f5e1103
Upgrade Java 8 version in CI image
...
Closes gh-22754
2020-08-06 09:39:38 +02:00
895383e182
Merge branch '2.2.x' into 2.3.x
2020-08-06 09:39:05 +02:00
6232ece61d
Upgrade Java 8 version in CI image
...
Closes gh-22752
2020-08-06 09:38:19 +02:00
63718d4e72
Merge branch '2.1.x' into 2.2.x
2020-08-06 09:37:55 +02:00
64264b5240
Upgrade Java 8 version in CI image
...
Closes gh-22755
2020-08-06 09:37:04 +02:00
f0ef47dfad
Fix additional deprecations
2020-08-05 15:09:51 -07:00
0d79bd08a6
Fix deprecations
2020-08-05 15:01:44 -07:00
5f386e456b
Fix test
2020-08-05 14:59:27 -07:00
b9abcf1615
Fail hard if spring.profiles.include is used with new config processing
...
Closes gh-22693
2020-08-05 14:41:32 -07:00
e719a246df
Upgrade to Spring Security 5.4.0-RC1
...
Closes gh-22668
2020-08-05 21:33:36 +02:00
9c417d280c
Merge branch '2.3.x'
...
Closes gh-22749
2020-08-05 18:15:59 +01:00
a160755da5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22748
2020-08-05 18:15:45 +01:00
bfe250e5d3
Clarify docs on schema and data SQL scripts with Flyway and Liquibase
...
Closes gh-20920
2020-08-05 18:14:39 +01:00
0e83b2f4c4
Merge branch '2.3.x'
...
Closes gh-22747
2020-08-05 17:47:38 +01:00
Andy Wilkinson
Madhura Bhave
Phillip Webb
Stephane Nicoll
Brian Clozel