Commit Graph

26679 Commits

Author SHA1 Message Date
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
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
Stephane Nicoll
069c31a074 Map connection and read timeouts for New Relic again
Closes gh-21440
2020-05-26 15:20:33 +02:00
Stephane Nicoll
53bf65df47 Merge branch '2.2.x'
Closes gh-21563
2020-05-25 15:30:43 +02:00
Stephane Nicoll
6a00ccf60c Merge pull request #21540 from BramDeCneudt
* pr/21540:
  Fix links for Apache Camel starter

Closes gh-21540
2020-05-25 15:30:30 +02:00
Bram De Cneudt
591d234e43 Fix links for Apache Camel starter
See gh-21540
2020-05-25 15:28:40 +02:00
Stephane Nicoll
5a290e7305 Merge pull request #21492 from making
* pr/21492:
  Fix default value for spring.data.jpa.repositories.bootstrap-mode

Closes gh-21492
2020-05-25 15:12:13 +02:00
Toshiaki Maki
b4817c85b1 Fix default value for spring.data.jpa.repositories.bootstrap-mode
See gh-21492
2020-05-25 15:11:17 +02:00
Stephane Nicoll
b9a1a70fcc Merge branch '2.2.x'
Closes gh-21562
2020-05-25 14:59:19 +02:00
Stephane Nicoll
a657c97ce8 Merge pull request #21480 from olamy
* pr/21480:
  Polish "Use the container IP address for tests using TestContainer"
  Use the container IP address for tests using TestContainer

Closes gh-21480
2020-05-25 14:39:43 +02:00
Stephane Nicoll
77981ac2ae Polish "Use the container IP address for tests using TestContainer"
See gh-21480
2020-05-25 14:29:24 +02:00
olivier lamy
0c2bf70bb8 Use the container IP address for tests using TestContainer
See gh-21480
2020-05-25 14:03:18 +02:00
Stephane Nicoll
1d2d76b051 Merge branch '2.2.x'
Closes gh-21560
2020-05-25 13:52:10 +02:00
Stephane Nicoll
afcb5d54b2 Polish "Fix uri tag for empty path"
See gh-21392
2020-05-25 13:51:40 +02:00
Stephane Nicoll
3f372824ea Merge pull request #21392 from jkschneider
* pr/21392:
  Fix uri tag for empty path

Closes gh-21392
2020-05-25 13:48:24 +02:00
Jon Schneider
f78f2d57e1 Fix uri tag for empty path
See gh-21392
2020-05-25 13:41:19 +02:00
Brian Clozel
18e0db6326 Document health probes config property in Actuator section
This commit mentions the `management.health.probes.enabled`
configuration property in the Kubernetes Probes section of the Actuator
chapter.

Enabling this property is required if we need to expose Kubernetes
Probes in a non-Kubernetes environment.

Fixes gh-21505
2020-05-22 22:23:41 +02:00
Brian Clozel
a12a3054c9 Optimize UrlPathHelper configuration for Spring MVC
Prior to this commit, Spring Boot would auto-configure Spring MVC and
would keep the default `UrlPathHelper` configuration.
Since Spring Boot is in charge of configuring the `DispatcherServlet`
and its mapping, it is in a position to optimally configure the
`UrlPathHelper` depending on the chosen mapping.

This commit sets the `alwaysUseFullPath` property of `UrlPathHelper` if
the Servlet mapping is `"/"`. This is more efficient since this
configuration requires less processing of the request path.

Closes gh-21499
2020-05-22 18:50:24 +02:00
Brian Clozel
525e03d3b5 Add welcome page support for Spring WebFlux
This commit adds the support for static and templated welcome pages with
Spring WebFlux. The implementation is backed by a `RouterFunction`
that's serving a static `index.html` file or rendering an `index` view.

Closes gh-9785
2020-05-22 14:20:06 +02:00
Scott Frederick
ed4a7d4ba0 Use default tag when pulling run image
Prior to this commit, a default tag of 'latest' was used when no tag
was included in the builder image name used when building an image in
the Maven and Gradle plugins, but the tag for the run image was left
empty if it was not provided. This resulted in errors when pulling
the run image from an image repository. This commit applies the
same tag defaulting logic to the run image name.

Fixes gh-21532
2020-05-21 17:28:59 -05:00
Madhura Bhave
146ebf107c Merge branch '2.2.x'
Closes gh-21529
2020-05-20 17:42:39 -07:00
Madhura Bhave
398c80fb69 Merge pull request #21485 from FrontierPsychiatrist
* pr/21485:
  Fix typo in section 4.30.6

Closes gh-21485
2020-05-20 17:42:08 -07:00
Moritz do Rio Schulze
1e168a2145 Fix typo in section 4.30.6
See gh-21485
2020-05-20 17:41:50 -07:00
Madhura Bhave
c308591de3 Merge pull request #21509 from dreis2211
* pr/21509:
  Avoid allocations in ConfigFileApplicationListener

Closes gh-21509
2020-05-20 17:38:47 -07:00
dreis2211
62deec715f Avoid allocations in ConfigFileApplicationListener
See gh-21509
2020-05-20 17:38:17 -07:00
Madhura Bhave
72ebefba0c Merge branch '2.2.x'
Closes gh-21524
2020-05-20 15:30:53 -07:00
Madhura Bhave
831bb1f206 Merge branch '2.1.x' into 2.2.x
Closes gh-21526
2020-05-20 15:29:50 -07:00
Madhura Bhave
bce48ea745 Upgrade CI to Docker 19.03.9
Closes gh-21525
2020-05-20 15:29:02 -07:00
Madhura Bhave
7e5fbdd2e8 Merge branch '2.2.x'
Closes gh-21528
2020-05-20 14:38:09 -07:00
Madhura Bhave
808cb98b98 Merge branch '2.1.x' into 2.2.x
Closes gh-21527
2020-05-20 14:35:27 -07:00