Commit Graph

27136 Commits

Author SHA1 Message Date
Andy Wilkinson
07fb4b065d Merge branch '2.3.x'
Closes gh-21940
2020-06-16 10:10:38 +01:00
Andy Wilkinson
0de466e06e Require dependency on s-b-dependencies to use its constraints
Previously, Spring Boot's modules published Gradle Module Metadata
(GMM) the declared a platform dependency on spring-boot-dependencies.
This provided versions for each module's own dependencies but also had
they unwanted side-effect of pulling in spring-boot-dependencies
constraints which would influence the version of other dependencies
declared in the same configuration. This was undesirable as users
should be able to opt in to this level of dependency management, either
by using the dependency management plugin or by using Gradle's built-in
support via a platform dependency on spring-boot-dependencies.

This commit reworks how Spring Boot's build uses
spring-boot-dependencies and spring-boot-parent to provide its own
dependency management. Configurations that aren't seen by consumers are
configured to extend a dependencyManagement configuration that has an
enforced platform dependency on spring-boot-parent. This enforces
spring-boot-parent's version constraints on Spring Boot's build without
making them visible to consumers. To ensure that the versions that
Spring Boot has been built against are visible to consumers, the
Maven publication that produces pom files and GMM for the published
modules is configured to use the resolved versions from the module's
runtime classpath.

Fixes gh-21911
2020-06-16 08:50:21 +01:00
Stephane Nicoll
0c03118a59 Merge branch '2.3.x' 2020-06-16 07:59:15 +02:00
Stephane Nicoll
e30b8bf742 Start building against Reactor Dysprosium-SR9 snapshots
See gh-21938
2020-06-16 07:58:28 +02:00
Stephane Nicoll
a6beee9be3 Merge branch '2.2.x' into 2.3.x 2020-06-16 07:58:06 +02:00
Stephane Nicoll
58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots
See gh-21937
2020-06-16 07:57:31 +02:00
Scott Frederick
838cfc529f Merge branch '2.3.x'
Closes gh-21933
2020-06-15 16:17:39 -05:00
Scott Frederick
6119d69679 Add runImage option for image building
This commit adds a runImage property to the Maven plugin build-image
goal and the Gradle bootBuildImage task. The property allows the user
to override the run image reference provided in the builder metadata
with an alternate run image. The runImage property can be specified
in the build file or on the command line.

Fixes gh-21534
2020-06-15 16:08:56 -05:00
Stephane Nicoll
164a992d6e Fix assertion for startup info format
See gh-21926
2020-06-15 20:17:07 +02:00
Phillip Webb
961b7cdf81 Merge branch '2.3.x' 2020-06-15 10:53:19 -07:00
Phillip Webb
025d7aaac8 Merge branch '2.2.x' into 2.3.x 2020-06-15 10:53:00 -07:00
Phillip Webb
550b2847c5 Merge branch '2.1.x' into 2.2.x 2020-06-15 10:52:50 -07:00
Phillip Webb
b129a3f7fb Check that a distribution has been started
Update the releasescript to ensure that a distribution has been started
before starting it again. This functionality was accidentally removed
during the updates for gh-21474.

See gh-21474
2020-06-15 10:50:06 -07:00
Madhura Bhave
3f323a5eb2 Merge branch '2.3.x' 2020-06-15 09:24:14 -07:00
Madhura Bhave
847d633097 Merge branch '2.2.x' into 2.3.x 2020-06-15 09:23:47 -07:00
Madhura Bhave
0395b186ad Merge branch '2.1.x' into 2.2.x 2020-06-15 09:23:26 -07:00
Madhura Bhave
9d9a90ccd4 Polish 2020-06-15 09:22:14 -07:00
Brian Clozel
33b61e698e Merge branch '2.3.x' 2020-06-15 18:22:05 +02:00
Brian Clozel
a480f6e2ee Polish 2020-06-15 18:21:36 +02:00
Brian Clozel
e438864ad9 Merge branch '2.3.x'
Closes gh-21925
2020-06-15 18:08:51 +02:00
Brian Clozel
af2666df79 Fix welcome page support in WebFlux
Prior to this commit, the welcome page support implemented in gh-9785
would override existing index views in both annotation and functional
variants.

This comes from the fact that the feature was implemented as a
`RouterFunction` configured in the main `RouterFunctionMapping` bean.
Due to ordering issues between mappings, this would override existing
application mappings in some cases.

This commit ensures that the welcome page `RouterFunction` is
contributed to the context in its own handler mapping, ordered after the
application ones.

Fixes gh-21909
2020-06-15 18:03:55 +02:00
Stephane Nicoll
75dd965856 Merge pull request #21713 from dreis2211
* pr/21713:
  Polish "Add Java 15 CI"
  Add Java 15 CI
  Allow StringSequence.isEmpty() to be compatible with JDK 15
  Use Class.getName() as fallback in HandlerFunctionDescription

Closes gh-21713
2020-06-15 17:09:23 +02:00
Stephane Nicoll
e87c3193ce Polish "Add Java 15 CI"
See gh-21713
2020-06-15 17:08:12 +02:00
dreis2211
85218db222 Add Java 15 CI
See gh-21713
2020-06-15 17:05:54 +02:00
dreis2211
3d27391d47 Allow StringSequence.isEmpty() to be compatible with JDK 15
JDK 15 introduces isEmpty() on CharSequence which clashes with the one
declared in StringSequence because it is not public.

See gh-21713
2020-06-15 16:46:16 +02:00
dreis2211
cf3cd0be48 Use Class.getName() as fallback in HandlerFunctionDescription
In JDK 15 the concept of hidden classes was introduced, which also
affects Lambdas in so far that Class.getCanonicalName() will return null
for those. This commit uses Class.getName() as a fallback when no
canonical name is available.

See gh-21713
2020-06-15 16:45:59 +02:00
Stephane Nicoll
9e2902130c Polish 2020-06-15 16:34:34 +02:00
Stephane Nicoll
ac0f175c57 Merge pull request #21533 from RadekKoubsky
* pr/21533:
  Polish "Add support for webAdminPassword property of H2 Console"
  Add support for webAdminPassword property of H2 Console

Closes gh-21533
2020-06-15 16:24:26 +02:00
Stephane Nicoll
bf96b0c57b Polish "Add support for webAdminPassword property of H2 Console"
See gh-21533
2020-06-15 16:19:56 +02:00
Radek Koubsky
1d40234737 Add support for webAdminPassword property of H2 Console
See gh-21533
2020-06-15 16:19:40 +02:00
Stephane Nicoll
776cd08f31 Merge pull request #20887 from adutra
* pr/20887:
  Polish "Add health indicator for Cassandra that uses the CqlSession"
  Add health indicator for Cassandra that uses the CqlSession

Closes gh-20887
2020-06-15 11:13:18 +02:00
Stephane Nicoll
35e069e2cd Polish "Add health indicator for Cassandra that uses the CqlSession"
See gh-20887
2020-06-15 11:13:13 +02:00
Alexandre Dutra
dad9ec86d5 Add health indicator for Cassandra that uses the CqlSession
This commit provides a CassandraDriverHealthIndicator and
CassandraDriverReactiveHealthIndicator that do not require Spring Data.
As a result, a health indicator for Cassandra is provided even if the
application does not use Spring Data.

See gh-20887
2020-06-15 11:13:13 +02:00
Andy Wilkinson
78a9cdcee1 Merge pull request #21912 from eddumelendez
* gh-21912:
  Polish "Fix detection of snapshot version when configuring repositories"
  Fix detection of snapshot version when configuring repositories

Closes gh-21912
2020-06-15 09:19:36 +01:00
Andy Wilkinson
2990b69693 Polish "Fix detection of snapshot version when configuring repositories"
See gh-21912
2020-06-15 09:19:09 +01:00
Eddú Meléndez
20f05f4d82 Fix detection of snapshot version when configuring repositories
As part of 8e8548756e, snapshot dependency resolution change from
`BUILD-SNAPSHOT` to `-SNAPSHOT`. Currently, if we add a version
dependency which is store in snapshots it is not resolved. This
commit allow to resolves plugins and dependencies.

See gh-21912
2020-06-15 09:17:44 +01:00
Stephane Nicoll
ce4ef5ed81 Merge branch '2.3.x'
Closes gh-21918
2020-06-15 09:19:15 +02:00
Stephane Nicoll
7500f0f22d Add section about Kafka metrics support
Closes gh-21910
2020-06-15 09:18:40 +02:00
Stephane Nicoll
554971d29b Merge branch '2.3.x'
Closes gh-21917
2020-06-15 08:42:13 +02:00
Stephane Nicoll
ee250e058a Merge branch '2.2.x' into 2.3.x
Closes gh-21916
2020-06-15 08:41:44 +02:00
Stephane Nicoll
04639d3387 Merge pull request #21906 from lltx
* pr/21906:
  Update copyright year of changed files
  Fix wrong property reference to keys-to-sanitize in Javadoc

Closes gh-21906
2020-06-15 08:40:02 +02:00
Stephane Nicoll
ec8c1e3860 Update copyright year of changed files
See gh-21906
2020-06-15 08:39:51 +02:00
lltx
de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc
See gh-21906
2020-06-15 08:39:51 +02:00
Stephane Nicoll
631a5dddd1 Merge branch '2.3.x'
Closes gh-21915
2020-06-15 08:35:53 +02:00
Stephane Nicoll
676cd10dbf Fix encoding of @Bean in reference documentation
Closes gh-21908
2020-06-15 08:32:26 +02:00
Phillip Webb
9eb251a8f3 Merge branch '2.3.x'
Closes gh-21904
2020-06-12 10:50:46 -07:00
Phillip Webb
1604545727 Ensure AvailabilityChangeEvent carries generics
Update `AvailabilityChangeEvent` to be a `PayloadEvent` and ensure
that the `getResolvableType` method returns a generic compatible
result.

Prior to this commit, a ClassCastExeption would be thrown if the
following event listener was declared:

  @EventListener
  void onEvent(AvailabilityChangeEvent<ReadinessState> event) {
    ...
  }

Closes gh-21898
2020-06-12 10:50:00 -07:00
Phillip Webb
1c6416ecd4 Merge branch '2.3.x' 2020-06-11 23:26:09 -07:00
Phillip Webb
a65ca7ac2f Merge branch '2.2.x' into 2.3.x 2020-06-11 23:25:16 -07:00
Phillip Webb
209c5c4013 Merge branch '2.1.x' into 2.2.x 2020-06-11 23:19:16 -07:00