Commit Graph

12895 Commits

Author SHA1 Message Date
Phillip Webb 9af6c895c9 Merge branch '2.3.x' into 2.4.x 2021-03-23 13:09:25 -07:00
Phillip Webb 2b591387b8 Restore tomcat-embed TldPatterns
Restore tomcat-embed-core-* and tomcat-embed-logging-* patterns which
were inadvertently removed in commit 0ec8d281ef.

See gh-25764
2021-03-23 13:07:15 -07:00
Phillip Webb 77ddb45704 Merge branch '2.4.x' 2021-03-23 12:53:59 -07:00
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb 82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Phillip Webb 985e5a4340 Merge branch '2.4.x'
Closes gh-25771
2021-03-23 12:49:59 -07:00
Phillip Webb 56674b9031 Merge branch '2.3.x' into 2.4.x
Closes gh-25770
2021-03-23 12:48:51 -07:00
Phillip Webb 0ec8d281ef Align TldPatterns with Tomcat default
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.

Closes gh-25764
2021-03-23 12:46:27 -07:00
Andy Wilkinson 5e3d5ebe21 Merge branch '2.4.x'
Closes gh-25769
2021-03-23 14:48:49 +00:00
Andy Wilkinson 96ba9ae47f Merge branch '2.3.x' into 2.4.x
Closes gh-25768
2021-03-23 14:48:24 +00:00
Andy Wilkinson 62023104de Test auto-configured MockRestServiceServer with metrics and a root URI
Closes gh-25741
2021-03-23 14:37:37 +00:00
Andy Wilkinson ce3dfc5792 Merge branch '2.4.x'
Closes gh-25767
2021-03-23 13:42:15 +00:00
Stephane Nicoll db782f5013 Add environment prefix support to SpringApplicationBuilder
Closes gh-25740
2021-03-23 14:25:03 +01:00
Andy Wilkinson 33cf8b3bc4 Merge branch '2.3.x' into 2.4.x
Closes gh-25765
2021-03-23 13:06:35 +00:00
Andy Wilkinson bf6f36a783 Apply any root URI to RestTemplate metric's URI tag
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.

This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.

Fixes gh-25744
2021-03-23 13:05:54 +00:00
Andy Wilkinson f0a8c02efd Provide a constant for graceful shutdown's smart lifecyle phase
In order to provide a single constant for graceful shutdown's smart
lifecycle, this commit replaces the package-private reactive and
servlet-specific implementations with a single public implementation
that can be used by both web stacks. This new public implementation
provides a constant for its smart lifecycle phase.

Closes gh-24255
2021-03-23 11:11:26 +00:00
Andy Wilkinson ca46fe7cd0 Test our Gradle plugin against Gradle 7.0-rc-1
Closes gh-25763
2021-03-23 10:41:43 +00:00
Andy Wilkinson 5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson fa336bb565 Move DataSource dependency detection into dedicated package
Closes gh-25757
2021-03-22 14:23:14 +00:00
Stephane Nicoll a900306b17 Merge branch '2.4.x'
Closes gh-25755
2021-03-22 14:46:37 +01:00
Stephane Nicoll 2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007 674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Andy Wilkinson 64f9d8d4fe Deprecate support for Mustache's Environment fallback
Closes gh-21045
2021-03-22 11:45:01 +00:00
Scott Frederick 2dd4010eb0 Merge branch '2.4.x'
Closes gh-25701
2021-03-19 15:58:14 -05:00
Scott Frederick 6f860b441b Merge branch '2.3.x' into 2.4.x
Closes gh-25700
2021-03-19 14:52:20 -05:00
Andy Wilkinson fb670ee654 Drop support for Gradle 5.6.x
Closes gh-24225
2021-03-19 17:30:27 +00:00
Andy Wilkinson 83342c7aa7 Test the Gradle plugin against 7.0-milestone-3
Closes gh-25747
2021-03-19 17:01:38 +00:00
Phillip Webb 26ee346510 Polish 'Support OpenMetrics text format with Prometheus'
Closes gh-25564
2021-03-18 20:50:43 -07:00
Andy Wilkinson 11b4a19dee Support OpenMetrics text format with Prometheus
Update `PrometheusScrapeEndpoint` so that it can produce both classic
Prometheus text output as well as Openmetrics output.

See gh-25564
2021-03-18 20:50:40 -07:00
Phillip Webb c81a0223cc Refine 'Allow operations to produce different output'
Refine the new `Producible` support so that it can also be used with
`@ReadOperation`, `@WriteOperation` and `@DeleteOperation` annotations.

This update allows the same enum to be used both as an argument and as
an indicator of the media-types that an operation may produce.

Closes gh-25738
2021-03-18 20:50:27 -07:00
Andy Wilkinson 1ec49cee8b Allow operations to produce different output
Update the actuator @Enpoint` infrastructure code so that operations
may inject enums that indicate the type of output to produce. A new
`Producible` interface can be implemented by any enum that indicates
the mime-type that an enum value produces.

The new `OperationArgumentResolver` provides a general strategy for
resolving operation arguments with `ProducibleOperationArgumentResolver`
providing support for `Producible` enums. Existing injection support has
been refactored to use the new resolver.

See gh-25738
2021-03-18 20:36:18 -07:00
Phillip Webb 663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Phillip Webb 685b045c3d Polish 2021-03-18 14:49:52 -07:00
Phillip Webb bb38ee38a6 Fix package tangle and polish prefix support
Polish the prefix support introduced in commit a8592f36d4 and fix a
package tangle between `boot.context.properties.source` and `boot.env`.

The `Prefix` interface has now been moved into a new default method on
`OriginLookup`.

See gh-3450
2021-03-18 14:49:52 -07:00
Stephane Nicoll 1111b3db98 Polish 2021-03-18 09:10:42 +01:00
Stephane Nicoll efcb5ee684 Upgrade to Spring Batch 4.3.2
Closes gh-25580
2021-03-18 08:29:43 +01:00
Stephane Nicoll 072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
2021-03-18 08:28:36 +01:00
Stephane Nicoll eff3a4f1a6 Upgrade to Spring Kafka 2.7.0-RC1
Closes gh-25582
2021-03-18 08:14:09 +01:00
Stephane Nicoll cd81784772 Upgrade to Spring AMQP 2.3.6
Closes gh-25648
2021-03-18 07:56:42 +01:00
Stephane Nicoll 91619d6555 Upgrade to Spring Integration 5.5.0-M3
Closes gh-25577
2021-03-18 07:56:01 +01:00
Stephane Nicoll 8e35d6a5fc Upgrade to Spring Integration 5.4.5
Closes gh-25646
2021-03-18 07:55:06 +01:00
Phillip Webb 8ba45cc6b5 Allow DB migrations without DataSourceProperties
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.

This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.

Closes gh-25643
2021-03-17 17:05:04 -07:00
Phillip Webb 85f1e2c9b6 Refactor DataSourceBuilder and add derivedFrom
Refactor `DataSourceBuilder` to use direct property mappers rather than
the `Binder` and aliases. Supported DataSource types now include two-way
mappers which allows us to both get and set properties in a uniform way.

A new `derivedFrom` factory method has been added which allows a new
`DataSource` to be derived from an existing one. This update is
primarily to allow Flyway and Liquibase migrations to work against a
`@Bean` configured DataSource rather than assuming that the primary
DataSource was always created via auto-configuration.

See gh-25643
2021-03-17 17:00:44 -07:00
Phillip Webb 6e92daa0a0 Change Kafka cleanup.on-shutdown default to false
Align our property with the recently changed spring-kafka default.

Closes gh-25730
2021-03-17 16:38:46 -07:00
Scott Frederick e4fa39df01 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson 0d7a60f8cf Upgrade to Spring AMQP 2.3.6
Closes gh-25647
2021-03-17 18:27:16 +00:00
Andy Wilkinson 5005bd3ded Upgrade to Spring Kafka 2.6.7
Closes gh-25578
2021-03-17 18:26:44 +00:00
Stephane Nicoll 54e7d7f060 Promote ConnectionFactoryBuilder to the "spring-boot" module
Closes gh-25492
2021-03-17 16:26:54 +00:00
Stephane Nicoll 8808d5e4c0 Polish "Support sending metrics to InfluxDB v2"
See gh-25721
2021-03-17 15:56:04 +01:00
Tommy Ludwig 8eb73bcf01 Support sending metrics to InfluxDB v2
See gh-25721
2021-03-17 15:14:43 +01:00
Stephane Nicoll 6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:09:37 +01:00
Stephane Nicoll 91c3c7276b Merge branch '2.4.x'
Closes gh-25725
2021-03-17 15:08:47 +01:00
Stephane Nicoll 42994349fe Merge branch '2.3.x' into 2.4.x
Closes gh-25724
2021-03-17 15:08:32 +01:00
Stephane Nicoll 446e838b1b Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:07:02 +01:00
Stephane Nicoll 2f1ee94321 Upgrade to Spring Data 2021.0.0-M5
Close gh-25548
2021-03-17 14:42:03 +01:00
Stephane Nicoll 83ae2df42f Upgrade to Lettuce 6.1.0.RC1
Closes gh-25722
2021-03-17 14:40:23 +01:00
Stephane Nicoll 606c871d4a Upgrade to Spring Data 2020.0.6
Closes gh-25547
2021-03-17 14:27:48 +01:00
Stephane Nicoll 052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE
Closes gh-25720
2021-03-17 14:25:38 +01:00
Stephane Nicoll a8667daf52 Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25719
2021-03-17 14:25:36 +01:00
Andy Wilkinson 67545cf4f1 Polish 2021-03-17 12:39:50 +00:00
Andy Wilkinson 7ef9ca02c1 Merge branch '2.4.x'
Closes gh-25718
2021-03-17 12:26:58 +00:00
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson 2adf3f836c Merge branch '2.4.x' 2021-03-17 12:25:24 +00:00
Andy Wilkinson c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson 36c72cb6ef Merge branch '2.4.x'
Closes gh-25716
2021-03-17 11:33:48 +00:00
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson 68e5a107cc Revert "Merge branch '2.4.x'"
This reverts commit 5488b8cb46, reversing
changes made to dee0df5c53.

See gh-25701
2021-03-17 11:17:54 +00:00
Andy Wilkinson ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit eaa510872a, reversing
changes made to 3e69522e2d.

See gh-25700
2021-03-17 11:13:58 +00:00
Andy Wilkinson ae2ff7849b Revert "Fail fast when finalName is misconfigured"
This reverts commit 263b7c20e4.

See gh-25590
2021-03-17 11:11:24 +00:00
Stephane Nicoll eb406867ea Polish "Upgrade to Micrometer 1.7.0-M1"
See gh-25707
2021-03-17 11:28:52 +01:00
Jonatan Ivanov 7c5e0505d8 Upgrade to Micrometer 1.7.0-M1
See gh-25707
2021-03-17 11:12:25 +01:00
Scott Frederick 5488b8cb46 Merge branch '2.4.x'
Closes gh-25701
2021-03-16 17:48:54 -05:00
Scott Frederick eaa510872a Merge branch '2.3.x' into 2.4.x
Closes gh-25700
2021-03-16 17:31:32 -05:00
Scott Frederick 263b7c20e4 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-16 17:22:48 -05:00
Andy Wilkinson dee0df5c53 Merge branch '2.4.x'
Closes gh-25703
2021-03-16 20:25:41 +00:00
Andy Wilkinson 3e69522e2d Merge branch '2.3.x' into 2.4.x
Closes gh-25702
2021-03-16 20:25:25 +00:00
Andy Wilkinson f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
2021-03-16 20:24:45 +00:00
Andy Wilkinson 21c7df9e49 Upgrade to Spring WS 3.1.0-M2
Closes gh-25694
2021-03-16 19:11:24 +00:00
Andy Wilkinson b1f5f34617 Merge branch '2.4.x'
Closes gh-25693
2021-03-16 16:35:47 +00:00
Andy Wilkinson 2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
2021-03-16 16:35:31 +00:00
Andy Wilkinson a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito 42841b895f Improve error message when no resources exist at a script location
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson 226ee61dea Create exception reporters when needed so they pick up current state
Fixes gh-25691
2021-03-16 16:13:40 +00:00
Andy Wilkinson 19ad19a10b Upgrade to Undertow 2.2.5.Final
Closes gh-25688
2021-03-16 13:54:31 +00:00
Andy Wilkinson ab45b41005 Upgrade to Tomcat 9.0.44
Closes gh-25687
2021-03-16 13:54:31 +00:00
Andy Wilkinson 69a7f846d1 Upgrade to Sun Mail 1.6.6
Closes gh-25686
2021-03-16 13:54:31 +00:00
Andy Wilkinson 4096a85825 Upgrade to Spring WS 3.1.0-M1
Closes gh-25685
2021-03-16 13:54:31 +00:00
Andy Wilkinson 12bab7399b Upgrade to Solr 8.8.1
Closes gh-25684
2021-03-16 13:54:31 +00:00
Andy Wilkinson 66a2603f10 Upgrade to SnakeYAML 1.28
Closes gh-25683
2021-03-16 13:54:31 +00:00
Andy Wilkinson d5099e7c3f Upgrade to SendGrid 4.7.2
Closes gh-25682
2021-03-16 13:54:30 +00:00
Andy Wilkinson 8dbe8a2539 Upgrade to Rabbit AMQP Client 5.11.0
Closes gh-25681
2021-03-16 13:54:30 +00:00
Andy Wilkinson 0991a26ae2 Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25680
2021-03-16 13:54:30 +00:00
Andy Wilkinson 1837429f6a Upgrade to Postgresql 42.2.19
Closes gh-25679
2021-03-16 13:54:30 +00:00
Andy Wilkinson b1b57d225f Upgrade to Netty 4.1.60.Final
Closes gh-25678
2021-03-16 13:54:30 +00:00
Andy Wilkinson 5b8088cedc Upgrade to Neo4j Java Driver 4.2.3
Closes gh-25677
2021-03-16 13:54:30 +00:00
Andy Wilkinson afced0035b Upgrade to MSSQL JDBC 9.2.1.jre8
Closes gh-25676
2021-03-16 13:54:29 +00:00
Andy Wilkinson 17ecf18a15 Upgrade to MongoDB 4.2.2
Closes gh-25675
2021-03-16 13:54:29 +00:00
Andy Wilkinson 2e796f0406 Upgrade to Mockito 3.8.0
Closes gh-25674
2021-03-16 13:54:29 +00:00
Andy Wilkinson 8ee9da36f1 Upgrade to Micrometer 1.6.5
Closes gh-25673
2021-03-16 13:54:29 +00:00
Andy Wilkinson 731f867d54 Upgrade to Log4j2 2.14.1
Closes gh-25672
2021-03-16 13:54:29 +00:00
Andy Wilkinson 7d340035fd Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25671
2021-03-16 13:54:28 +00:00
Andy Wilkinson a6909c6143 Upgrade to jOOQ 3.14.8
Closes gh-25669
2021-03-16 13:54:28 +00:00
Andy Wilkinson 0fea72e2ca Upgrade to Jetty Reactive HTTPClient 1.1.6
Closes gh-25668
2021-03-16 13:54:28 +00:00
Andy Wilkinson 8ec21c4a41 Upgrade to Jedis 3.5.2
Closes gh-25667
2021-03-16 13:54:28 +00:00
Andy Wilkinson eaeb4f2d73 Upgrade to Jakarta Mail 1.6.6
Closes gh-25666
2021-03-16 13:54:28 +00:00
Andy Wilkinson ae28a449e5 Upgrade to Jackson Bom 2.12.2
Closes gh-25665
2021-03-16 13:54:27 +00:00
Andy Wilkinson 9675faac07 Upgrade to Infinispan 12.0.2.Final
Closes gh-25664
2021-03-16 13:54:27 +00:00
Andy Wilkinson 082b9ec5e4 Upgrade to HikariCP 4.0.3
Closes gh-25663
2021-03-16 13:54:27 +00:00
Andy Wilkinson 04339b839b Upgrade to Hibernate 5.4.29.Final
Closes gh-25662
2021-03-16 13:54:27 +00:00
Andy Wilkinson 80df0ee70e Upgrade to Hazelcast 4.1.2
Closes gh-25661
2021-03-16 13:54:27 +00:00
Andy Wilkinson 4a75798acc Upgrade to Flyway 7.7.0
Closes gh-25660
2021-03-16 13:54:27 +00:00
Andy Wilkinson 2006444b71 Upgrade to Ehcache3 3.9.2
Closes gh-25659
2021-03-16 11:32:10 +00:00
Andy Wilkinson 9b3f92c29a Upgrade to Dropwizard Metrics 4.1.18
Closes gh-25658
2021-03-16 11:32:09 +00:00
Andy Wilkinson 4c1bd43f92 Upgrade to Couchbase Client 3.1.3
Closes gh-25657
2021-03-16 11:32:07 +00:00
Andy Wilkinson f8cf53ca4b Upgrade to Commons Lang3 3.12.0
Closes gh-25656
2021-03-16 11:32:06 +00:00
Andy Wilkinson 9e83bbbce7 Upgrade to Byte Buddy 1.10.22
Closes gh-25655
2021-03-16 11:32:05 +00:00
Andy Wilkinson bd2099d49e Upgrade to AppEngine SDK 1.9.87
Closes gh-25654
2021-03-16 11:32:03 +00:00
Andy Wilkinson 28ddb7fe65 Upgrade to Nimbus JOSE JWT 9.7
Closes gh-25653
2021-03-16 11:05:06 +00:00
Andy Wilkinson c1e20cc237 Upgrade to OAuth2 OIDC SDK 9.2.2
Closes gh-25652
2021-03-16 11:05:05 +00:00
Andy Wilkinson a0a63de676 Upgrade to Spring Security 5.5.0-M3
Closes gh-25581
2021-03-16 10:56:37 +00:00
Andy Wilkinson 39cf3cd99e Upgrade to Spring HATEOAS 1.3.0-M3
Closes gh-25546
2021-03-16 10:55:15 +00:00
Andy Wilkinson f9db1968bf Upgrade to Micrometer 1.6.5
Closes gh-25543
2021-03-16 10:53:15 +00:00
Andy Wilkinson af23da1dff Upgrade to Spring HATEOAS 1.2.5
Closes gh-25545
2021-03-16 10:52:37 +00:00
Andy Wilkinson ebdb046ca9 Leave jar and war tasks enabled but configured with a classifier
Closes gh-23797
2021-03-16 10:31:56 +00:00
Stephane Nicoll 3f2a069e71 Upgrade to Spring Framework 5.3.5
Closes gh-25542
2021-03-16 10:38:12 +01:00
Stephane Nicoll e100291043 Upgrade to Spring Framework 5.3.5
Closes gh-25541
2021-03-16 10:37:41 +01:00
Stephane Nicoll 2875cd8e25 Upgrade to Reactor 2020.0.5
Closes gh-25540
2021-03-16 08:28:53 +01:00
Stephane Nicoll c8fbbe9eaa Upgrade to Reactor 2020.0.5
Closes gh-25539
2021-03-16 08:27:25 +01:00
Stephane Nicoll b860d3892d Simplify JettyWebServer.getLocalPort
Closes gh-24656
2021-03-15 16:25:53 +01:00
Stephane Nicoll 4fcbfd3e84 Merge branch '2.4.x'
Closes gh-25645
2021-03-15 16:09:05 +01:00
Stephane Nicoll 6b9032b4d3 Document that Java 16 is supported
Closes gh-25527
2021-03-15 16:08:56 +01:00
Stephane Nicoll ed39075177 Merge branch '2.4.x'
Closes gh-25644
2021-03-15 14:25:49 +01:00
Stephane Nicoll 9aa1ce235f Document DataSource implementations supported by DataSourceBuilder
Closes gh-25333
2021-03-15 14:25:22 +01:00
Stephane Nicoll 9b0cdac97a Add support for external configuration for Cassandra
Closes gh-24065
2021-03-15 10:44:13 +01:00
Stephane Nicoll c66db586bf Upgrade to Undertow 2.2.5.Final
Closes gh-25641
2021-03-15 09:22:18 +01:00
Stephane Nicoll bf4ebcf6ea Upgrade to Tomcat 9.0.44
Closes gh-25640
2021-03-15 09:22:16 +01:00
Stephane Nicoll e0b54cb102 Upgrade to Sun Mail 1.6.6
Closes gh-25639
2021-03-15 09:22:15 +01:00
Stephane Nicoll 0c67a6ad2c Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25638
2021-03-15 09:22:14 +01:00
Stephane Nicoll 97e54fc48c Upgrade to Postgresql 42.2.19
Closes gh-25637
2021-03-15 09:22:13 +01:00
Stephane Nicoll 3362dd0f09 Upgrade to OAuth2 OIDC SDK 8.36.1
Closes gh-25636
2021-03-15 09:22:12 +01:00
Stephane Nicoll 3d4b89a154 Upgrade to Netty 4.1.60.Final
Closes gh-25635
2021-03-15 09:22:11 +01:00
Stephane Nicoll eafb15b22d Upgrade to MongoDB 4.1.2
Closes gh-25634
2021-03-15 09:22:09 +01:00
Stephane Nicoll 88fbd24650 Upgrade to Maven Invoker Plugin 3.2.2
Closes gh-25633
2021-03-15 09:22:08 +01:00
Stephane Nicoll b930710d48 Upgrade to jOOQ 3.14.8
Closes gh-25631
2021-03-15 09:22:05 +01:00
Stephane Nicoll df49298cc6 Upgrade to Jetty Reactive HTTPClient 1.1.6
Closes gh-25630
2021-03-15 09:22:04 +01:00
Stephane Nicoll af8b5974d9 Upgrade to Jakarta Mail 1.6.6
Closes gh-25629
2021-03-15 09:22:03 +01:00
Stephane Nicoll c743569113 Upgrade to Infinispan 11.0.10.Final
Closes gh-25628
2021-03-15 09:22:01 +01:00
Stephane Nicoll 89b10d71e6 Upgrade to Hibernate 5.4.29.Final
Closes gh-25627
2021-03-15 09:22:00 +01:00
Stephane Nicoll ce13db4d86 Upgrade to Ehcache3 3.9.2
Closes gh-25626
2021-03-15 09:21:59 +01:00
Stephane Nicoll f276be74a9 Upgrade to Dropwizard Metrics 4.1.18
Closes gh-25625
2021-03-15 09:21:58 +01:00
Stephane Nicoll ace3376a0b Upgrade to Byte Buddy 1.10.22
Closes gh-25624
2021-03-15 09:21:57 +01:00
Stephane Nicoll 947d81e03f Upgrade to AppEngine SDK 1.9.87
Closes gh-25623
2021-03-15 09:21:56 +01:00
Stephane Nicoll 0d0d8267a9 Start building against Spring Security 5.5.0-M3 snapshots
See gh-25581
2021-03-15 08:34:36 +01:00
Stephane Nicoll 22b1517d58 Start building against Spring Batch 4.3.2 snapshots
See gh-25580
2021-03-15 08:33:12 +01:00
Stephane Nicoll 52aab92bfb Start building against Spring Kafka 2.7.0 snapshots
See gh-25582
2021-03-15 08:32:33 +01:00
Stephane Nicoll 06d4ec7efe Start building against Spring Integration 5.5.0-M3 snapshots
See gh-25577
2021-03-15 08:32:01 +01:00
Stephane Nicoll 5535453555 Start building against Spring Batch 4.3.2 snapshots
See gh-25579
2021-03-14 08:26:33 +01:00
Stephane Nicoll f63dcec60d Start building against Spring Kafka 2.6.7 snapshots
See gh-25578
2021-03-14 08:26:33 +01:00
Stephane Nicoll 759e543337 Start building against Micrometer 1.6.5 snapshots
See gh-25543
2021-03-14 08:26:28 +01:00
Stephane Nicoll e517ee8635 Merge branch '2.4.x'
Closes gh-25618
2021-03-13 18:22:57 +01:00
izeye 09f4d4b9bf Polish
See gh-25617
2021-03-13 18:08:54 +01:00
Phillip Webb bea307b115 Extract code samples from docs
See gh-6313
2021-03-12 17:49:17 -08:00
Madhura Bhave c4432a81a8 Merge branch '2.4.x'
Closes gh-25615
2021-03-12 14:03:02 -08:00
Madhura Bhave 11649bc1f0 Merge branch '2.3.x' into 2.4.x
Closes gh-25614
2021-03-12 14:02:34 -08:00
Madhura Bhave df1d1dbaa9 Fallback to BeanPropertyBindingResult for unbound property validation
gh-17424 updated `ValidationBindHandler` so that it would
only look at bound values when validating. This commit updates
`ValidationBindHandler` to use Spring Framework's `BeanPropertyBindingResult`.
This means that for fields that are not bound, JavaBean accessor methods can
be used to get the value to validate.

Fixes gh-25356
2021-03-12 13:56:54 -08:00
Phillip Webb 08c4d03649 Fix LocalCacheVerifier include tags
Fixes gh-25567
2021-03-11 16:26:53 -08:00
Andy Wilkinson b5843cfd4d Merge branch '2.4.x' 2021-03-11 15:46:55 +00:00
Andy Wilkinson 24d729ee3b Close ClassLoader so jar it references can be deleted on Windows
Polishes 952ac7b8
2021-03-11 15:44:52 +00:00
Stephane Nicoll 46baf462ac Start building against Spring Data 2021.0.0-M5 snapshots
See gh-25548
2021-03-11 14:36:57 +01:00
Andy Wilkinson c19e5c9212 Merge branch '2.4.x'
Closes gh-25604
2021-03-11 11:13:13 +00:00
Andy Wilkinson c43ae0b2d3 Merge branch '2.3.x' into 2.4.x
Closes gh-25603
2021-03-11 11:12:54 +00:00
maruoovv b401be1589 Correct javadoc for ON_PARAM
See gh-25480
2021-03-11 11:12:04 +00:00
Jurrie Overgoor 3c0e236562 Support Maven's reproducible build feature for war repackaging
See gh-25571
2021-03-11 11:08:10 +00:00
Andy Wilkinson e2860fee03 Merge branch '2.4.x'
Closes gh-25599
2021-03-11 09:36:00 +00:00
Johnny Lim 90666faf6d Add Javadoc since tag to Bootstrapper.initialize()
See gh-25596
2021-03-11 09:34:57 +00:00
Andy Wilkinson 29ba18afec Merge branch '2.4.x'
Closes gh-25584
Fixes gh-25367 in 2.5.x
2021-03-10 17:13:07 +00:00
Andy Wilkinson 952ac7b8d2 Don't use RestartClassLoader when proxying classes it did not load
Fixes gh-19010
Fixes gh-25367
2021-03-10 17:12:38 +00:00
Stephane Nicoll 2c8e78b082 Merge branch '2.4.x'
Closes gh-25574
2021-03-10 15:15:42 +01:00
Stephane Nicoll 6840440220 Merge branch '2.3.x' into 2.4.x
Closes gh-25573
2021-03-10 15:15:21 +01:00
Stephane Nicoll f38e863fbc Properly subscribe to CloseableConnectionFactory#close
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll 858c3ec2a7 Merge branch '2.4.x'
Closes gh-25570
2021-03-10 13:25:14 +01:00
Stephane Nicoll d5b1fd5b31 Merge branch '2.3.x' into 2.4.x
Closes gh-25569
2021-03-10 13:24:32 +01:00
Stephane Nicoll c8101f8c9b Remove host name in R2DBC's embedded H2 url
Closes gh-25560
2021-03-10 13:24:08 +01:00
Andy Wilkinson 5863edfdda Simplify code that makes hal the default json media type
See gh-25546
2021-03-10 12:14:54 +00:00
Stephane Nicoll 5c34db96bd Start building against Spring HATEOAS 1.3.0-RC1 snapshots
See gh-25546
2021-03-10 08:45:34 +01:00
Stephane Nicoll 728b81acbb Start building against Spring Framework 5.3.5 snapshots
See gh-25542
2021-03-10 08:45:01 +01:00
Stephane Nicoll 86959032de Start building against Reactor 2020.0.5 snapshots
See gh-25540
2021-03-10 08:44:27 +01:00
Stephane Nicoll cad9fa2fc0 Start building against Spring Data 2020.0.6 snapshots
See gh-25547
2021-03-10 08:07:44 +01:00
Stephane Nicoll 924bb53c69 Start building against Spring HATEOAS 1.2.5 snapshots
See gh-25545
2021-03-10 08:07:17 +01:00
Stephane Nicoll d2733b26b6 Start building against Spring Framework 5.3.5 snapshots
See gh-25541
2021-03-10 08:06:44 +01:00
Stephane Nicoll 0985845c3b Start building against Reactor 2020.0.5 snapshots
See gh-25539
2021-03-10 08:06:06 +01:00
Phillip Webb 05cf7fbb04 Use new backend features for extracted samples
Update extracted samples to make use of code folding and chomping.

See gh-6313
2021-03-09 11:55:23 -08:00
dreis2211 cf8a3b3018 Deprecate FlywayMigrationScriptMissingFailureAnalyzer
See gh-25562
2021-03-09 18:02:32 +00:00
Andy Wilkinson 4d97ed19e8 Deprecate support for checking Flyway locations
Closes gh-25488
2021-03-09 15:50:17 +00:00
Andy Wilkinson ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
2021-03-09 13:55:48 +00:00
Andy Wilkinson 99b7d29c2c Merge branch '2.4.x' 2021-03-09 11:12:07 +00:00
Andy Wilkinson 9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00
Andy Wilkinson 3e9341fbb4 Start using Spring Asciidoctor 0.5.1 snapshots
See gh-25558
2021-03-09 10:59:26 +00:00
Andy Wilkinson 06b751a0dd Merge branch '2.4.x' 2021-03-09 09:25:55 +00:00
Andy Wilkinson dace7bb742 Merge branch '2.3.x' into 2.4.x 2021-03-09 09:25:45 +00:00
Andy Wilkinson b76a9951e9 Polish RSocketServerAutoConfiguration 2021-03-09 09:25:34 +00:00
Andy Wilkinson 565dc0cc0f Merge branch '2.4.x'
Closes gh-25556
2021-03-09 09:21:53 +00:00
Andy Wilkinson ba5c57c1b2 Merge branch '2.3.x' into 2.4.x
Closes gh-25555
2021-03-09 09:21:38 +00:00
Andy Wilkinson 84637acbdc Make embedded RSocket server back off without spring-web
Fixes gh-25551
2021-03-09 08:53:25 +00:00
Phillip Webb 6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
2021-03-08 22:07:17 -08:00
Phillip Webb 3bb9b2300e Polish asciidoc markup 2021-03-08 22:03:35 -08:00
dreis2211 19686564bc Run spring-boot-cli tasks on Java 16
See gh-25550
2021-03-08 20:01:13 +00:00
Stephane Nicoll adaf2fc57c Merge branch '2.4.x'
Closes gh-25536
2021-03-08 08:48:41 +01:00
dreis2211 b85a50b7b6 Suppress rawtypes warning
See gh-25531
2021-03-08 08:47:16 +01:00
dreis2211 2575621e06 Fix some illegal reflective access warnings
See gh-25531
2021-03-08 08:47:10 +01:00
Andy Wilkinson 6b1bb225b6 Merge branch '2.4.x'
Closes gh-25521
2021-03-05 15:37:47 +00:00
Andy Wilkinson 3c84ea9350 Try to stabilize tests that use Neo4jContainer
Closes gh-25520
2021-03-05 15:36:45 +00:00
Andy Wilkinson 074744aee7 Increase socket timeout for communicating with Elasticsearch
Closes gh-25518
2021-03-05 15:26:51 +00:00
Stephane Nicoll bb0f43cf07 Allow JMX endpoint ObjectNames to be customized
Closes gh-25317
2021-03-05 16:19:19 +01:00
Andy Wilkinson f81921c005 Merge branch '2.4.x'
Closes gh-25517
2021-03-05 15:08:53 +00:00
Andy Wilkinson f9ef05f71e Polish "Add Bootstrapper initialize method to fix typo"
See gh-25400
2021-03-05 15:06:51 +00:00
cprayer bee6f41393 Add Bootstrapper initialize method to fix typo
See gh-25400
2021-03-05 15:06:50 +00:00
Stephane Nicoll 5a0c3a8497 Merge branch '2.4.x'
Closes gh-25516
2021-03-05 15:47:50 +01:00
Stephane Nicoll ddf75f095c Merge branch '2.3.x' into 2.4.x
Closes gh-25515
2021-03-05 15:47:36 +01:00
Stephane Nicoll 6ebc69d704 Polish "Include properties in source merge algorithm"
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart cf4bc6e9e0 Include properties in source merge algorithm
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
2021-03-05 15:47:09 +01:00
Andy Wilkinson 006cb643ea Merge branch '2.4.x'
Closes gh-25514
2021-03-05 14:16:27 +00:00
Andy Wilkinson 2f95c1e2c8 Merge branch '2.3.x' into 2.4.x
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson 22b73f3020 Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
2021-03-05 14:14:36 +00:00
cdalexndr 72562e0fd4 Improve documentaion of Mockito test execution listeners
See gh-25375
2021-03-05 12:49:18 +00:00
Andy Wilkinson 2cffbc90cb Merge branch '2.4.x'
Closes gh-25511
2021-03-05 11:03:41 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x
Closes gh-25510
2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Andy Wilkinson 2b7f23b29d Merge branch '2.4.x'
Closes gh-25509
2021-03-05 10:44:24 +00:00
Andy Wilkinson ac258a95a2 Merge branch '2.3.x' into 2.4.x
Closes gh-25508
2021-03-05 10:39:52 +00:00
Andy Wilkinson c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path"
See gh-25505
2021-03-05 10:13:32 +00:00
trungPa 2993e68715 Prevent extracting zip entries outside of destination path
See gh-25505
2021-03-05 10:12:06 +00:00
Stephane Nicoll 76d0a7f8ba Merge branch '2.4.x'
Closes gh-25506
2021-03-05 10:03:42 +01:00
dreis2211 89a44f3da4 Fix some assertions
See gh-25499
2021-03-05 09:56:55 +01:00
Madhura Bhave 37dcb90876 Merge branch '2.4.x'
Closes gh-25502
2021-03-04 14:48:11 -08:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource
Closes gh-24945
2021-03-04 14:46:59 -08:00
Madhura Bhave e1904fb72f Merge branch '2.4.x'
Closes gh-25500
2021-03-04 13:04:18 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets
Closes gh-25095
2021-03-04 13:02:28 -08:00
Andy Wilkinson 961a34a5ee Merge branch '2.4.x'
Closes gh-25497
2021-03-04 19:15:03 +00:00
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
2021-03-04 18:54:58 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Madhura Bhave 9fd6a1e56a Merge branch '2.4.x'
Closes gh-25495
2021-03-04 09:46:26 -08:00
Madhura Bhave 181d0ee932 Merge default property sources
Fixes gh-25408
2021-03-04 09:46:00 -08:00
Andy Wilkinson 96ede9b975 Merge branch '2.4.x'
Closes gh-25491
2021-03-04 13:03:41 +00:00
Andy Wilkinson ca414733f3 Reinstate support for placeholders in @EntityScan
Fixes gh-25436
2021-03-04 12:21:27 +00:00
Stephane Nicoll e58353a32d Merge branch '2.4.x'
Closes gh-25484
2021-03-03 15:16:58 +01:00
Stephane Nicoll e5d8b6029b Merge branch '2.3.x' into 2.4.x
Closes gh-25483
2021-03-03 15:16:08 +01:00