Commit Graph

10064 Commits

Author SHA1 Message Date
Phillip Webb 3b3a49db1f Polish 'Fix infinite loop in FieldValues'
See gh-22040
2020-06-22 12:01:04 -07:00
Konrado85 39a853c57b Fix infinite loop in FieldValues
Update `FieldValues` test object so that it doesn't cause an infinite
loop if it is actually created.

See gh-22040
2020-06-22 11:58:22 -07:00
Andy Wilkinson a6784e3bea Upgrade to Cassandra Driver 4.7.2
Closes gh-22052
2020-06-22 18:04:30 +01:00
Andy Wilkinson 96f748949d Starting building against Spring Data 2020.0.0 snapshots
See gh-21930
2020-06-22 18:02:59 +01:00
Andy Wilkinson 0d6ea79007 Start building against Spring Framework 5.3.0 snapshots
See gh-21929
2020-06-22 18:02:21 +01:00
Andy Wilkinson a0946c8923 Start building against Reactor 2020.0.0 snapshots
See gh-21927
2020-06-22 17:34:56 +01:00
Andy Wilkinson 632d9bab21 Merge branch '2.3.x'
Closes gh-22048
2020-06-22 10:00:13 +01:00
Andy Wilkinson 73aa8f1434 Enforce spring-boot-parent's platform dependencies
Closes gh-22047
2020-06-22 09:59:21 +01:00
Scott Frederick 39b2d01541 Merge branch '2.3.x'
Closes gh-22037
2020-06-19 15:43:59 -05:00
dreis2211 a6e8561391 Catch more generic FileSystemException in NamedPipeSocket
See gh-22035
2020-06-19 15:41:20 -05:00
Stephane Nicoll 51e9a5dae0 Merge branch '2.3.x'
Closes gh-22029
2020-06-19 14:15:32 +02:00
Johnny Lim b218a89862 Remove Javadoc throw for ConfigurationPropertyName.ofIfValid()
See gh-22018
2020-06-19 14:14:57 +02:00
Stephane Nicoll ea63984f93 Merge branch '2.3.x'
Closes gh-22024
2020-06-19 11:38:16 +02:00
Stephane Nicoll d5385a7b64 Merge branch '2.2.x' into 2.3.x
Closes gh-22023
2020-06-19 11:37:52 +02:00
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
2020-06-19 11:36:25 +02:00
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
2020-06-19 11:35:48 +02:00
Andy Wilkinson ca76b60de2 Merge branch '2.3.x'
Closes gh-22021
2020-06-19 08:23:30 +01:00
Andy Wilkinson 136c9b1af8 Merge branch '2.2.x' into 2.3.x
Closes gh-22020
2020-06-19 08:23:15 +01:00
Andy Wilkinson c37fd865c0 Merge branch '2.3.x'
Closes gh-22019
2020-06-19 08:22:48 +01:00
Andy Wilkinson 1e97ff834e Only consider current context when finding lifecycle processor
Previously, LifecycleAutoConfiguration would check the current context
and all of its ancestors for a lifecycle processor bean, only
configuring a custom processor if one was not found. Every context
has a lifecycle processor so this check meant that lifecycle processing
timeout could not be customized in any context with a parent.

This commit updates the auto-configuration to only check the current
context.

Closes gh-22014
2020-06-19 08:19:57 +01:00
Andy Wilkinson 41173f7c40 Polish "Use Awaitility instead of Thread.sleep"
See gh-21988
2020-06-19 08:18:01 +01:00
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
2020-06-19 08:17:53 +01:00
Scott Frederick 73b737c7d8 Merge branch '2.3.x'
Closes gh-22017
2020-06-18 15:11:07 -05:00
Scott Frederick 28643e4d2d Validate image references before passing to CNB builder
Prior to this commit, an image name or run image name derived from
the project name or provided by the user would be passed to the CNB
builder without validation by the Maven plugin build-image goal or
Gradle plugin bootBuildImage task. This could lead to error messages
from the plugins that are difficult to understand and diagnose.

This commit makes parsing of the image names more strict, based on
the grammar implemented by the Docker go library. This provides
validation of the image names before passing them to the builder,
with a more descriptive error message when parsing and validation
fails.

Fixes gh-21495
2020-06-18 15:09:57 -05:00
Andy Wilkinson 67604a5416 Only process main metadata as it already includes additional metadata
Previously, the configuration property table generation was reading
both the main metadata and the additional metadata from each project.
This was unnecessary as the annotation processor will have already
merged the additional metadata into the main metadata before writing
it to disk. Processing both the main and additional metadata led to
a clash as the metadata overlapped. When the entry in the additional
metadata won the clash, the resulting entry in the configuration
property table would lose any details that aren't contained in the
additional metadata.

This commit updates the property table generation code to only use
the main metadata files.

Fixes gh-21131
2020-06-18 15:49:34 +01:00
Andy Wilkinson 01c270d54b Merge branch '2.3.x'
Closes gh-22011
2020-06-18 11:03:49 +01:00
Andy Wilkinson ce907b129c Merge branch '2.2.x' into 2.3.x
Closes gh-22010
2020-06-18 11:03:32 +01:00
Andy Wilkinson 1b62abab9a Configure context on SizeAndTimeBasedRollingPolicy
Previously, when file-based logging was enabled, Logback would output
the following during logging system initialization:

LOGBACK: No context given for c.q.l.core.rolling.SizeAndTimeBasedRollingPolicy

This commit updates the default logback configuration to set the
context on the SizeAndTimeBasedRollingPolicy that it creates.

Fixes gh-21056
2020-06-18 11:01:26 +01:00
Andy Wilkinson cd47bece7f Merge branch '2.3.x'
Closes gh-22009
2020-06-18 10:34:16 +01:00
Andy Wilkinson 8a7c32fff7 Prevent oauth2-oidc-sdk from downgrading json-smart in Maven projects
Fixes gh-21939
2020-06-18 10:34:12 +01:00
Stephane Nicoll f0f8424191 Merge branch '2.3.x'
Closes gh-22008
2020-06-18 11:31:00 +02:00
dreis2211 855d596c2a Use lazy lambda instead of explicit argument
See gh-21986
2020-06-18 11:29:49 +02:00
Andy Wilkinson f3220b16fe Merge branch '2.3.x' 2020-06-18 09:23:40 +01:00
Andy Wilkinson 8f7d71ca11 Merge branch '2.2.x' into 2.3.x 2020-06-18 09:23:21 +01:00
Andy Wilkinson 907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 2020-06-18 09:23:02 +01:00
Madhura Bhave f47e06c4ef Merge branch '2.3.x'
Closes gh-22007
2020-06-17 17:27:10 -07:00
Madhura Bhave f4ad30c448 Merge branch '2.2.x' into 2.3.x
Closes gh-22006
2020-06-17 17:26:40 -07:00
Madhura Bhave 615cf63a82 Make MockBean resolve right type for abstract test class
Fixes gh-20916
2020-06-17 17:25:03 -07:00
Andy Wilkinson 57b9286c84 Merge branch '2.3.x' 2020-06-17 11:53:29 +01:00
Andy Wilkinson 2d1dffa3ad Correct additions to spring-boot-starter-parent's pom
Following the fix for gh-21989, spring-boot-starter-parent no longer
contains an <issueManagement> element. As a result the additional
content was no longer being added to the pom. This commit updates
the additions so that they are now added after the <scm> element
that is still present.

See gh-21989
2020-06-17 11:51:54 +01:00
Andy Wilkinson 22fd2005b4 Remove plugin management for Flatten Maven Plugin
Closes gh-21984
2020-06-16 12:57:07 +01:00
Andy Wilkinson 9e08490522 Merge branch 'gh-21271'
Closes gh-21271
2020-06-16 12:52:17 +01:00
Andy Wilkinson 753bea64c6 Enable varargs compilation warnings
See gh-21271
2020-06-16 12:50:53 +01:00
Andy Wilkinson 9636350b0b Enable rawtypes compilation warnings
See gh-21271
2020-06-16 12:50:50 +01:00
Andy Wilkinson 056d5f3120 Enable deprecation compilation warnings
See gh-21271
2020-06-16 12:50:47 +01:00
Andy Wilkinson c64649a6d9 Enable unchecked compilation warnings
See gh-21271
2020-06-16 12:50:44 +01:00
Andy Wilkinson 47874d8c6a Treat warnings as errors when compiling
See gh-21271
2020-06-16 12:50:41 +01:00
Andy Wilkinson 0f1ada5e29 Upgrade to Undertow 2.1.3.Final
Closes gh-21983
2020-06-16 10:42:24 +01:00
Andy Wilkinson 2e54da04e2 Upgrade to Tomcat 9.0.36
Closes gh-21982
2020-06-16 10:42:24 +01:00
Andy Wilkinson 8115619021 Upgrade to Spring Retry 1.3.0
Closes gh-21981
2020-06-16 10:42:21 +01:00
Andy Wilkinson c00e751910 Upgrade to Spring Kafka 2.5.2.RELEASE
Closes gh-21980
2020-06-16 10:42:08 +01:00
Andy Wilkinson 37c9d13946 Upgrade to Spring Batch 4.2.4.RELEASE
Closes gh-21979
2020-06-16 10:42:08 +01:00
Andy Wilkinson dfd32e7a54 Upgrade to Spring AMQP 2.2.7.RELEASE
Closes gh-21978
2020-06-16 10:42:07 +01:00
Andy Wilkinson 030a01192d Upgrade to SendGrid 4.6.0
Closes gh-21977
2020-06-16 10:42:07 +01:00
Andy Wilkinson f1a7730698 Upgrade to Selenium HtmlUnit 2.41.0
Closes gh-21976
2020-06-16 10:42:07 +01:00
Andy Wilkinson 9000f047bd Upgrade to RSocket 1.0.1
Closes gh-21975
2020-06-16 10:42:07 +01:00
Andy Wilkinson aad6c3d6c9 Upgrade to R2DBC Bom Arabba-SR5
Closes gh-21974
2020-06-16 10:42:06 +01:00
Andy Wilkinson 9db3f9adbf Upgrade to Postgresql 42.2.14
Closes gh-21973
2020-06-16 10:42:06 +01:00
Andy Wilkinson 5fd2b85b48 Upgrade to Oracle Database 19.6.0.0
Closes gh-21972
2020-06-16 10:42:06 +01:00
Andy Wilkinson 5365e41e4c Upgrade to OkHttp3 3.14.9
Closes gh-21971
2020-06-16 10:42:06 +01:00
Andy Wilkinson 0bb7b0f243 Upgrade to OAuth2 OIDC SDK 7.5
Closes gh-21970
2020-06-16 10:42:03 +01:00
Andy Wilkinson 909b7db6f1 Upgrade to Netty tcNative 2.0.31.Final
Closes gh-21969
2020-06-16 10:41:54 +01:00
Andy Wilkinson 7ed98bcde8 Upgrade to Netty 4.1.50.Final
Closes gh-21968
2020-06-16 10:41:53 +01:00
Andy Wilkinson 9241e488e8 Upgrade to Neo4j OGM 3.2.12
Closes gh-21967
2020-06-16 10:41:53 +01:00
Andy Wilkinson 914af4a9f0 Upgrade to MongoDB 4.0.4
Closes gh-21966
2020-06-16 10:41:53 +01:00
Andy Wilkinson 1266738522 Upgrade to Maven War Plugin 3.3.0
Closes gh-21965
2020-06-16 10:41:53 +01:00
Andy Wilkinson 40c9029e3c Upgrade to Log4j2 2.13.3
Closes gh-21964
2020-06-16 10:41:53 +01:00
Andy Wilkinson 5bb661c95f Upgrade to Liquibase 3.10.0
Closes gh-21963
2020-06-16 10:41:52 +01:00
Andy Wilkinson 87afd8dc62 Upgrade to Lettuce 5.3.1.RELEASE
Closes gh-21962
2020-06-16 10:41:52 +01:00
Andy Wilkinson 4345c1c9fb Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21961
2020-06-16 10:41:52 +01:00
Andy Wilkinson 9fa4e92fbb Upgrade to Johnzon 1.2.7
Closes gh-21960
2020-06-16 10:41:52 +01:00
Andy Wilkinson 07cd868ca5 Upgrade to Jetty 9.4.30.v20200611
Closes gh-21959
2020-06-16 10:41:51 +01:00
Andy Wilkinson 2cc950065a Upgrade to Jetty Reactive HTTPClient 1.1.3
Closes gh-21958
2020-06-16 10:41:51 +01:00
Andy Wilkinson 43a7a4af13 Upgrade to Jersey 2.31
Closes gh-21957
2020-06-16 10:41:49 +01:00
Andy Wilkinson 1fa41ee4ee Upgrade to Jaybird 3.0.9
Closes gh-21956
2020-06-16 10:41:21 +01:00
Andy Wilkinson 0d48b049d9 Upgrade to Javax Money 1.1
Closes gh-21955
2020-06-16 10:41:17 +01:00
Andy Wilkinson 73e00ee929 Upgrade to InfluxDB Java 2.19
Closes gh-21954
2020-06-16 10:37:15 +01:00
Andy Wilkinson 78a72bb6c3 Upgrade to HtmlUnit 2.41.0
Closes gh-21953
2020-06-16 10:37:15 +01:00
Andy Wilkinson 262554a65b Upgrade to Hibernate 5.4.17.Final
Closes gh-21952
2020-06-16 10:37:14 +01:00
Andy Wilkinson 1fdabbc5f7 Upgrade to Groovy 2.5.12
Closes gh-21951
2020-06-16 10:37:14 +01:00
Andy Wilkinson 06eda713ee Upgrade to Flyway 6.4.4
Closes gh-21950
2020-06-16 10:37:14 +01:00
Andy Wilkinson 0e0b6c98e0 Upgrade to Elasticsearch 7.7.1
Closes gh-21948
2020-06-16 10:32:58 +01:00
Andy Wilkinson 9bbad6fb25 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21947
2020-06-16 10:32:56 +01:00
Andy Wilkinson d4c5f54f11 Upgrade to Couchbase Client 3.0.5
Closes gh-21946
2020-06-16 10:32:54 +01:00
Andy Wilkinson c366afea6e Upgrade to Caffeine 2.8.4
Closes gh-21945
2020-06-16 10:32:53 +01:00
Andy Wilkinson d914a6f713 Upgrade to Byte Buddy 1.10.11
Closes gh-21944
2020-06-16 10:32:51 +01:00
Andy Wilkinson 3435f5ea3b Upgrade to Awaitility 4.0.3
Closes gh-21943
2020-06-16 10:32:49 +01:00
Andy Wilkinson 1ed5bc72fd Upgrade to Artemis 2.13.0
Closes gh-21942
2020-06-16 10:32:47 +01:00
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 e30b8bf742 Start building against Reactor Dysprosium-SR9 snapshots
See gh-21938
2020-06-16 07:58:28 +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
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 e87c3193ce Polish "Add Java 15 CI"
See gh-21713
2020-06-15 17:08:12 +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 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 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
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 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 bb7936a000 Merge branch '2.3.x'
Closes gh-21896
2020-06-11 14:52:34 -07:00
Phillip Webb 069d2769f4 Reinstate disabled Reactor Netty test
Reinstate test now that we are on a reactor-netty releases that fixes
reactor/reactor-netty issue 1093.

Closes gh-21437
2020-06-11 14:52:21 -07:00
Phillip Webb 82abcd3043 Merge branch '2.3.x' 2020-06-11 13:26:44 -07:00
Phillip Webb 2a37b2e258 Refine PropertiesLauncher close logic
Further attempt to fix Windows file issues.

See gh-21575
2020-06-11 13:25:56 -07:00
Phillip Webb 3892f4402a Merge branch '2.3.x'
Closes gh-21895
2020-06-11 12:32:41 -07:00
Phillip Webb 1e7da4d3ca Allow digest builder references
Update `BuildRequest` to also allow digest based references.

Closes gh-21879
2020-06-11 12:31:29 -07:00
Phillip Webb 866ebf7c13 Merge branch '2.3.x' 2020-06-11 12:26:42 -07:00
Phillip Webb 8a249daf1a Refactor PropertiesLauncher so jars can be closed
Refactor the internals of `PropertiesLauncher` so that opened jar files
are tracked and can be closed after a test completes.

See gh-21575
2020-06-11 12:26:08 -07:00
Madhura Bhave fc9760ba49 Merge branch '2.3.x'
Closes gh-21894
2020-06-11 11:49:06 -07:00
dreis2211 469dfc285b Fix deprecation in NettyRSocketServerFactoryTests
See gh-21872
2020-06-11 11:46:11 -07:00
Scott Frederick 9d9a501b17 Merge branch '2.3.x'
Closes gh-21892
2020-06-11 11:55:20 -05:00
Scott Frederick 7a2939f129 Use non-blocking I/O for Docker API
This commit changes the NamedPipeSocket used for communication with
a local Docker daemon to use a non-blocking AsynchronousByteChannel
instead of a blocking RandomAccessFile, modeled after a similar
change to the docker-java project. This eliminates the potential for
a blocking call to hang indefinitely.

Fixes gh-21672
2020-06-11 11:53:52 -05:00
Andy Wilkinson 6ac100583c Merge branch '2.3.x'
Closes gh-21891
2020-06-11 17:36:50 +01:00
Andy Wilkinson d347346a93 Upgrade to Spring Asciidoctor Extensions 0.4.3.RELEASE
Pick up the workaround for the AsciidoctorJ bug that prevents the
configprops macro's attributes from being parsed. The lack of parsing
meant that the envvar format was being lost and properties were being
written in the canonical form instead.

Closes gh-21794
2020-06-11 17:36:25 +01:00
Stephane Nicoll f8a0ca0d80 Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21889
2020-06-11 13:23:35 +02:00
Stephane Nicoll ca44e83279 Merge branch '2.3.x'
Closes gh-21802
2020-06-11 11:22:37 +02:00
Stephane Nicoll ca5afb6e90 Fix flaky integration test
Closes gh-21487
2020-06-11 11:20:49 +02:00
Stephane Nicoll a74afc104c Upgrade to Spring Batch 4.2.4
Closes gh-21784
2020-06-11 10:36:36 +02:00
Stephane Nicoll 9af5f70b75 Upgrade to Spring Batch 4.2.4
Closes gh-21783
2020-06-11 10:34:50 +02:00
Stephane Nicoll cbd5b77fa4 Upgrade to Spring Data Neumann-SR1
Closes gh-21776
2020-06-11 09:58:35 +02:00
Stephane Nicoll 122f5afd42 Upgrade to Spring Integration 5.3.1
Closes gh-21779
2020-06-11 09:58:02 +02:00
Stephane Nicoll 760aec3136 Upgrade to Spring Kafka 2.5.2
Closes gh-21782
2020-06-11 09:57:27 +02:00
Stephane Nicoll e64bfb80e4 Upgrade to Postgresql 42.2.14
Closes gh-21888
2020-06-11 08:55:47 +02:00
Stephane Nicoll 664436a3d6 Upgrade to Spring Kafka 2.3.9
Closes gh-21781
2020-06-11 08:54:52 +02:00
Stephane Nicoll 49ba5dc6bc Upgrade to Postgresql 42.2.14
Closes gh-21887
2020-06-11 08:44:30 +02:00
Stephane Nicoll c496f2401f Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21886
2020-06-11 08:44:29 +02:00
Stephane Nicoll 7dee9e34b5 Upgrade to Spring Kafka 2.2.14
Closes gh-21780
2020-06-11 08:43:39 +02:00
Phillip Webb 087c62d34b Merge branch '2.3.x' 2020-06-10 22:14:44 -07:00
Phillip Webb 3b71403b99 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:14:33 -07:00
Phillip Webb ac197be815 Fix checkstyle issue 2020-06-10 22:14:09 -07:00
Phillip Webb aecd13bb9b Merge branch '2.3.x' 2020-06-10 22:06:03 -07:00
Phillip Webb 7e5d6bafa8 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:05:40 -07:00
Phillip Webb 3f36f6ea47 Rollback to Spring Batch 4.2.2
See gh-21885
2020-06-10 22:04:32 -07:00
Phillip Webb 02bfc9d30a Polish 2020-06-10 21:50:17 -07:00
Madhura Bhave f96a2f2b83 Merge branch '2.3.x'
Closes gh-21881
2020-06-10 18:52:32 -07:00
Madhura Bhave 83485e625d Merge branch '2.2.x' into 2.3.x
Closes gh-21880
2020-06-10 18:50:41 -07:00
Madhura Bhave 4e014da9e9 Return all loggers for Log4j2
This commit aligns log4j2's behavior with logback such that loggers
with a null configuredLevel are also returned by the actuator endpoint.

Fixes gh-20037
2020-06-10 18:48:14 -07:00
Madhura Bhave 92ce94b3d8 Align default log levels for Log4j2 and Logback
Fixes gh-21293
2020-06-10 18:48:01 -07:00
Scott Frederick 9ae6816785 Merge branch '2.3.x'
Closes gh-21874
2020-06-10 13:57:06 -05:00
Scott Frederick 7a793a11fb Merge branch '2.2.x' into 2.3.x
Fixes gh-21036 in 2.3.1
2020-06-10 13:55:12 -05:00
Scott Frederick 0fa1d0ef2e Handle bind exceptions in management context
This commit updates the logic for handling binding exceptions in the
management context when it is separate from the application context.
The changes allow the exception details to be visible to
DefaultErrorAttributes without causing the servlet container to
detect an error condition.

Fixes gh-21036
2020-06-10 13:53:04 -05:00
Andy Wilkinson 3927bd81eb Upgrade to Spring Integration 5.2.7.RELEASE
Closes gh-21778
2020-06-10 19:24:43 +01:00
Andy Wilkinson 4eea0329d3 Upgrade to Spring Data Moore SR8
Closes gh-21775
2020-06-10 19:24:12 +01:00
Andy Wilkinson ea55bb32a2 Upgrade to Spring Data Lovelace-SR18
Closes gh-21774
2020-06-10 19:20:53 +01:00
Andy Wilkinson 4eba8e2dc2 Upgrade to Spring Integration 5.1.11.RELEASE
Closes gh-21777
2020-06-10 19:16:40 +01:00
Andy Wilkinson 0f2f7812d9 Upgrade to Postgresql 42.2.14
Closes gh-21871
2020-06-10 19:06:45 +01:00
Andy Wilkinson a9fffb3920 Upgrade to Netty tcNative 2.0.31.Final
Closes gh-21870
2020-06-10 19:06:44 +01:00
Andy Wilkinson dd93b523a4 Merge branch '2.3.x'
Closes gh-21869
2020-06-10 19:02:29 +01:00
Andy Wilkinson 90bd433083 Allow child contexts to configure server properties
Previously, HttpMessageConvertersAutoConfiguration registered
ServerProperties. When this happened in a parent context, any child
contexts would skip registering ServerProperties due to its presence
in the parent context. This prevents the child contexts from
configuring their own server properties.

This commit updates HttpMessageConvertersAutoConfiguration to
bind server.servlet.encoding directly instead of enabling
ServerProperties. With ServerProperties no longer enabled in a parent
context, child contexts are now able to configure their own server
properties.

Fixes gh-21789
2020-06-10 18:56:57 +01:00
Stephane Nicoll a8da75a396 Merge branch '2.3.x'
Closes gh-21867
2020-06-10 18:13:57 +02:00
Tomek Szmytka 8890660a71 Back-off if a custom ReactiveSessionFactory is defined
This commit makes sure that CassandraReactiveDataAutoConfiguration does
not create a reactiveCassandraSessionFactory bean if the user has
provided their own.

See gh-21769
2020-06-10 18:10:05 +02:00
Andy Wilkinson 9ef9b63527 Upgrade to Undertow 2.1.3.Final
Closes gh-21865
2020-06-10 17:04:04 +01:00
Andy Wilkinson 9c639b1be2 Upgrade to Tomcat 9.0.36
Closes gh-21864
2020-06-10 17:04:04 +01:00
Andy Wilkinson 3e5fcee187 Upgrade to Spring Security 5.3.3.RELEASE
Closes gh-21863
2020-06-10 17:04:04 +01:00
Andy Wilkinson 52975e4480 Upgrade to Spring AMQP 2.2.7.RELEASE
Closes gh-21862
2020-06-10 17:04:04 +01:00
Andy Wilkinson 25cc16a54c Upgrade to RSocket 1.0.1
Closes gh-21861
2020-06-10 17:04:03 +01:00
Andy Wilkinson df42b3ac39 Upgrade to R2DBC Bom Arabba-SR4
Closes gh-21860
2020-06-10 17:04:03 +01:00
Andy Wilkinson 6e68101b9f Upgrade to Postgresql 42.2.13
Closes gh-21859
2020-06-10 17:04:03 +01:00
Andy Wilkinson bf83e237ea Upgrade to OkHttp3 3.14.9
Closes gh-21858
2020-06-10 17:04:03 +01:00
Andy Wilkinson 5e3d48114c Upgrade to Netty 4.1.50.Final
Closes gh-21857
2020-06-10 17:04:02 +01:00
Andy Wilkinson 3154655a72 Upgrade to Neo4j OGM 3.2.12
Closes gh-21856
2020-06-10 17:04:02 +01:00
Andy Wilkinson fcb2d5df49 Upgrade to MongoDB 4.0.4
Closes gh-21855
2020-06-10 17:04:02 +01:00
Andy Wilkinson 98e19999d0 Upgrade to Log4j2 2.13.3
Closes gh-21854
2020-06-10 17:04:02 +01:00
Andy Wilkinson 39c25ff1c4 Upgrade to Lettuce 5.3.1.RELEASE
Closes gh-21853
2020-06-10 17:04:02 +01:00
Andy Wilkinson 08f37b3489 Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21852
2020-06-10 17:04:01 +01:00
Andy Wilkinson 8687533e34 Upgrade to Johnzon 1.2.7
Closes gh-21851
2020-06-10 17:04:01 +01:00
Andy Wilkinson ce8554211e Upgrade to Jetty 9.4.29.v20200521
Closes gh-21850
2020-06-10 17:04:01 +01:00
Andy Wilkinson 30355f38be Upgrade to Jetty Reactive HTTPClient 1.1.3
Closes gh-21849
2020-06-10 17:04:01 +01:00
Andy Wilkinson 1424ac406c Upgrade to Jaybird 3.0.9
Closes gh-21848
2020-06-10 17:04:01 +01:00
Andy Wilkinson d7913ff1a8 Upgrade to Hibernate 5.4.17.Final
Closes gh-21847
2020-06-10 17:04:00 +01:00
Andy Wilkinson 2fef9629c5 Upgrade to Groovy 2.5.12
Closes gh-21846
2020-06-10 17:04:00 +01:00
Andy Wilkinson c26c52d82b Upgrade to Flyway 6.4.4
Closes gh-21845
2020-06-10 17:04:00 +01:00
Andy Wilkinson cfd5cb5496 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21844
2020-06-10 17:04:00 +01:00
Andy Wilkinson 5d8d2fe146 Upgrade to Couchbase Client 3.0.5
Closes gh-21843
2020-06-10 17:03:59 +01:00
Andy Wilkinson c1e8f8626d Upgrade to Caffeine 2.8.4
Closes gh-21842
2020-06-10 17:03:59 +01:00
Andy Wilkinson 306ddf7d16 Upgrade to Byte Buddy 1.10.11
Closes gh-21841
2020-06-10 17:03:59 +01:00
Andy Wilkinson ed038e6ade Upgrade to Awaitility 4.0.3
Closes gh-21840
2020-06-10 17:03:59 +01:00
Andy Wilkinson e648f5ce6c Switch Bomr's upgrade policy to same minor version 2020-06-10 17:03:59 +01:00
Stephane Nicoll f5b0ebc9c2 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-21838
2020-06-10 11:21:57 +02:00
Stephane Nicoll 331390cd74 Upgrade to Spring Security 5.2.5.RELEASE
Closes gh-21836
2020-06-10 11:21:57 +02:00
Stephane Nicoll 4c15c512fa Upgrade to Spring Amqp 2.2.7.RELEASE
Closes gh-21835
2020-06-10 11:21:57 +02:00
Stephane Nicoll 7a0b22086f Upgrade to Postgresql 42.2.13
Closes gh-21834
2020-06-10 11:21:57 +02:00
Stephane Nicoll 6ca229c678 Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21833
2020-06-10 11:21:56 +02:00
Stephane Nicoll a91c157bf4 Upgrade to Hibernate Validator 6.0.20.Final
Closes gh-21832
2020-06-10 11:21:56 +02:00
Stephane Nicoll 5ae2a9e25c Upgrade to Hibernate 5.4.17.Final
Closes gh-21831
2020-06-10 11:21:56 +02:00
Stephane Nicoll 1f6582e3e4 Upgrade to Jaybird 3.0.9
Closes gh-21830
2020-06-10 11:21:56 +02:00
Stephane Nicoll c3cf3bd72b Upgrade to Elasticsearch 6.8.10
Closes gh-21829
2020-06-10 11:21:56 +02:00
Stephane Nicoll d07b460247 Upgrade to Jetty 9.4.29.v20200521
Closes gh-21828
2020-06-10 11:21:56 +02:00
Stephane Nicoll eadc6d07b8 Upgrade to Groovy 2.5.12
Closes gh-21827
2020-06-10 11:21:55 +02:00
Stephane Nicoll ad321895d5 Upgrade to Awaitility 4.0.3
Closes gh-21826
2020-06-10 11:21:55 +02:00
Stephane Nicoll 78a06d5343 Upgrade to Tomcat 9.0.36
Closes gh-21825
2020-06-10 11:21:55 +02:00
Stephane Nicoll ec5dc3bfa4 Upgrade to Johnzon Jsonb 1.2.7
Closes gh-21824
2020-06-10 11:21:55 +02:00
Stephane Nicoll a2738b51d6 Upgrade to Byte Buddy 1.10.11
Closes gh-21823
2020-06-10 11:21:55 +02:00
Stephane Nicoll 2eff659fa4 Upgrade to Rsocket 1.0.1
Closes gh-21822
2020-06-10 11:21:55 +02:00
Stephane Nicoll 518cdf2751 Upgrade to Netty 4.1.50.Final
Closes gh-21821
2020-06-10 11:21:54 +02:00
Stephane Nicoll 62d3f0d872 Upgrade to Micrometer 1.3.9
Closes gh-21820
2020-06-10 11:21:54 +02:00
Stephane Nicoll 9acfc81244 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21819
2020-06-10 11:21:54 +02:00
Stephane Nicoll 6aa7f7aed5 Upgrade to Hikaricp 3.4.5
Closes gh-21818
2020-06-10 11:21:54 +02:00
Stephane Nicoll cda93e0af7 Upgrade to Okhttp3 3.14.9
Closes gh-21817
2020-06-10 11:21:54 +02:00
Stephane Nicoll 7b3070cd8c Upgrade to Caffeine 2.8.4
Closes gh-21816
2020-06-10 11:21:54 +02:00
Stephane Nicoll b118d8953b Upgrade to Couchbase Client 2.7.15
Closes gh-21815
2020-06-10 11:21:53 +02:00
Andy Wilkinson 4e5f1e49d7 Merge branch '2.3.x'
Closes gh-21839
2020-06-10 09:56:43 +01:00
Andy Wilkinson ce68f1a097 Merge branch '2.2.x' into 2.3.x
Closes gh-21837
2020-06-10 09:56:24 +01:00
Andy Wilkinson 48acaa4bd9 Make AutoConfigureMockMvc use SecurityProperties' filter ordering
Previously, AutoConfigureMockMvc used Spring Security's default filter
ordering, ignoring the value configured by SecurityProperties that is
used at runtime. This resulted in different ordering at runtime and in
tests.

This commit updates the configuration for AutoConfigureMockMvc to
import the Spring Security filter auto-configuration, thereby ensuring
that the ordering configured via SecurityProperties is applied.

Fixes gh-21801
2020-06-10 09:51:05 +01:00
Stephane Nicoll 5d2a9e9220 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-21814
2020-06-10 10:39:09 +02:00
Stephane Nicoll 8841feb311 Upgrade to Spring Security 5.1.11.RELEASE
Closes gh-21813
2020-06-10 10:22:34 +02:00
Stephane Nicoll 9d80ece9a5 Upgrade to Spring Amqp 2.1.15.RELEASE
Closes gh-21812
2020-06-10 10:22:33 +02:00
Stephane Nicoll c456b633d5 Upgrade to Postgresql 42.2.13
Closes gh-21811
2020-06-10 10:22:31 +02:00
Stephane Nicoll b560501c3c Upgrade to Hibernate Validator 6.0.20.Final
Closes gh-21810
2020-06-10 10:22:29 +02:00
Stephane Nicoll fa9890b381 Upgrade to Jaybird 3.0.9
Closes gh-21809
2020-06-10 10:22:28 +02:00
Stephane Nicoll 357ada7aa0 Upgrade to Jetty 9.4.29.v20200521
Closes gh-21808
2020-06-10 10:22:27 +02:00
Stephane Nicoll 544b688b62 Upgrade to Groovy 2.5.12
Closes gh-21807
2020-06-10 10:22:25 +02:00
Stephane Nicoll 4724839aea Upgrade to Tomcat 9.0.36
Closes gh-21806
2020-06-10 10:22:24 +02:00
Stephane Nicoll a07ccb0c39 Upgrade to Netty 4.1.50.Final
Closes gh-21805
2020-06-10 10:22:22 +02:00
Stephane Nicoll 27c94bd649 Upgrade to Micrometer 1.1.14
Closes gh-21804
2020-06-10 10:22:21 +02:00
Stephane Nicoll e88ae68430 Upgrade to Couchbase Client 2.7.15
Closes gh-21803
2020-06-10 10:22:19 +02:00
Stephane Nicoll 2ea60ecbaf Merge branch '2.3.x'
Closes gh-21802
2020-06-10 09:58:39 +02:00
Stephane Nicoll 6534a9abaf Configure password-based authentication with Cassandra
This commit updates the Cassandra auto-configuration to configure
password-based authentication on the CqlSession directly.

Closes gh-21487
2020-06-10 09:57:47 +02:00
Madhura Bhave 4161f0b983 Merge branch '2.3.x'
Closes gh-21799
2020-06-09 18:22:10 -07:00
Madhura Bhave d30c0e8aec Merge branch '2.2.x' into 2.3.x
Closes gh-21798
2020-06-09 18:21:31 -07:00
Madhura Bhave 36faa1d42a Document using system properties in gradle plugin docs
Closes gh-21317
2020-06-09 16:07:54 -07:00
Stephane Nicoll 372c0369a8 Merge branch '2.3.x' 2020-06-09 16:34:36 +02:00
Stephane Nicoll a3d39c7f31 Start building against Spring Data Neumann-SR1 snapshots
See gh-21776
2020-06-09 16:31:27 +02:00
Stephane Nicoll 7fe85750fb Merge branch '2.2.x' into 2.3.x 2020-06-09 16:30:07 +02:00
Stephane Nicoll 6597c0c7f7 Start building against Spring Data Moore-SR8 snapshots
See gh-21775
2020-06-09 16:27:15 +02:00
Stephane Nicoll cc3575b3f4 Merge branch '2.1.x' into 2.2.x 2020-06-09 16:26:44 +02:00
Stephane Nicoll 79f0e38c54 Start building against Spring Data Lovelace-SR18 snapshots
See gh-21774
2020-06-09 16:16:34 +02:00
Stephane Nicoll 9a457527fd Polish test 2020-06-09 16:00:50 +02:00
Stephane Nicoll b378fbfa87 Start building against Spring Batch 4.2.3 snapshots
See gh-21784
2020-06-09 15:11:18 +02:00
Stephane Nicoll 8325ed0626 Start building against Spring Kafka 2.5.2 snapshots
See gh-21782
2020-06-09 15:10:37 +02:00
Stephane Nicoll a2bdbf01b0 Start building against Spring Integration 5.3.1 snapshots
See gh-21779
2020-06-09 15:09:56 +02:00
Stephane Nicoll 3383f48ee7 Upgrade to Spring Framework 5.2.7
Closes gh-21739
2020-06-09 15:09:03 +02:00
Stephane Nicoll 180e57a8d7 Start building against Spring Batch 4.2.3 snapshots
See gh-21783
2020-06-09 14:50:53 +02:00
Stephane Nicoll 7b4707aab5 Start building against Spring Kafka 2.3.9 snapshots
See gh-21781
2020-06-09 14:49:57 +02:00
Stephane Nicoll 5cde880562 Start building against Spring Integration 5.2.7 snapshots
See gh-21778
2020-06-09 14:49:17 +02:00
Stephane Nicoll 679816d3a4 Upgrade to Spring Framework 5.2.7
Closes gh-21738
2020-06-09 14:48:32 +02:00
Stephane Nicoll 36a05375c7 Start building against Spring Kafka 2.2.14 snapshots
See gh-21780
2020-06-09 14:23:58 +02:00
Stephane Nicoll 445a9a461b Start building against Spring Integration 5.1.11 snapshots
See gh-21777
2020-06-09 14:23:58 +02:00
Stephane Nicoll de6ee358fb Upgrade to Spring Framework 5.1.16
Closes gh-21729
2020-06-09 13:36:32 +02:00
Andy Wilkinson 0726a7d610 Merge branch '2.3.x'
Closes gh-21788
2020-06-09 11:31:29 +01:00
Andy Wilkinson 8155cc5f23 Merge branch '2.2.x' into 2.3.x
Closes gh-21786
2020-06-09 11:02:23 +01:00
Andy Wilkinson a0f29edd4d Always initialize stompWebSocketHandlerMapping eagerly
Previously, when lazy initialization was enabled, STOMP-based WebSocket
messaging would not work as the stompWebSocketHandlerMapping bean was
not initialized and CONNECT requests would go unanswered.

This commit adds a LazyInitializationExcludeFilter that causes the
stompWebSocketHandlerMapping bean to always be initialized eagerly.
This triggers initialization of the WebSocket transport allowing
requests to be received and processed.

Fixes gh-19611
2020-06-09 11:02:02 +01:00
Stephane Nicoll e9f6dc9d9a Upgrade to Reactor Dysprosium-SR8
Closes gh-21731
2020-06-09 09:04:31 +02:00
Stephane Nicoll 3889e6336a Upgrade to Reactor Dysprosium-SR8
Closes gh-21730
2020-06-09 09:02:55 +02:00
Stephane Nicoll 10e0ca7dce Upgrade to Reactor Californium-SR19
Closes gh-21728
2020-06-09 09:01:13 +02:00
Scott Frederick f3d5416cf4 Merge branch '2.3.x'
Closes gh-21770
2020-06-08 15:03:52 -05:00
Scott Frederick 73aff08535 Improve tests for BasicErrorController
This commit improves the tests for BasicErrorController by decoupling
coverage for the include-message and include-binding-errors
parameters to ensure the options operate properly independent of
each other.

See gh-21702
2020-06-08 15:00:55 -05:00
Aurdo e2e52a11cc Fix BasicErrorController include parameter parsing
This commit fixes an error in BasicErrorController where the wrong
property was referenced for binding error inclusion.

See gh-21702
2020-06-08 15:00:55 -05:00
Phillip Webb ad6a0d473a Merge branch '2.3.x'
Closes gh-21768
2020-06-08 12:09:26 -07:00
Phillip Webb b71bab2817 Document deprecations of Archive.iterator()
Closes gh-21695
2020-06-08 12:08:33 -07:00
Phillip Webb f2c33464c6 Merge branch '2.3.x'
Closes gh-21766
2020-06-08 11:40:28 -07:00
Phillip Webb ddbecf62b3 Polish 'Fix Mustache to not ignore native fetcher'
See gh-21060
2020-06-08 11:10:57 -07:00
Dave Syer 5199c11e37 Fix Mustache to not ignore native fetcher
Alter the logic of `MustacheEnvironmentCollector` so that the
native fetcher is always consulted if it exists.

When the context is a map (as it is in a web View for instance) you
can't assume a non-null fetcher actually contains the property you are
searching for.

See gh-21060
2020-06-08 11:02:04 -07:00
Phillip Webb db0f085d40 Merge branch '2.3.x'
Closes gh-21765
2020-06-08 10:42:50 -07:00
Phillip Webb 47729be4e3 Polish 'Clarify documentation for probe ports'
See gh-21650
2020-06-08 10:42:01 -07:00
Hui Li e6ade05c2d Clarify documentation for probe ports
Update the reference documentation to provide a better description of
the port that should be used for Kubernetes probes.

See gh-21650
2020-06-08 10:41:41 -07:00
Phillip Webb 16b1d64b43 Merge branch '2.3.x'
Closes gh-21764
2020-06-08 10:30:33 -07:00
dreis2211 eeb1db2176 Use supplier assertions in availability indicator
See gh-21758
2020-06-08 10:29:28 -07:00
Andy Wilkinson a6eb4da2ad Merge branch '2.3.x'
Closes gh-21763
2020-06-08 17:42:19 +01:00
Andy Wilkinson 96ae4864a2 Merge branch '2.2.x' into 2.3.x
Closes gh-21762
2020-06-08 17:42:02 +01:00
Andy Wilkinson 2de906caf7 Polish "Clarify loss of defaults when adding custom mapping"
See gh-20716
2020-06-08 17:34:11 +01:00
Norio 9f009e4445 Clarify loss of defaults when adding custom mapping
See gh-20716
2020-06-08 17:31:26 +01:00
Andy Wilkinson 52a5425acf Merge branch '2.3.x'
Closes gh-21761
2020-06-08 17:08:20 +01:00
Andy Wilkinson a97c63661a Merge branch '2.2.x' into 2.3.x
Closes gh-21760
2020-06-08 17:08:07 +01:00
Andy Wilkinson 4a0e8217f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21759
2020-06-08 17:07:51 +01:00
Andy Wilkinson 5dce945e29 Document dispatcher-types configuration for secured error pages
Closes gh-19293
2020-06-08 17:06:42 +01:00
Andy Wilkinson b6232cbd12 Merge branch '2.3.x'
Closes gh-21756
2020-06-08 14:44:02 +01:00
Andy Wilkinson fe265af252 Merge branch '2.2.x' into 2.3.x
Closes gh-21755
2020-06-08 14:43:39 +01:00
Andy Wilkinson 296da88e31 Merge branch '2.1.x' into 2.2.x
Closes gh-21754
2020-06-08 14:43:14 +01:00
Andy Wilkinson c96455f7cf Remove . from CLI's classpath on Unix-like platforms
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
2020-06-08 14:40:14 +01:00
Andy Wilkinson 020a47ba3e Document support for Gradle 5
Closes gh-15358
2020-06-08 14:29:07 +01:00
Andy Wilkinson 676ff423dd Merge branch '2.3.x' 2020-06-08 11:36:05 +01:00
Andy Wilkinson 82b531b49e Merge branch '2.2.x' into 2.3.x 2020-06-08 11:35:53 +01:00
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson 6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb 0c76fb950d Merge branch '2.3.x'
Closes gh-21747
2020-06-07 11:57:44 -07:00
Phillip Webb f8982bdc14 Polish 'Support userInfo in elasticsearch URI'
See gh-21381
2020-06-07 11:56:18 -07:00
Evgeniy Cheban a72179aa4f Support userInfo in elasticsearch URI
See gh-21381
2020-06-07 10:38:41 -07:00
Phillip Webb 6e71994b6b Merge branch '2.3.x'
Closes gh-21745
2020-06-07 10:28:01 -07:00
Phillip Webb abaca95467 Merge branch '2.2.x' into 2.3.x
Closes gh-21744
2020-06-07 10:27:35 -07:00
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21743
2020-06-07 10:25:33 -07:00
Phillip Webb 70e0a27949 Drop the use of the term "white list"
Closes gh-21737
2020-06-07 10:22:35 -07:00
Stephane Nicoll 9fd6ff7e88 Start building against Spring Framework 5.2.7 snapshots
See gh-21739
2020-06-07 11:14:02 +02:00
Stephane Nicoll 4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
2020-06-07 10:54:38 +02:00
Stephane Nicoll d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
2020-06-07 10:37:47 +02:00
Phillip Webb 621d120ba3 Merge branch '2.3.x'
Closes gh-21735
2020-06-06 12:07:00 -07:00
Phillip Webb c11abf48d9 Polish 'Allow beans without public constructors to load'
See gh-20929
2020-06-06 12:05:50 -07:00
Vlad Kisel d8d8f9cf0b Allow beans without public constructors to load
Allow `BeanDefinitionLoader` to load classes that don't have public
constructors. The constraint was first introduced in d82c50804f to
solve an issue with anonymous Groovy classes but causes particular
problems with `@SpringBootTest`.

See gh-20929
2020-06-06 11:59:47 -07:00
Phillip Webb 5f79bd2a09 Merge branch '2.3.x'
Closes gh-21734
2020-06-06 11:08:30 -07:00
dreis2211 2b5569f054 Polish
See gh-21732
2020-06-06 11:07:21 -07:00
Stephane Nicoll 44f375c508 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21731
2020-06-06 09:57:21 +02:00
Stephane Nicoll f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
2020-06-06 09:26:15 +02:00
Stephane Nicoll 0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
2020-06-06 08:48:15 +02:00
Phillip Webb d791d18231 Merge branch '2.3.x'
Closes gh-21727
2020-06-05 19:34:16 -07:00
Phillip Webb 2f973ebc33 Fix default Launcher.isExploded() result
Fix the default implementation of `Launcher.isExploded` which should
have returned `true`.

Fixes gh-21575
2020-06-05 19:32:06 -07:00
Phillip Webb d356a24a07 Merge branch '2.3.x'
Closes gh-21726
2020-06-05 16:20:39 -07:00
Phillip Webb 47c1928189 Polish 'Optimize SystemEnvironmentPropertyMapper'
Introduce a new `ConfigurationPropertyName.ofIfValid` method to
save us needing to throw and catch an exception unnecessarily.

See gh-21523
2020-06-05 16:11:52 -07:00
dreis2211 0378de7b30 Optimize SystemEnvironmentPropertyMapper
See gh-21523
2020-06-05 16:11:28 -07:00
dreis2211 f8d6d9a4b0 Call append only when necessary
See gh-21523
2020-06-05 16:11:11 -07:00
dreis2211 33deba4948 Use chars rather than strings
Update `SystemEnvironmentPropertyMapper` to use single chars
rather than strings whenever possible.

See gh-21523
2020-06-05 15:52:18 -07:00
Phillip Webb b1044ca883 Update copyright year of changed files 2020-06-05 15:37:47 -07:00
Phillip Webb 8a7a5929ae Merge branch '2.3.x' 2020-06-05 15:37:33 -07:00
Phillip Webb cc50605687 Merge branch '2.2.x' into 2.3.x 2020-06-05 15:36:44 -07:00
Phillip Webb 0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb 3107d2de51 Merge branch '2.3.x'
Fixes gh-21705 in master
2020-06-05 15:33:46 -07:00
Phillip Webb 9a235197dc Propagate manifest to exploded jars
Update `LaunchedURLClassLoader` so that packages defined from exploded
archive folders have manifest attributes applied to them. Prior to this
calling `package.getImplementationTitle()` would only return the a
manifiest attribute when running non-exploded.

The root cause of this issue is the way that `URLClassLoader` handles
the different URL types. For URLs that reference a jar the manifest is
available. For URLs that reference a folder it isn't. When running
exploded we use a URL that references to the `BOOT-INF/classes` folder
directly. To fix the issue we now attempt to detect when `definePackage`
is being called directly, and replace `null` entries with actual
manifest values.

Fixes gh-21705
2020-06-05 15:28:16 -07:00
Stephane Nicoll 0bc6159e44 Merge branch '2.3.x'
Closes gh-21721
2020-06-05 16:42:12 +02:00
Stephane Nicoll 400a168ce9 Merge branch '2.2.x' into 2.3.x
Closes gh-21720
2020-06-05 16:41:24 +02:00
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
2020-06-05 16:32:42 +02:00
Stephane Nicoll bb86d2b3d4 Merge branch '2.3.x' 2020-06-05 16:25:38 +02:00
Stephane Nicoll 79a5ca2941 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:25:24 +02:00
Stephane Nicoll eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson 82cc7e972d Polish "Print the java version being used on startup"
See gh-21559
2020-06-05 14:19:15 +01:00
dreis2211 731c192817 Print the java version being used on startup
See gh-21559
2020-06-05 14:12:08 +01:00
dreis2211 85a6686cae Add Java 15 to JavaVersion enum
See gh-21691
2020-06-05 14:08:09 +01:00
Andy Wilkinson 8fb7a6cace Remove JUnit 5's vintage engine from spring-boot-starter-test
Closes gh-21625
2020-06-05 14:02:26 +01:00
Stephane Nicoll 721399bdc4 Merge branch '2.3.x' 2020-06-05 14:54:55 +02:00
Toshiaki Maki 0cd526c266 Fix event name in documentation
See gh-21692
2020-06-05 14:51:53 +02:00
Stephane Nicoll 8353dea111 Merge branch '2.3.x' 2020-06-05 14:49:55 +02:00
Stephane Nicoll 4624bf6552 Polish "Add reference to rocketmq-spring-boot-starter"
See gh-21653
2020-06-05 14:49:19 +02:00
ThierrySquirrel c547567882 Add reference to rocketmq-spring-boot-starter
See gh-21653
2020-06-05 14:49:19 +02:00
Stephane Nicoll da5e8d70a1 Polish "Support filtered scrape for Prometheus"
See gh-21545
2020-06-05 14:16:42 +02:00
Johnny Lim cd1baf18fe Support filtered scrape for Prometheus
See gh-21545
2020-06-05 14:16:42 +02:00
dreis2211 54f93e9b0f Fix multi-release JAR test on JDK 15
See gh-21605
2020-06-05 11:56:50 +02:00
Andy Wilkinson c4faeac4d7 Merge branch '2.3.x'
Closes gh-21703
2020-06-04 20:27:18 +01:00
Andy Wilkinson 24138c104c Use highlightjs for syntax highlighting in Asciidoctor's HTML output
Closes gh-21701
2020-06-04 20:25:29 +01:00
Phillip Webb 16cab0d83c Merge branch '2.3.x'
Closes gh-21690
2020-06-03 19:20:01 -07:00
Phillip Webb 4d37430bfe Use servlet context that can access classloader
Update `SpringBootServletInitializer` to use the `ServletContext` that
was provided to the initial `onStartup` call rather than the
one from the `ServletContextEvent`. This allows the `getClassLoader()`
call to complete without throwing an `UnsupportedOperationException`.

Fixes gh-21684
2020-06-03 19:18:12 -07:00
Scott Frederick 87f5894a9a Merge branch '2.3.x'
Closes gh-21685
2020-06-03 16:54:37 -05:00
Scott Frederick 29253264b4 Improve Docker API 5xx error messages
This commit improves the error messages returned by the Spring Boot
build plugins when a 5xx status code is returned from the Docker
API while attempting to build an image. If the error response has
contents containing a JSON structure with a "message" key, the value
associated with that key will be included in the exception message
and in the build plugin output error.

Fixes gh-21515
2020-06-03 16:53:44 -05:00
Andy Wilkinson 933a85144a Merge branch '2.3.x'
Closes gh-21669
2020-06-03 13:07:35 +01:00
Andy Wilkinson daeca9f332 Restore Boot 2.2's compile-scoped dependencies
Fixes gh-21507
2020-06-03 12:55:11 +01:00
Andy Wilkinson f041be8877 Merge branch '2.3.x'
Closes gh-21668
2020-06-03 11:46:59 +01:00
Andy Wilkinson 210e565741 Use dirMode and fileMode to configure CLI archive entry permissions
Closes gh-21453
2020-06-03 11:46:01 +01:00
Andy Wilkinson 38b91f134e Merge branch '2.3.x'
Closes gh-21665
2020-06-03 09:26:29 +01:00
Andy Wilkinson a2bfdb5b33 Merge branch '2.2.x' into 2.3.x
Closes gh-21663
2020-06-03 08:13:44 +01:00
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database
Closes gh-20333
2020-06-03 08:06:26 +01:00
Phillip Webb 39216ce3f4 Merge branch '2.3.x' 2020-06-02 22:48:16 -07:00
Phillip Webb e39d7971fb Merge branch '2.2.x' into 2.3.x 2020-06-02 22:48:01 -07:00
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 2020-06-02 22:47:41 -07:00
Phillip Webb b5fe3c3494 Refine YAML type restriction error
Closes gh-21596
2020-06-02 22:46:47 -07:00
Phillip Webb 20c11a3cbd Merge branch '2.3.x'
Closes gh-21661
2020-06-02 22:29:38 -07:00
Phillip Webb ebb3f5f286 Merge branch '2.2.x' into 2.3.x
Closes gh-21660
2020-06-02 22:28:39 -07:00
Phillip Webb 4fc0dec6c4 Support wrapped random property sources
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
2020-06-02 22:22:40 -07:00
Madhura Bhave e0f548fdd3 Merge branch '2.3.x'
Closes gh-21657
2020-06-02 17:24:20 -07:00
Madhura Bhave 2dc8048d08 Add missing since tags
Closes gh-21576
2020-06-02 17:22:46 -07:00
Phillip Webb fc8fdf2de0 Merge branch '2.3.x'
Closes gh-21656
2020-06-02 10:59:35 -07:00
Phillip Webb 2589f980d5 Merge branch '2.2.x' into 2.3.x
Closes gh-21655
2020-06-02 10:58:36 -07:00
Phillip Webb 09a47c9aad Fix containsDescendantOf for random sources
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
2020-06-02 10:57:48 -07:00
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
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
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 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 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
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 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