Commit Graph

10538 Commits

Author SHA1 Message Date
Andy Wilkinson 0d8719adb7 Merge branch '2.3.x'
Closes gh-22911
2020-08-12 13:14:33 +01:00
Andy Wilkinson 65ccb514d0 Merge branch '2.2.x' into 2.3.x
Closes gh-22910
2020-08-12 13:14:15 +01:00
Johnny Lim 68e2dd626d Mention configuration customizers for WebTestClient and RestAssured
See gh-22765
2020-08-12 13:13:11 +01:00
Stephane Nicoll 25e08d2dee Restore handling of certain spring.data.neo4j.* properties
This commit switches the deprecation level of several properties in the
spring.data.neo4j namespace from error and warning. The server URI and
basic authentication can be used in a deprecated fashion to configure
the new neo4j driver.

Closes gh-22653
2020-08-12 14:07:44 +02:00
Andy Wilkinson 9a2d2effa5 Merge branch '2.3.x'
Closes gh-22907
2020-08-12 12:24:38 +01:00
Andy Wilkinson 1381929525 Upgrade to Gradle 6.6
Closes gh-22905
2020-08-12 12:24:08 +01:00
Andy Wilkinson 520cfa4638 Merge branch '2.3.x'
Closes gh-22904
2020-08-12 11:40:48 +01:00
Andy Wilkinson 0841eab877 Simplify build.gradle for spring-boot-starter-data-solr
Closes gh-22903
2020-08-12 11:40:21 +01:00
Stephane Nicoll 8409df5540 Upgrade to Spring Data 2020.0.0-M2
Closes gh-22647
2020-08-12 12:15:23 +02:00
Stephane Nicoll 14eb041086 Polish "Add basic auth support for Prometheus pushgateway"
See gh-22548
2020-08-12 10:27:07 +02:00
AndrewDi 9ddc97f815 Add basic auth support for Prometheus pushgateway
See gh-22548
2020-08-12 09:54:08 +02:00
Stephane Nicoll 2c120eb161 Merge branch '2.3.x'
Closes gh-22900
2020-08-12 09:51:44 +02:00
Stephane Nicoll 38baaf31d3 Merge branch '2.2.x' into 2.3.x
Closes gh-22899
2020-08-12 09:51:25 +02:00
Stephane Nicoll ee2363fca7 Polish "Harmonize Discover the HTTP Port at Runtime How-To"
See gh-22898
2020-08-12 09:50:44 +02:00
John Franco 303768b2b5 Harmonize Discover the HTTP Port at Runtime How-To
See gh-22898
2020-08-12 09:48:57 +02:00
Phillip Webb 7838c7b072 Polish 'Support ConfigurationClassPostProcessor supplier'
See gh-22858
2020-08-11 12:31:02 -07:00
Dave Syer 06eff45a71 Support ConfigurationClassPostProcessor supplier
Update `SharedMetadataReaderFactoryContextInitializer` to optionally
support a `ConfigurationClassPostProcessor` provided via an instance
`Supplier`.

If the instance supplier is available then we can use that to set the
`MetadataReaderFactory` non-reflectively, instead of using a
`PropertyValue` (and the `BeanWrapper` eventually).

The previous behavior is left as a  fallback and without a change in
Spring Framework will continue to be the default for most applications.

See gh-22858
2020-08-11 12:31:02 -07:00
Madhura Bhave 4799b26d2c Merge branch '2.3.x'
Closes gh-22897
2020-08-11 12:25:48 -07:00
Madhura Bhave eeca767c49 Merge branch '2.2.x' into 2.3.x
Closes gh-22895
2020-08-11 12:22:43 -07:00
Madhura Bhave cdbb7f441a Do not ignore null/empty values from SPRING_APPLICATION_JSON
Fixes gh-21542
2020-08-11 12:22:08 -07:00
Phillip Webb a062b51efb Polish 'Allow step action to be optional'
See gh-22845
2020-08-11 10:57:03 -07:00
Marten Deinum 0e5be0ab62 Allow step action to be optional
Update `SpringApplicationRunListeners` so that the step action
is optional and does not need to call `end()`.

This commit also introduces a test for the failure case showing
that there is a missed call to end with the initial solution.

See gh-22845
2020-08-11 10:54:00 -07:00
Andy Wilkinson ac357283a6 Upgrade to Spring HATEOAS 1.2.0-M1
Closes gh-22893
2020-08-11 16:28:16 +01:00
Andy Wilkinson e358144b2e Polish "Exclude cookie headers by default from HTTP traces"
See gh-22829
2020-08-11 15:58:55 +01:00
Emily Tsanova 5ff515727d Exclude cookie headers by default from HTTP traces
See gh-22829
2020-08-11 15:58:55 +01:00
Stephane Nicoll 8bcf5186dc Merge branch '2.3.x'
Closes gh-22891
2020-08-11 16:51:58 +02:00
Stephane Nicoll 92445fcc54 Merge branch '2.2.x' into 2.3.x
Closes gh-22890
2020-08-11 16:51:34 +02:00
Stephane Nicoll ccffd50285 Document the limitation of default value detection
Closes gh-22685
2020-08-11 16:51:00 +02:00
Stephane Nicoll 64a5aa9340 Polish 2020-08-11 16:41:47 +02:00
Stephane Nicoll 44e807738b Merge branch '2.3.x'
Closes gh-22889
2020-08-11 15:54:03 +02:00
Stephane Nicoll ac7320d7fe Document that Cassandra's application.conf is not considered
Closes gh-21787
2020-08-11 15:53:06 +02:00
Andy Wilkinson 5e04e1f4a3 Merge branch '2.3.x'
Closes gh-22888
2020-08-11 14:34:27 +01:00
Andy Wilkinson 1896566bc8 Avoid duplicates with different versions in Devtools' int test deps
Closes gh-22887
2020-08-11 14:33:27 +01:00
Andy Wilkinson b54ef4c4ab Upgrade to Versions Maven Plugin 2.8.1
Closes gh-22884
2020-08-11 12:53:29 +01:00
Andy Wilkinson 7f143af6a2 Upgrade to Selenium HtmlUnit 2.43.0
Closes gh-22883
2020-08-11 12:53:27 +01:00
Andy Wilkinson 23f5bec312 Upgrade to Pooled JMS 1.1.2
Closes gh-22882
2020-08-11 12:53:26 +01:00
Andy Wilkinson 5bfc14b3bd Upgrade to Maven Resources Plugin 3.2.0
Closes gh-22881
2020-08-11 12:53:24 +01:00
Andy Wilkinson 76901bbb0c Upgrade to Lettuce 5.3.3.RELEASE
Closes gh-22880
2020-08-11 12:53:23 +01:00
Andy Wilkinson 59c0a16833 Upgrade to Kotlin Coroutines 1.3.8
Closes gh-22879
2020-08-11 12:53:21 +01:00
Andy Wilkinson e51d2734dd Upgrade to HtmlUnit 2.43.0
Closes gh-22878
2020-08-11 12:53:20 +01:00
Andy Wilkinson 28aac6cda5 Upgrade to Hibernate 5.4.20.Final
Closes gh-22877
2020-08-11 12:53:18 +01:00
Andy Wilkinson 92bc60fd87 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-22876
2020-08-11 12:53:17 +01:00
Andy Wilkinson 62845b5a8d Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22875
2020-08-11 12:53:16 +01:00
Andy Wilkinson 289797b5d4 Upgrade to Spring Security 5.3.4.RELEASE
Closes gh-22873
2020-08-11 12:50:16 +01:00
Andy Wilkinson 4f79f39b31 Upgrade to Spring HATEOAS 1.1.1.RELEASE
Closes gh-22872
2020-08-11 12:50:16 +01:00
Andy Wilkinson 33ece49921 Upgrade to RSocket 1.0.2
Closes gh-22871
2020-08-11 12:50:16 +01:00
Andy Wilkinson ad109c10d3 Upgrade to Pooled JMS 1.1.2
Closes gh-22870
2020-08-11 12:50:16 +01:00
Andy Wilkinson 006d960044 Upgrade to Lettuce 5.3.3.RELEASE
Closes gh-22869
2020-08-11 12:50:15 +01:00
Andy Wilkinson abf6123bae Upgrade to Kafka 2.5.1
Closes gh-22868
2020-08-11 12:50:15 +01:00
Andy Wilkinson e8307178c3 Upgrade to jOOQ 3.13.4
Closes gh-22867
2020-08-11 12:50:15 +01:00
Andy Wilkinson 6b843d3066 Upgrade to Jetty 9.4.31.v20200723
Closes gh-22866
2020-08-11 12:50:15 +01:00
Andy Wilkinson c89bc5120e Upgrade to Jackson Bom 2.11.2
Closes gh-22865
2020-08-11 12:50:15 +01:00
Andy Wilkinson 7a0af85b6e Upgrade to Hibernate 5.4.20.Final
Closes gh-22864
2020-08-11 12:50:15 +01:00
Andy Wilkinson 38891f7594 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-22863
2020-08-11 12:50:14 +01:00
Andy Wilkinson 977f33ad80 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22862
2020-08-11 12:50:14 +01:00
Andy Wilkinson 8af4246db5 Upgrade to Couchbase Client 3.0.7
Closes gh-22861
2020-08-11 12:50:14 +01:00
Andy Wilkinson 6cb7eb926e Upgrade to Commons Pool2 2.8.1
Closes gh-22860
2020-08-11 12:50:14 +01:00
Andy Wilkinson d16aa3f377 Upgrade to Byte Buddy 1.10.14
Closes gh-22859
2020-08-11 12:50:14 +01:00
Stephane Nicoll 5bd69fcd61 Merge branch '2.3.x'
Closes gh-22874
2020-08-11 13:40:21 +02:00
Stephane Nicoll dc4de06b35 Restore customization of the Couchbase cache manager
With the upgrade to the new Couchbase SDK and the related changes in
Spring Data Couchbase, CacheManagerCustomizer can no longer be used to
customize the Couchbase cache manager as it is an immutable class.

This commit introduces a dedicated callback for the
CouchbaseCacheManagerBuilder that is used by the auto-configuration and
update the documentation to refer to it with a sample usage.

Closes gh-22573
2020-08-11 13:32:17 +02:00
Andy Wilkinson b2c0c958c9 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22615
2020-08-11 12:14:24 +01:00
Andy Wilkinson ca93c8da94 Merge branch '2.3.x'
Closes gh-22856
2020-08-11 10:29:20 +01:00
Stephane Nicoll 91934b5e5a Upgrade to Spring Framework 5.3.0-M2
Closes gh-22640
2020-08-11 11:10:50 +02:00
Andy Wilkinson 1270af90c2 Only enable full path optimization when there's one DispatcherServlet
Previously, UrlPathHelper's full path optimization was enabled when
there was a dispatcher servlet mapped to /. The UrlPathHelper is used
across Spring MVC and if there are multiple dispatcher servlets they
all share the sample UrlPathHelper. This meant that any additional
dispatcher servlets mapping to locations other than / would not be able
to map requests correctly as the UrlPathHelper would use the full path,
ignoring the url mapping of the dispatcher servlet.

This commit updates the MVC auto-configuration so that use of the full
path is only enabled if there's a single dispatcher servlet
registration.

Fixes gh-22682
2020-08-11 09:59:06 +01:00
Stephane Nicoll 5a96f7d682 Upgrade to RSocket 1.1.0-M1
Closes gh-22751
2020-08-11 09:23:32 +02:00
Stephane Nicoll 72189eed3d Upgrade to Reactor 2020.0.0-M2
Closes gh-22667
2020-08-11 09:23:01 +02:00
Andy Wilkinson 969dd35e45 Upgrade to Mockito 3.4.6
Closes gh-22838
2020-08-10 15:22:03 +01:00
Stephane Nicoll f2a52a87ec Merge branch '2.3.x'
Closes gh-22850
2020-08-10 16:05:47 +02:00
Stephane Nicoll 980ddcffd0 Merge branch '2.2.x' into 2.3.x
Closes gh-22849
2020-08-10 16:05:13 +02:00
Stephane Nicoll dd9c9fd171 Polish "Migrate legacy endpoint that have a dash in their id"
See gh-21615
2020-08-10 14:53:18 +02:00
Gabriele Bianchet-David 0f9f10f97e Migrate legacy endpoint that have a dash in their id
See gh-21615
2020-08-10 14:42:46 +02:00
dreis2211 11df8216ad Fix some doc anchors
See gh-22839
2020-08-10 14:34:22 +02:00
Stephane Nicoll fcab5d6ce1 Merge branch '2.3.x' 2020-08-10 14:33:50 +02:00
Stephane Nicoll 2b578296f9 Merge branch '2.2.x' into 2.3.x 2020-08-10 14:33:37 +02:00
Stephane Nicoll 8962d6ca21 Polish 2020-08-10 14:31:16 +02:00
Stephane Nicoll dedf09d20f Merge branch '2.3.x'
Closes gh-22848
2020-08-10 14:23:56 +02:00
Stephane Nicoll f466734801 Merge branch '2.2.x' into 2.3.x
Closes gh-22847
2020-08-10 14:23:31 +02:00
Stephane Nicoll 333af3d4e7 Polish "Propagate the cause that led Reactor"s debug agent to fail"
See gh-22777
2020-08-10 14:21:44 +02:00
davidbilge 12c419054a Propagate the cause that led Reactor"s debug agent to fail
Prior to this commit, DebugAgentEnvironmentPostProcessor throws a
RuntimeException with a generic error message if its initialization
fails. The causing exception is discarded, which makes error analysis
unnecessarily difficult.

This commit attaches the cause to the newly thrown RuntimeException.

See gh-22777
2020-08-10 14:21:26 +02:00
Stephane Nicoll b2e581947f Upgrade to Reactor Dysprosium-SR11
Closes gh-22841
2020-08-10 14:13:07 +02:00
Stephane Nicoll 13260eab46 Merge branch '2.3.x'
Closes gh-22846
2020-08-10 14:08:38 +02:00
ksmilek 5cb1b41355 Fix wrong reference in `ReadinessStateHealthIndicator` javadoc
See gh-22760
2020-08-10 14:03:46 +02:00
Stephane Nicoll dea2cc480d Start building against Spring Data Neumann SR3 snapshots
See gh-22844
2020-08-10 10:49:06 +02:00
Stephane Nicoll 1fdc6017ae Start building against Spring Kafka 2.5.5 snapshots
See gh-22843
2020-08-10 10:48:31 +02:00
Stephane Nicoll 4d95fb560b Start building against Spring AMQP 2.2.10 snapshotsEnabled
See gh-22842
2020-08-10 10:47:50 +02:00
Stephane Nicoll 2a3d45e5c4 Start building against Reactor Dysprosium-SR11 snapshots
See gh-22841
2020-08-10 10:47:04 +02:00
Andy Wilkinson 4933b2688f Align with changes in latest Integration snapshots
See gh-22729
2020-08-07 20:11:01 +01:00
Brian Clozel 7e159c346e Adapt to MonoProcessor deprecations in Reactor
This commit updates our usage of `MonoProcessor` after the deprecations
introduced in reactor/reactor-core#1053
2020-08-07 19:03:53 +02:00
Brian Clozel 9343266c4f End StartupSteps only once in SpringApplicationRunListeners
Fixes gh-22776
2020-08-07 19:03:53 +02:00
Andy Wilkinson e240c180f3 Merge branch '2.3.x'
Closes gh-22831
2020-08-07 17:19:03 +01:00
Andy Wilkinson 181e3b34ba Isolate Maven Plugin's integration tests from repo.spring.io
Previously, the Maven plugin integration tests used a settings.xml file
that defined https://repo.spring.io/snapshot as a repository. This
allowed them to resolve snapshots of the plugin's Spring Framework
dependencies but it had the unfortunate side-effect of also allowing
them to resolve snapshots of other Spring Boot modules from Artifactory
rather than using those currently being built.

This commit replaces the repositories in settings.xml with a Gradle
task that resolves the necessary dependencies and populates a local
repository with the dependencies' jars and pom files. This is achieved
using a ComponentMetadataRule that creates a custom variant of each
dependency that includes its pom file, inspired by the example in
gradle/gradle/#11449. A configuration that extends the
runtimeClasspath configuration and select the custom variant via its
attribute is then used to resolve the jars and pom files of the runtime
classpath such that they can then be used to populate the local
repository.

Closes gh-22828
2020-08-07 17:18:47 +01:00
Brian Clozel 6336007038 Merge branch '2.3.x'
Closes gh-22826
2020-08-07 16:01:25 +02:00
Brian Clozel fea535d176 Update HTTP/2 auto-configuration for Jetty
Prior to this commit, the HTTP/2 server auto-configuration for Jetty
would require Conscrypt as a hard dependency.

This commit updates the auto-configuration for more flexibility and now
allows the following deployments:

* JDK9+ with the JDK ALPN implementation
* JDK8u252+ with the backported ALPN implementation
* Conscrypt with no JDK requirement

The auto-configuration now improves detection and guides developers in
case there is a missing `jetty-alpn-*-server` dependency.

The reference docs in the HOWTO section has been updated accordingly.

Closes gh-22188
2020-08-07 15:42:23 +02:00
Andy Wilkinson 0ffe51bb62 Merge branch '2.3.x'
Closes gh-22820
2020-08-07 11:31:03 +01:00
Andy Wilkinson be32843dab Configure generated snippets as inputs to the Asciidoctor tasks
Closes gh-22819
2020-08-07 11:28:58 +01:00
Andy Wilkinson cd05716194 Upgrade to Tomcat 9.0.37
Closes gh-22818
2020-08-07 09:58:38 +01:00
Andy Wilkinson ac9a269e77 Upgrade to SQLite JDBC 3.32.3.2
Closes gh-22817
2020-08-07 09:58:37 +01:00
Andy Wilkinson d3b8c3fc6c Upgrade to Spring HATEOAS 1.1.1.RELEASE
Closes gh-22816
2020-08-07 09:58:35 +01:00
Andy Wilkinson 312d94ef0c Upgrade to Solr 8.5.2
Closes gh-22815
2020-08-07 09:58:34 +01:00
Andy Wilkinson 47c22fdbee Upgrade to SendGrid 4.6.3
Closes gh-22814
2020-08-07 09:58:33 +01:00
Andy Wilkinson 1fdb86dc6c Upgrade to Selenium HtmlUnit 2.42.0
Closes gh-22813
2020-08-07 09:58:31 +01:00
Andy Wilkinson 0af0fe765d Upgrade to Netty 4.1.51.Final
Closes gh-22812
2020-08-07 09:58:30 +01:00
Andy Wilkinson 131319cb90 Upgrade to MySQL 8.0.21
Closes gh-22811
2020-08-07 09:58:28 +01:00
Andy Wilkinson c46e84870a Upgrade to MongoDB 4.1.0
Closes gh-22810
2020-08-07 09:58:27 +01:00
Andy Wilkinson 8a35b078ec Upgrade to Micrometer 1.5.3
Closes gh-22809
2020-08-07 09:58:26 +01:00
Andy Wilkinson a35073def5 Upgrade to Maven War Plugin 3.3.1
Closes gh-22808
2020-08-07 09:58:25 +01:00
Andy Wilkinson b6edb4d252 Upgrade to MariaDB 2.6.2
Closes gh-22807
2020-08-07 09:58:23 +01:00
Andy Wilkinson b204736f35 Upgrade to Liquibase 3.10.2
Closes gh-22806
2020-08-07 09:58:22 +01:00
Andy Wilkinson 36406a0d1e Upgrade to Lettuce 5.3.2.RELEASE
Closes gh-22805
2020-08-07 09:58:20 +01:00
Andy Wilkinson c00823bc63 Upgrade to jOOQ 3.13.4
Closes gh-22804
2020-08-07 09:58:19 +01:00
Andy Wilkinson b977f14372 Upgrade to Johnzon 1.2.8
Closes gh-22803
2020-08-07 09:58:18 +01:00
Andy Wilkinson dc56170d7b Upgrade to Jetty 9.4.31.v20200723
Closes gh-22802
2020-08-07 09:58:16 +01:00
Andy Wilkinson cfd11214fd Upgrade to Jackson Bom 2.11.2
Closes gh-22801
2020-08-07 09:58:15 +01:00
Andy Wilkinson ed8237ab98 Upgrade to Infinispan 11.0.3.Final
Closes gh-22800
2020-08-07 09:58:13 +01:00
Andy Wilkinson 6253ec8e81 Upgrade to HtmlUnit 2.42.0
Closes gh-22799
2020-08-07 09:58:12 +01:00
Andy Wilkinson ebcecf3669 Upgrade to HSQLDB 2.5.1
Closes gh-22798
2020-08-07 09:58:11 +01:00
Andy Wilkinson 84c0b426eb Upgrade to Hibernate 5.4.19.Final
Closes gh-22797
2020-08-07 09:58:10 +01:00
Andy Wilkinson 7ce5442240 Upgrade to Flyway 6.5.3
Closes gh-22796
2020-08-07 09:58:08 +01:00
Andy Wilkinson 89abcad3e8 Upgrade to Dropwizard Metrics 4.1.11
Closes gh-22795
2020-08-07 09:58:07 +01:00
Andy Wilkinson d72b61ac6c Upgrade to DB2 JDBC 11.5.4.0
Closes gh-22794
2020-08-07 09:58:05 +01:00
Andy Wilkinson 8b95b3a537 Upgrade to Commons Pool2 2.8.1
Closes gh-22793
2020-08-07 09:58:04 +01:00
Andy Wilkinson 37d0a62973 Upgrade to Commons Lang3 3.11
Closes gh-22792
2020-08-07 09:58:03 +01:00
Andy Wilkinson c6e6d090b9 Upgrade to Cassandra Driver 4.8.0
Closes gh-22791
2020-08-07 09:58:01 +01:00
Andy Wilkinson 02ffeec89d Upgrade to Caffeine 2.8.5
Closes gh-22790
2020-08-07 09:58:00 +01:00
Andy Wilkinson c287f6fa1c Upgrade to Byte Buddy 1.10.14
Closes gh-22789
2020-08-07 09:57:58 +01:00
Andy Wilkinson 35582774b2 Upgrade to Build Helper Maven Plugin 3.2.0
Closes gh-22788
2020-08-07 09:57:57 +01:00
Andy Wilkinson 2a95b9cb48 Upgrade to AspectJ 1.9.6
Closes gh-22787
2020-08-07 09:57:56 +01:00
Andy Wilkinson 7c54a3aa88 Upgrade to Artemis 2.14.0
Closes gh-22786
2020-08-07 09:57:55 +01:00
Andy Wilkinson 309e9d4d0a Upgrade to AppEngine SDK 1.9.81
Closes gh-22785
2020-08-07 09:57:53 +01:00
Andy Wilkinson 66fa39355d Upgrade to ActiveMQ 5.16.0
Closes gh-22784
2020-08-07 09:57:52 +01:00
Andy Wilkinson 915c3ec712 Merge branch '2.3.x'
Closes gh-22781
2020-08-07 09:44:33 +01:00
Andy Wilkinson 95b504ccad Make processResources out-of-date on version change
Closes gh-22780
2020-08-07 09:44:16 +01:00
Madhura Bhave 6d82e9e97f Merge branch '2.3.x'
Closes gh-22775
2020-08-06 18:00:05 -07:00
Madhura Bhave 3f82ca40e2 Merge branch '2.2.x' into 2.3.x
Closes gh-22774
2020-08-06 17:59:30 -07:00
Madhura Bhave f39f33bb8d Fix documentation related to the health endpoint's inner details
Closes gh-22490
2020-08-06 17:57:56 -07:00
Phillip Webb f8c8b65cbf Add ConfigDataEnvironmentPostProcessor.applyTo
Add static methods to `ConfigDataEnvironmentPostProcessor` so that
post-processing can be applied to `Environment` instances directly.

Closes gh-22601
2020-08-06 14:35:43 -07:00
Phillip Webb f7f4ff0ac9 Update copyright year of changed files 2020-08-06 14:35:43 -07:00
Phillip Webb dfd233cada Polish 2020-08-06 14:35:43 -07:00
Phillip Webb 8d06b0f368 Merge branch '2.3.x' 2020-08-06 10:15:36 -07:00
Phillip Webb 4924573074 Merge branch '2.2.x' into 2.3.x 2020-08-06 10:15:22 -07:00
Phillip Webb fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Stephane Nicoll dac63fc3e5 Polish 2020-08-06 17:35:01 +02:00
Andy Wilkinson 8b3f8a6138 Merge branch '2.3.x'
Closes gh-22768
2020-08-06 15:14:16 +01:00
Andy Wilkinson 11d1002f15 Merge branch '2.2.x' into 2.3.x
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson 07699ea6ff Retry when dependency resolution fails in ModifiedClassPathClassLoader
Closes gh-22763
2020-08-06 15:12:20 +01:00
Brian Clozel 4ef08425e6 Require RSocket 1.0+
This commit removes usage of methods and classes that were previously
deprecated in RSocket and Spring Framework and have been removed.

Closes gh-22764
2020-08-06 16:10:43 +02:00
Andy Wilkinson 4b17bfd889 Merge branch '2.3.x' 2020-08-06 13:34:31 +01:00
Andy Wilkinson 327138c227 Merge branch '2.2.x' into 2.3.x 2020-08-06 13:34:12 +01:00
Andy Wilkinson 63f7c75b61 Polish 2020-08-06 13:34:01 +01:00
Andy Wilkinson 079b5d3f50 Polish Gradle plugin after layering being enabled by default
Closes gh-20983
2020-08-06 11:37:09 +01:00
Brian Clozel 9f558181d5 Instrument SpringBootApplication for ApplicationStartup
This commit allows the configuration of a custom `ApplicationStartup`
implementation on the `SpringApplication` and
`SpringApplicationBuilder` for collecting `StartupStep` metrics.

This also instruments Spring Boot run listeners and server-specific
application context implementations for collecting Spring Boot
application events during startup.

Closes gh-22600
2020-08-06 12:08:02 +02:00
Andy Wilkinson 5cc5baa303 Starting building against Spring AMQP 2.3.0-M2 snapshots
See gh-22761
2020-08-06 10:51:44 +01:00
Andy Wilkinson 792c4f46ef Merge branch '2.3.x'
Closes gh-22759
2020-08-06 09:22:11 +01:00
Andy Wilkinson c121f9f61f Merge branch '2.2.x' into 2.3.x
Closes gh-22758
2020-08-06 09:21:29 +01:00
Andy Wilkinson b53f54f2cf Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
Closes gh-22281
2020-08-06 09:21:11 +01:00
Madhura Bhave f0ef47dfad Fix additional deprecations 2020-08-05 15:09:51 -07:00
Madhura Bhave 0d79bd08a6 Fix deprecations 2020-08-05 15:01:44 -07:00
Madhura Bhave 5f386e456b Fix test 2020-08-05 14:59:27 -07:00
Madhura Bhave b9abcf1615 Fail hard if spring.profiles.include is used with new config processing
Closes gh-22693
2020-08-05 14:41:32 -07:00
Brian Clozel e719a246df Upgrade to Spring Security 5.4.0-RC1
Closes gh-22668
2020-08-05 21:33:36 +02:00
Andy Wilkinson 9c417d280c Merge branch '2.3.x'
Closes gh-22749
2020-08-05 18:15:59 +01:00
Andy Wilkinson a160755da5 Merge branch '2.2.x' into 2.3.x
Closes gh-22748
2020-08-05 18:15:45 +01:00
Andy Wilkinson bfe250e5d3 Clarify docs on schema and data SQL scripts with Flyway and Liquibase
Closes gh-20920
2020-08-05 18:14:39 +01:00
Andy Wilkinson 0e83b2f4c4 Merge branch '2.3.x'
Closes gh-22747
2020-08-05 17:47:38 +01:00
Andy Wilkinson c40835eba0 Merge branch '2.2.x' into 2.3.x
Closes gh-22746
2020-08-05 17:47:24 +01:00
Andy Wilkinson 71ffb44a3c Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the endpoints' responses could occasionally exceed
WebClient's in-memory buffer limt, for example if the threads endpoint
was reporting a large number of threads or the threads had large
stacks.

This commit disables WebClient's in-memory buffer size limit so that
the tests passing is not dependent on the size of the endpoints'
responses.

Closes gh-22743
2020-08-05 17:37:44 +01:00
Stephane Nicoll 516582f6d3 Merge branch '2.3.x'
Closes gh-22744
2020-08-05 18:05:07 +02:00
Johnny Lim 1017774ed5 Polish
See gh-22740
2020-08-05 17:59:03 +02:00
Stephane Nicoll 313b2bef6f Polish "Add test slice for Spring Data Cassandra"
See gh-17490
2020-08-05 16:46:52 +02:00
ayudovin ae152b176b Add test slice for Spring Data Cassandra
See gh-17490
2020-08-05 16:46:52 +02:00
Andy Wilkinson 7df49187fa Merge branch '2.3.x'
Closes gh-22738
2020-08-05 09:05:28 +01:00
Andy Wilkinson 94644f3814 Merge branch '2.2.x' into 2.3.x
Closes gh-22737
2020-08-05 09:05:10 +01:00
Andy Wilkinson 2238b0d797 Try to make FileSystemWatcherTests.waitsForQuietPeriod() more robust
Previously, waitsForQuietPeriod would iterate 10 times, touching a new
file and then sleeping for 100ms at it did so. With a quiet period of
200ms, this was intended to result in a single change set containing
10 files. However, the test would fail occasionally as multiple change
sets were detected. The test is multi-threaded and is, therefore, at
the mercy of the scheduler. If the thread that is iterating and
touching the files takes over 200ms to be scheduled – exceeding the
watcher's quiet period – the watcher may detect a change set while the
changes are still being made. Eliminating this possibilty would require
the test to participate in the watcher's synchronization, which would
require some changes to its implementation. Instead, this commit
aims to avoid the problem by sleeping for 1/10 of the time (10ms) and
expecting a single change set of 100 files. The hope is that the much
shorter sleep time will result in the file touching thread being
scheduled well within the 200ms quiet period.

Closes gh-22732
2020-08-05 09:00:49 +01:00
Stephane Nicoll 621f026499 Polish "Support configuration of entityId for a SAML Relying Party"
See gh-22258
2020-08-05 09:41:54 +02:00
Danilo Piazzalunga 5352ec1cba Support configuration of entityId for a SAML Relying Party
See gh-22258
2020-08-05 09:41:38 +02:00
Stephane Nicoll 589669d0cc Polish "Add support for selecting the Redis client to use"
See gh-22569
2020-08-05 09:21:52 +02:00
bono007 ac651442fa Add support for selecting the Redis client to use
See gh-22569
2020-08-05 09:05:06 +02:00
Scott Frederick f247fec310 Merge branch '2.3.x'
Closes gh-22735
2020-08-04 15:30:17 -05:00
Scott Frederick 21b2dd2740 Allow empty env entries when building an image
Prior to this commit, an entry in the environment map provided to the
build plugin image building goal or task that had a null value would
result in a failure with a message that was difficult to diagnose.

This commit treats env map entries with a null value as an empty
entry to prevent the failure and also make it easier to provide an
explicit empty entry in the Maven XML.

Fixes gh-22703
2020-08-04 15:29:29 -05:00
Andy Wilkinson bc44cd6705 Polish 2020-08-04 18:43:45 +01:00
Andy Wilkinson 6e00022b2d Start building against Spring Integration 5.4.0-M2 snapshots
See gh-22729
2020-08-04 18:14:23 +01:00
Andy Wilkinson 02f888bccf Start building against Spring Kafka 2.6.0-M1 snapshots
See gh-22730
2020-08-04 18:14:23 +01:00
Andy Wilkinson 7f53aef568 Upgrade to Kafka 2.6.0
Closes gh-22731
2020-08-04 18:14:23 +01:00
Stephane Nicoll 903dc93887 Polish "Add option to disable Redis Cluster dynamic sources refresh"
See gh-22571
2020-08-04 16:42:33 +02:00
bono007 3cfde51a8c Add option to disable Redis Cluster dynamic sources refresh
This commit adds an option to enable/disable the DynamicRefreshSources
setting on the Lettuce cluster toplogy refresh options.

See gh-22571
2020-08-04 16:42:33 +02:00
Stephane Nicoll 36fb86a110 Update to core r2dbc support
This commit adapts the auto-configuration for the new core r2dbc support
in Spring Framework and provides auto-configuration for
R2dbcEntityOperations.

Closes gh-22708
2020-08-04 16:00:29 +02:00
Brian Clozel 3354e0f030 Upgrade to Spring Security 5.4.0-SNAPSHOT
See gh-22668
2020-08-04 13:27:04 +02:00
Brian Clozel 94148e9b54 Upgrade to Couchbase Java Client 3.0.7
Closes gh-22688
2020-08-04 13:26:58 +02:00
Brian Clozel fb1234a22c Upgrade to Reactor 2020.0.0 SNAPSHOTs
See gh-22667
2020-08-04 13:26:47 +02:00
Madhura Bhave 41f5ba9077 Switch layering on by default
Closes gh-20983
2020-08-03 17:04:20 -07:00
dreis2211 e49e2dfff1 Use Supplier variants of Assert methods
See gh-22699
2020-08-03 15:06:13 +02:00
Stephane Nicoll bb3066f61a Merge branch '2.3.x'
Closes gh-22707
2020-08-03 15:02:05 +02:00
Stephane Nicoll 13f1d00048 Merge branch '2.2.x' into 2.3.x
Closes gh-22706
2020-08-03 15:01:07 +02:00
Stephane Nicoll 4082cddce2 Merge branch '2.1.x' into 2.2.x
Closes gh-22705
2020-08-03 15:00:41 +02:00
Johnny Lim bd2874de49 Fix broken links to Micrometer registry docs
See gh-22704
2020-08-03 14:58:22 +02:00
Andy Wilkinson 1168d8fa74 Reduce reflection in LoggingSystem to make it more Graal-friendly
Closes gh-22594
2020-08-03 11:38:10 +01:00
Andy Wilkinson 989fc36528 Polish 2020-08-03 10:51:22 +01:00
Andy Wilkinson 11a296b068 Polish "Fix NPE in BeanDefinitionLoader when XML support is disabled"
See gh-22696
2020-08-03 09:54:43 +01:00
dreis2211 2bdeba8aaa Fix NPE in BeanDefinitionLoader when XML support is disabled
See gh-22696
2020-08-03 09:53:40 +01:00
Brian Clozel 6efff7b585 Merge branch '2.3.x'
Closes gh-22698
2020-08-01 21:11:28 +02:00