root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
32,741 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

1735 Commits

Author SHA1 Message Date
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll 548baf7914 Update copyright year of changed file 
See gh-26145
 2021-04-19 09:34:56 +02:00
izeye 996472b42d Polish 
See gh-26145
 2021-04-19 09:34:55 +02:00
Phillip Webb b4c9bb0d5c Merge branch '2.4.x' 
Closes gh-26122
 2021-04-14 15:05:55 -07:00
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26121
 2021-04-14 15:02:58 -07:00
Phillip Webb fcb2210a87 Include optional shade plugin in published pom 
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
 2021-04-14 15:02:42 -07:00
Andy Wilkinson b0cce645dd Use a non-deprecated class to identify kotlin-gradle-plugin-api jar 
See gh-26080
 2021-04-13 20:29:36 +01:00
Andy Wilkinson 6f2b4aa685 Upgrade to Kotlin 1.5.0-RC 
Closes gh-26080
Closes gh-25498
 2021-04-13 19:51:03 +01:00
Andy Wilkinson c4750fd0ff Support Gradle 7 and raise minimum supported version to 6.8 
Closes gh-26026
 2021-04-12 15:20:32 +01:00
dreis2211 db79fe8b2c Test our Gradle Plugin against Gradle 7.0 
See gh-25997
 2021-04-10 10:48:44 +02:00
Scott Frederick 5bc35e8f44 Extract XML example from Maven plugin adoc file 
See gh-25993
 2021-04-09 14:22:51 -05:00
Scott Frederick e27d4848dd Merge branch '2.4.x' 
Closes gh-25993
 2021-04-09 14:12:36 -05:00
Scott Frederick 6a7f1f1c56 Merge branch '2.3.x' into 2.4.x 
Closes gh-25992
 2021-04-09 14:11:47 -05:00
Scott Frederick e19443093d Document runtime JVM configuration when building an image 
Fixes gh-21478
 2021-04-09 14:06:24 -05:00
Scott Frederick 86303c017b Merge branch '2.4.x' 
Closes gh-25938
 2021-04-08 13:03:45 -05:00
Scott Frederick 9108b81bb2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25937
 2021-04-08 13:03:26 -05:00
Scott Frederick 0ad7f76263 Preserve file permissions in images built by Gradle 
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
 2021-04-08 12:56:41 -05:00
Andy Wilkinson 8b5f914ba5 Revert "Merge branch '2.4.x'" 
This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840
 2021-04-07 10:20:23 +01:00
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
 2021-04-07 10:19:20 +01:00
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests" 
This reverts commit da9d8d6055.

See gh-25838
 2021-04-07 09:30:51 +01:00
Phillip Webb 807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Andy Wilkinson 095ff18854 Test our Gradle plugin against Gradle 7.0-rc-2 
Closes gh-25888
 2021-04-06 10:30:35 +01:00
Scott Frederick 5595fb2423 Polish "Extract XML examples from Maven plugin adoc files" 
See gh-25534
 2021-03-31 14:05:11 -05:00
robert-smith-911 4e287594bf Extract XML examples from Maven plugin adoc files 
See gh-25534
 2021-03-31 14:05:10 -05:00
Scott Frederick 97b26b4886 Merge branch '2.4.x' 
Closes gh-25840
 2021-03-30 21:00:38 -05:00
Scott Frederick 586ce00e06 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-03-30 17:39:10 -05:00
Scott Frederick da9d8d6055 Use test harness for image building integration tests 
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
 2021-03-30 16:48:28 -05:00
Andy Wilkinson 6f9b1ed6a3 Merge branch '2.4.x' 
See gh-25837
 2021-03-30 20:52:38 +01:00
Andy Wilkinson 563b8a8cec Merge branch '2.3.x' into 2.4.x 
See gh-25836
 2021-03-30 20:52:15 +01:00
Andy Wilkinson e94f8bba62 Ensure that upstream jars have been built 
See gh-25835
 2021-03-30 20:51:33 +01:00
Andy Wilkinson df4b1ffb0d Merge branch '2.4.x' 
Closes gh-25837
 2021-03-30 20:42:41 +01:00
Andy Wilkinson 38a4f135a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-25836
 2021-03-30 20:42:29 +01:00
Andy Wilkinson ca9a619259 Defer processing of zipTree source until execution time 
Closes gh-25835
 2021-03-30 20:41:46 +01:00
Andy Wilkinson 09173b81d6 Merge branch '2.4.x' 
Closes gh-25833
 2021-03-30 18:18:36 +01:00
Andy Wilkinson 7a846ad41f Merge branch '2.3.x' into 2.4.x 
Closes gh-25832
 2021-03-30 18:18:10 +01:00
Andy Wilkinson 5a086321c6 Polish "Document Failsafe configuration when not using starter parent" 
See gh-25621
 2021-03-30 18:16:21 +01:00
robert-smith-911 0d79fd3e01 Document Failsafe configuration when not using starter parent 
See gh-25621
 2021-03-30 18:02:12 +01:00
Phillip Webb 8c31d29acf Merge branch '2.4.x' 2021-03-30 09:29:59 -07:00
Phillip Webb a28a3ae090 Merge branch '2.3.x' into 2.4.x 2021-03-30 09:25:46 -07:00
Phillip Webb 9c8a97809d Consistent use of @deprecated since 
Restore the patch version number for consistency with `@since`
tags.

See gh-25808
 2021-03-30 09:20:30 -07:00
Phillip Webb c9451b59f2 Merge branch '2.4.x' 2021-03-29 15:51:23 -07:00
Phillip Webb a0f5169966 Polish 2021-03-29 15:51:13 -07:00
Phillip Webb 44b1751bb4 Merge branch '2.4.x' 
Closes gh-25826
 2021-03-29 15:48:20 -07:00
Phillip Webb 363f5829d1 Merge branch '2.3.x' into 2.4.x 
Closes gh-25825
 2021-03-29 15:46:50 -07:00
Phillip Webb 26dd1b9a26 Update deprecations with for removal targets 
Update all deprecation tags to include a removal target.

Closes gh-25808
 2021-03-29 15:44:58 -07:00
Scott Frederick 269fc68c1d Merge branch '2.4.x' 
Closes gh-25811
 2021-03-26 16:43:13 -05:00
Scott Frederick 4015d70f00 Merge branch '2.3.x' into 2.4.x 
Closes gh-25789
 2021-03-26 15:16:01 -05:00
dreis2211 a9a37f0dd5 Increase test coverage on Java 16 
See gh-25809
 2021-03-26 19:38:54 +00:00
Scott Frederick 3ad5f1013a Fix Maven image building with classifiers 
Fixes gh-25736
 2021-03-26 11:36:38 -05:00
Andy Wilkinson 340893747b Merge branch '2.4.x' 
Closes gh-25799
 2021-03-25 15:50:45 +00:00
Andy Wilkinson af7e4e211c Support all known endpoint types 
Previously, the configuration metadata annotation processor only
declared support for `@Endpoint` and none of the other more
specialized `@…Endpoint` annotations that are meta-annotated with
`@Endpoint` such as `@WebEndpoint` and `@JmxEndpoint. This would
result in missing metadata if a full or incremental build only
compiled classes annotated with one of the more specialized
`@…Endpoint` annotations as the annotation processor would not be
called.

This commit updates the processor's supported annotation types to
include every known `@…Endpoint` annotation. The test processor has
also been similarly updated to align its behaviour with that of the
main processor.

Fixes gh-25388
 2021-03-25 15:23:09 +00:00
Phillip Webb deaff1a522 Merge branch '2.4.x' 
Closes gh-25775
 2021-03-23 17:08:18 -07:00
Phillip Webb ca9fae6b47 Merge branch '2.3.x' into 2.4.x 
Closes gh-25774
 2021-03-23 17:07:44 -07:00
Phillip Webb ec21202d54 Delete unpacked jars when the JVM exits 
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.

Closes gh-25773
 2021-03-23 17:06:56 -07:00
Phillip Webb 05f61bccea Align unpack logic with Files.createTempDirectory 
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.

Closes gh-25772
 2021-03-23 17:06:56 -07:00
Phillip Webb b8873578ca Add missing @Deprecated annotations 2021-03-23 17:06:53 -07:00
Phillip Webb 77ddb45704 Merge branch '2.4.x' 2021-03-23 12:53:59 -07:00
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb 82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Andy Wilkinson ca46fe7cd0 Test our Gradle plugin against Gradle 7.0-rc-1 
Closes gh-25763
 2021-03-23 10:41:43 +00:00
Scott Frederick 2dd4010eb0 Merge branch '2.4.x' 
Closes gh-25701
 2021-03-19 15:58:14 -05:00
Scott Frederick 6f860b441b Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-19 14:52:20 -05:00
Andy Wilkinson fb670ee654 Drop support for Gradle 5.6.x 
Closes gh-24225
 2021-03-19 17:30:27 +00:00
Andy Wilkinson 83342c7aa7 Test the Gradle plugin against 7.0-milestone-3 
Closes gh-25747
 2021-03-19 17:01:38 +00:00
Phillip Webb 663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Phillip Webb 685b045c3d Polish 2021-03-18 14:49:52 -07:00
Scott Frederick e4fa39df01 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-17 15:19:21 -05:00
Andy Wilkinson 67545cf4f1 Polish 2021-03-17 12:39:50 +00:00
Andy Wilkinson 2adf3f836c Merge branch '2.4.x' 2021-03-17 12:25:24 +00:00
Andy Wilkinson c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson 36c72cb6ef Merge branch '2.4.x' 
Closes gh-25716
 2021-03-17 11:33:48 +00:00
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x 
Closes gh-25715
 2021-03-17 11:31:46 +00:00
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked 
Closes gh-25714
 2021-03-17 11:19:29 +00:00
Andy Wilkinson 68e5a107cc Revert "Merge branch '2.4.x'" 
This reverts commit 5488b8cb46, reversing
changes made to dee0df5c53.

See gh-25701
 2021-03-17 11:17:54 +00:00
Andy Wilkinson ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit eaa510872a, reversing
changes made to 3e69522e2d.

See gh-25700
 2021-03-17 11:13:58 +00:00
Andy Wilkinson ae2ff7849b Revert "Fail fast when finalName is misconfigured" 
This reverts commit 263b7c20e4.

See gh-25590
 2021-03-17 11:11:24 +00:00
Scott Frederick 5488b8cb46 Merge branch '2.4.x' 
Closes gh-25701
 2021-03-16 17:48:54 -05:00
Scott Frederick eaa510872a Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-16 17:31:32 -05:00
Scott Frederick 263b7c20e4 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-16 17:22:48 -05:00
Andy Wilkinson ebdb046ca9 Leave jar and war tasks enabled but configured with a classifier 
Closes gh-23797
 2021-03-16 10:31:56 +00:00
Stephane Nicoll e517ee8635 Merge branch '2.4.x' 
Closes gh-25618
 2021-03-13 18:22:57 +01:00
izeye 09f4d4b9bf Polish 
See gh-25617
 2021-03-13 18:08:54 +01:00
Jurrie Overgoor 3c0e236562 Support Maven's reproducible build feature for war repackaging 
See gh-25571
 2021-03-11 11:08:10 +00:00
Phillip Webb 6e5c510e0a Migrate to asciidoctor-spring-backends 
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
 2021-03-08 22:07:17 -08:00
Stephane Nicoll 5a0c3a8497 Merge branch '2.4.x' 
Closes gh-25516
 2021-03-05 15:47:50 +01:00
Stephane Nicoll ddf75f095c Merge branch '2.3.x' into 2.4.x 
Closes gh-25515
 2021-03-05 15:47:36 +01:00
Stephane Nicoll 6ebc69d704 Polish "Include properties in source merge algorithm" 
See gh-25507
 2021-03-05 15:47:09 +01:00
Bertrand Renuart cf4bc6e9e0 Include properties in source merge algorithm 
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
 2021-03-05 15:47:09 +01:00
Andy Wilkinson 2b7f23b29d Merge branch '2.4.x' 
Closes gh-25509
 2021-03-05 10:44:24 +00:00
Andy Wilkinson ac258a95a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25508
 2021-03-05 10:39:52 +00:00
Andy Wilkinson c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path" 
See gh-25505
 2021-03-05 10:13:32 +00:00
trungPa 2993e68715 Prevent extracting zip entries outside of destination path 
See gh-25505
 2021-03-05 10:12:06 +00:00
Stephane Nicoll 76d0a7f8ba Merge branch '2.4.x' 
Closes gh-25506
 2021-03-05 10:03:42 +01:00
dreis2211 89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01:00
Andy Wilkinson 961a34a5ee Merge branch '2.4.x' 
Closes gh-25497
 2021-03-04 19:15:03 +00:00
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16" 
See gh-25171
 2021-03-04 18:54:58 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16 
See gh-25171
 2021-03-04 18:54:56 +00:00
Stephane Nicoll e58353a32d Merge branch '2.4.x' 
Closes gh-25484
 2021-03-03 15:16:58 +01:00
Stephane Nicoll e5d8b6029b Merge branch '2.3.x' into 2.4.x 
Closes gh-25483
 2021-03-03 15:16:08 +01:00
Stephane Nicoll 8e67ae7113 Fix fallback fork value for spring-boot:stop 
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
 2021-03-03 15:15:04 +01:00
Scott Frederick 434db48969 Merge branch '2.4.x' 
Closes gh-25469
 2021-03-01 16:01:12 -06:00
Scott Frederick afb60d6161 Add tests for Gradle examples used in plugin docs 
Fixes gh-25468
 2021-03-01 15:22:15 -06:00
Stephane Nicoll a80f1af811 Merge branch '2.4.x' 
Closes gh-25463
 2021-03-01 10:18:42 +01:00
Stephane Nicoll ed1c68f567 Update copyright year of changed file 
See gh-25454
 2021-03-01 10:06:23 +01:00
jnizet cbab2396e2 Fix property name in gradle plugin documentation 
See gh-25454
 2021-03-01 10:01:52 +01:00
Andy Wilkinson b36caec413 Merge branch '2.4.x' 
Closes gh-25438
 2021-02-25 17:33:00 +00:00
Andy Wilkinson d48551ff12 Merge branch '2.3.x' into 2.4.x 
Closes gh-25437
 2021-02-25 17:32:40 +00:00
Stefan Wolf 86ca32e694 Enable stricter validation for Gradle plugin 
See gh-25409
 2021-02-25 17:28:51 +00:00
Andy Wilkinson 84984fb148 Merge branch '2.4.x' 
Closes gh-25431
 2021-02-25 14:28:41 +00:00
Andy Wilkinson ecf8437d4a Merge branch '2.3.x' into 2.4.x 
Closes gh-25430
 2021-02-25 14:28:28 +00:00
dreis2211 101d88a840 Update Testcontainers image versions 
See gh-25412
 2021-02-25 14:27:41 +00:00
Scott Frederick 4be04b0ea2 Support image building with Maven and war packaging 
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.

Fixes gh-23823
 2021-02-24 15:23:33 -06:00
Scott Frederick a80c4ad38d Support image building with Gradle and war packaging 
This commit updates the Gradle image building task to support building
images from executable and non-executable war files.

Fixes gh-23825
 2021-02-24 14:42:46 -06:00
Andy Wilkinson 9836b060d4 Test the Gradle plugin against 7.0-milestone-2 
Closes gh-25404
 2021-02-24 11:28:45 +00:00
Scott Frederick 76e42ff96f Correct grouping of custom buildpacks 
This commit corrects the order.toml file that is generated and added
to the builder when building an image using custom buildpacks with the
Maven or Gradle plugin in order to support buildpacks that depend on
detection as a group.

Fixes gh-25378
 2021-02-23 13:56:57 -06:00
Scott Frederick 89555a8745 Add bindings option for image building 
This commit adds configuration to the Maven and Gradle plugins to
allow a list of volume mount bindings to be provided to the image
building goal and task. This enables service bindings to be mounted
in the builder image that are recognized by buildpacks to support
custom certificates, build tool configuration, APM integration, and
other buildpack features.

Fixes gh-23518
 2021-02-22 16:51:24 -06:00
Stephane Nicoll 817a4c5397 Merge branch '2.4.x' 
Closes gh-25386
 2021-02-22 10:46:13 +01:00
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x 
Closes gh-25385
 2021-02-22 10:45:55 +01:00
Stephane Nicoll 77daae1480 Update copyright year of changed file 
See gh-25382
 2021-02-22 10:41:49 +01:00
Mustafa Ulu abc90db32f Fix wording error in build-info goal description 
See gh-25382
 2021-02-22 10:26:53 +01:00
Andy Wilkinson a14bf7a3b8 Deprecate support for Gradle's maven plugin 
Closes gh-25267
 2021-02-19 19:29:17 +00:00
Phillip Webb 4ad149e1e7 Protect against bad paths and URLs 
See gh-21722
 2021-02-18 16:23:56 -08:00
Scott Frederick 88e9f1d28c Fix Maven buildpacks example in docs 
See gh-21722
 2021-02-18 18:22:36 -06:00
Scott Frederick e3e229cc3d Remove unused import 
See gh-21722
 2021-02-18 17:39:59 -06:00
Scott Frederick f54f784f80 Add buildpack option for image building 
This commit adds configuration to the Maven and Gradle plugins to
allow a list of buildpacks to be provided to the image building
goal and task.

Fixes gh-21722
 2021-02-18 17:28:25 -06:00
Andy Wilkinson 5618646fc7 Merge branch '2.4.x' 
Closes gh-25308
 2021-02-16 11:30:25 +00:00
Andy Wilkinson b86351d0cf Merge branch '2.3.x' into 2.4.x 
Closes gh-25307
 2021-02-16 11:30:03 +00:00
Andy Wilkinson a2adb877ee Polish "Encourage use of maven-publish plugin in Gradle docs" 
See gh-25299
 2021-02-16 11:22:47 +00:00
Robert Smith c0a5245a3e Encourage use of maven-publish plugin in Gradle docs 
See gh-25299
 2021-02-16 11:19:27 +00:00
Andy Wilkinson 514aede91e Merge branch '2.4.x' 
Closes gh-25168
 2021-02-10 12:20:02 +00:00
Andy Wilkinson 45e6c12cb6 Consider transitives when identifying project dependencies 
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
 2021-02-10 12:10:07 +00:00
Stephane Nicoll c120f789d5 Merge branch '2.4.x' 
Closes gh-25141
 2021-02-09 15:04:58 +01:00
Stephane Nicoll 9218965104 Merge branch '2.3.x' into 2.4.x 
Closes gh-25140
 2021-02-09 15:04:28 +01:00
dreis2211 4937547b8a Fix build deprecation warnings about duplicate jar entries 
See gh-25116
 2021-02-09 14:45:58 +01:00
Andy Wilkinson d30251092b Test the Gradle Plugin against 7.0-milestone-1 
Closes gh-25103
 2021-02-04 10:16:48 +00:00
Andy Wilkinson db781a0d84 Merge branch '2.4.x' 
See gh-25077
 2021-02-02 15:14:18 +00:00
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x 
See gh-25076
 2021-02-02 15:12:27 +00:00
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00
Phillip Webb d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08:00
Phillip Webb 230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb 630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb d8b849e00d Fix test that fails when building against SNAPSHOT 
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.

See gh-23936
 2021-02-01 22:09:04 -08:00
Phillip Webb 1eef2e1b46 Merge branch '2.4.x' 2021-02-01 19:47:11 -08:00
Phillip Webb 331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00
Phillip Webb c404a50a2e Allow test to use snapshot/milestone repo 
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
 2021-02-01 19:45:11 -08:00