Andy Wilkinson
399d0f7b95
Merge branch '2.3.x'
...
Closes gh-21651
2020-06-02 09:42:34 +01:00
Andy Wilkinson
f0bc8ee73c
Fix version placeholder replacement in Gradle plugin docs
...
Closes gh-21640
2020-06-02 08:59:14 +01:00
Phillip Webb
ac9482d463
Merge branch '2.3.x'
...
Closes gh-21649
2020-06-01 21:21:20 -07:00
Phillip Webb
7104d8d81e
Polish
2020-06-01 21:20:45 -07:00
Phillip Webb
fc4efe3bf0
Fix Maven plugin help support
...
Update `MavenPluginPlugin` to fix HelpMojo support.
Closes gh-21556
2020-06-01 21:20:45 -07:00
Madhura Bhave
dcd83ec616
Merge branch '2.3.x'
2020-06-01 15:16:14 -07:00
Madhura Bhave
1f28141f3e
Use the right property in test
2020-06-01 15:15:53 -07:00
Phillip Webb
c6b3db542a
Merge branch '2.3.x'
...
Closes gh-21646
2020-06-01 15:08:10 -07:00
Phillip Webb
4dff0beb80
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21645
2020-06-01 15:07:26 -07:00
Phillip Webb
ad73daf5bc
Merge branch '2.3.x'
...
Closes gh-21644
2020-06-01 15:06:01 -07:00
Phillip Webb
14e6c734a9
Merge branch '2.1.x' into 2.2.x
...
Closes gh-21643
2020-06-01 14:45:39 -07:00
Phillip Webb
502e2a4c64
Polish
2020-06-01 14:27:39 -07:00
Phillip Webb
95031295b9
Restore TomcatReactiveWebServerFactoryTests
...
Restore tests that were previously ignored due to a framework bug.
Closes gh-19702
2020-06-01 14:19:20 -07:00
Madhura Bhave
d3f72326d0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21642
2020-06-01 13:49:59 -07:00
Madhura Bhave
573cb98d90
Make management security configuration back off when SAML present
...
Fixes gh-21620
2020-06-01 13:39:46 -07:00
Andy Wilkinson
8f8bee7ccd
Merge branch '2.3.x'
...
Closes gh-21641
2020-06-01 17:48:48 +01:00
Andy Wilkinson
3d143e59e7
Fix inclusion of version-specific content in Gradle plugin's docs
...
Fixes gh-21610
2020-06-01 17:47:42 +01:00
Andy Wilkinson
acd7961127
Merge branch '2.3.x'
...
Closes gh-21639
2020-06-01 16:45:54 +01:00
Andy Wilkinson
b1777b9dee
Use stable file repository for testing snapshot layers
...
Closes gh-21629
2020-06-01 16:28:33 +01:00
Andy Wilkinson
84545a2baa
Merge branch '2.3.x'
...
Closes gh-21637
2020-06-01 13:17:23 +01:00
Andy Wilkinson
d995149b21
Support new version scheme in forward-merge hook
...
Closes gh-21636
2020-06-01 13:16:50 +01:00
Andy Wilkinson
37c6618510
Fix pattern for spring-boot-tools' name predicate
...
Closes gh-21634
2020-06-01 12:46:07 +01:00
Andy Wilkinson
d08d076fd8
Merge pull request #21612 from dreis2211
...
* gh-21612:
Update some references to 2.4.x where appropriate
Closes gh-21612
2020-06-01 08:26:19 +01:00
dreis2211
e1dc730388
Update some references to 2.4.x where appropriate
...
See gh-21612
2020-06-01 08:07:40 +01:00
Phillip Webb
1defd67347
Request only genuine pull-requests are submitted
...
Update `PULL_REQUEST_TEMPLATE` with an attempt to persuade people not
to use our repo as a GitHub playground.
2020-05-29 17:59:44 -07:00
Scott Frederick
687b9b0353
Merge branch '2.3.x'
...
Fixes gh-21554 in 2.4.0-M1
2020-05-29 12:48:50 -05:00
Scott Frederick
7722394e19
Provide better error message if Docker is not running
...
Previously, if the Spring Boot build plugins got a connection error
when attempting to communicate with a Docker daemon (for example,
when the daemon isn't running), the error message made it appear that
the daemon returned an HTTP error code. This commit makes a connection
error distinct from an HTTP error response code to make it easier for
the user to diagnose the root cause of the problem.
Fixes gh-21554
2020-05-29 12:37:06 -05:00
Andy Wilkinson
685b2796f0
Merge branch '2.3.x'
2020-05-28 13:25:07 +01:00
Andy Wilkinson
8e8548756e
Start work on Spring Boot 2.4
2020-05-28 10:52:18 +01:00
Andy Wilkinson
d3ef6f2382
Prepare 2.3.x branch
2020-05-28 09:56:01 +01:00
Phillip Webb
a84b7bccf1
Merge branch '2.2.x'
2020-05-27 19:19:51 -07:00
Phillip Webb
14c9804c5c
Fix checkstyle issues
2020-05-27 19:19:11 -07:00
Phillip Webb
1c3f147c1e
Merge branch '2.2.x'
...
Closes gh-21598
2020-05-27 16:47:40 -07:00
Phillip Webb
af90604030
Merge branch '2.1.x' into 2.2.x
...
Closes gh-21597
2020-05-27 16:45:08 -07:00
Phillip Webb
587b840666
Restrict use of custom YAML types
...
Update `YamlJsonParser` and `OriginTrackedYamlLoader` to ensure that
custom types cannot be loaded.
Closes gh-21596
2020-05-27 16:36:46 -07:00
Andy Wilkinson
2ff2d52509
Ignore irrelevant changes to StarterMetadata's dependencies
...
Closes gh-21594
2020-05-27 20:21:08 +01:00
Andy Wilkinson
b50b00d629
Use sorted properties to ensure output is repeatable
...
Closes gh-21593
2020-05-27 20:14:36 +01:00
Andy Wilkinson
343e4d4318
Use a separate task to extract legal files to be included in jars
...
Previously, the files were extracted on the fly and written into the
jars. This didn't work well with Gradle's up-to-date checks as the
inputs of the jar task were not well-defined.
This commit moves the extraction of the notice and license files into
a separate task, the outputs of which are then copied into the jar's
META-INF.
Closes gh-21592
2020-05-27 20:08:54 +01:00
Andy Wilkinson
f17f1255a4
Do not change availability on close unless context is active
...
Previously, an AvailabilityChangeEvent was published when the servlet
and reactive web server application contexts were closed, irrespective
of whether or not the context was active. This caused problems when
the context was not active due to a refresh failure as the event
publication could then trigger bean creation and post-processing that
relied upon beans that had been destroyed when cleaning up after the
refresh failure. The most commonly seen symptom was a missing
importRegistry bean that is required by ImportAwareBeanPostProcessor.
This commit updates the two web server application contexts to only
publish the availability change event if the context is active.
Fixes gh-21588
2020-05-27 20:05:45 +01:00
Stephane Nicoll
b5673db6fa
Fix dependency management for Kafka
...
Kafka 2.5 no longer provides artifacts for Scala 2.11
Closes gh-21589
2020-05-27 16:11:24 +02:00
Stephane Nicoll
4317b29b9a
Tolerate change in method format
...
This commit polishes the assertions of the NoSuchMethodError failure
analyzer as the method format changes according to the JDK.
See gh-21587
2020-05-27 15:25:50 +02:00
Stephane Nicoll
840b029f10
Merge pull request #21581 from dreis2211
...
* pr/21581:
Upgrade to Testcontainers 1.14.2
Closes gh-21581
2020-05-27 15:00:03 +02:00
dreis2211
b498d3903f
Upgrade to Testcontainers 1.14.2
...
See gh-21581
2020-05-27 14:49:09 +02:00
Stephane Nicoll
35121f182e
Harmonize Period conversion support
...
Closes gh-21574
2020-05-27 14:48:32 +02:00
Andy Wilkinson
744b4d7c26
Include type hierarchy in NoSuchMethodError failure analysis
...
Closes gh-21587
2020-05-27 11:00:10 +01:00
Stephane Nicoll
1975cf498c
Merge pull request #21579 from OrangeDog
...
* pr/21579:
Polish "Polish duration support javadoc"
Polish duration support javadoc
Closes gh-21579
2020-05-26 18:26:05 +02:00
Stephane Nicoll
b21c09020d
Polish "Polish duration support javadoc"
...
See gh-21579
2020-05-26 18:21:18 +02:00
OrangeDog
1a87fce416
Polish duration support javadoc
...
See gh-21579
2020-05-26 18:12:11 +02:00
Stephane Nicoll
9cf448863a
Restore RestClientBuilderCustomizer in its original location
...
This commit restores RestClientBuilderCustomizer in the rest package in
a deprecated fashion so that the upgrade from 2.2 is smoother.
Closes gh-21572
2020-05-26 16:55:09 +02:00
Andy Wilkinson
ba23368440
Configure attributes on productionRuntimeClasspath
...
Previously, the productionRuntimeClasspath configuration was created
without any attributes. This caused problems with multi-project
dependency resolution as there was insufficient information for Gradle
to determine which variant of a dependency should be used by the
productionRuntimeClasspath configuration.
This commit updates the configuration to have three attributes, each
configured with the same values as those of Gradle's own
runtimeClasspathConfiguration.
Fixes gh-21549
2020-05-26 15:12:21 +01:00