Commit Graph

10385 Commits

Author SHA1 Message Date
Andy Wilkinson 85cb5d4b3b Upgrade to Reactor Dysprosium-SR14
Closes gh-24109
2020-11-11 09:14:21 +00:00
Andy Wilkinson e6ab20b029 Merge branch '2.2.x' into 2.3.x
Closes gh-24111
2020-11-10 17:37:41 +00:00
Andy Wilkinson 31042bfc49 Test inclusion of system scope dependencies in repackaged war
Closes gh-22503
2020-11-10 17:35:04 +00:00
Stephane Nicoll afe721bc34 Start building against Reactor Dysprosium-SR14 snapshots
See gh-24109
2020-11-10 18:00:10 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
2020-11-10 16:04:27 +01:00
Stephane Nicoll 0c43d13789 Upgrade to Spring Framework 5.2.11
Closes gh-24034
2020-11-10 11:21:24 +01:00
Stephane Nicoll 339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 2020-11-10 09:47:46 +01:00
Stephane Nicoll 5123eb0c74 Fix deprecation in Testcontainers 1.15.0
See gh-24103
2020-11-10 09:39:18 +01:00
Stephane Nicoll c1a1b5fe71 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 08:46:15 +01:00
Stephane Nicoll 48bfdc1314 Revert "Upgrade to testcontainers 1.15.0"
This reverts commit b1c446d1b2.
2020-11-10 07:49:23 +01:00
Stephane Nicoll b1c446d1b2 Upgrade to testcontainers 1.15.0
Closes gh-24103
2020-11-10 07:20:26 +01:00
Stephane Nicoll 6aca0275ad Polish 2020-11-09 14:40:44 +01:00
Stephane Nicoll d962a074c3 Upgrade to jOOQ 3.13.6
Closes gh-24081
2020-11-09 08:22:32 +01:00
Stephane Nicoll 2c67acb970 Upgrade to Hibernate 5.4.23.Final
Closes gh-24080
2020-11-09 08:22:31 +01:00
Stephane Nicoll 0142ed1e5c Upgrade to Couchbase Client 3.0.10
Closes gh-24079
2020-11-09 08:22:30 +01:00
Stephane Nicoll ebfa494b2e Upgrade to Byte Buddy 1.10.18
Closes gh-24078
2020-11-09 08:22:28 +01:00
Stephane Nicoll df6181f6bf Upgrade to AppEngine SDK 1.9.83
Closes gh-24077
2020-11-09 08:22:27 +01:00
Stephane Nicoll 2282c73aab Start building against Spring Framework 5.2.11 snapshots
See gh-24034
2020-11-06 16:41:47 +01:00
Andy Wilkinson 44d0ce5ff1 Merge branch '2.2.x' into 2.3.x
Closes gh-24060
2020-11-05 15:53:53 +00:00
Andy Wilkinson 9c5d1646bd Show how to configure a case-sensitive physical naming strategy
Closes gh-24045
2020-11-05 15:53:32 +00:00
Stephane Nicoll 4a8646bd09 Merge branch '2.2.x' into 2.3.x
Closes gh-24058
2020-11-05 16:32:52 +01:00
Stephane Nicoll 59ea7c11f6 Use most specific getter when generating metadata
This commit makes sure to use the most specific getter if more than
one candidate exists.

Closes gh-24002
2020-11-05 16:01:28 +01:00
Andy Wilkinson 91f4541a91 Merge branch '2.2.x' into 2.3.x
See gh-24052
2020-11-05 12:19:13 +00:00
Andy Wilkinson 006d4bc36d Do not set Tomcat's trust store password when null
See gh-24041
2020-11-05 12:18:32 +00:00
Andy Wilkinson 2ffb81f0d9 Merge branch '2.2.x' into 2.3.x
Closes gh-24052
2020-11-05 11:35:37 +00:00
Andy Wilkinson 2425dcd200 Do not set Tomcat's key store and key pass when null
Fixes gh-24041
2020-11-05 11:30:04 +00:00
Andy Wilkinson e447be6df7 Upgrade to Jetty 9.4.34.v20201102
Closes gh-24046
2020-11-05 08:22:31 +00:00
Scott Frederick 62aa1b7aaf Narrow criteria for hidden property paths
A previous change intended to prevent temporary directories created as
an implementation detail of mounting volumes on kubernetes pods from
being used as a source for property files had a side-effect of also
preventing other types of hidden directories from being recognized. This
commit narrows the criteria for considering a directory as hidden,
using the kubernetes `..` prefix convention instead of the Unix `.`
prefix.

Fixes gh-23983
2020-11-04 16:09:54 -06:00
Andy Wilkinson 84cee76700 Merge branch '2.2.x' into 2.3.x
Closes gh-24032
2020-11-04 17:42:24 +00:00
Andy Wilkinson d5980be623 Clarify documentation for relaxed binding of environment variables
Closes gh-22974
2020-11-04 17:40:27 +00:00
Andy Wilkinson e83f3f40be Merge branch '2.2.x' into 2.3.x
Closes gh-24029
2020-11-04 16:47:23 +00:00
Andy Wilkinson a8b8f43180 Improve description of spring.datasource.initialization-mode
Closes gh-21121
2020-11-04 16:46:28 +00:00
Andy Wilkinson 28f7bc37a5 Merge branch '2.2.x' into 2.3.x
Closes gh-24025
2020-11-04 10:15:07 +00:00
Andy Wilkinson c289ba0c2c Recommend disabling context root redirects with proxied Tomcat
Closes gh-22908
2020-11-04 10:13:55 +00:00
Andy Wilkinson 81f672eae3 Merge branch '2.2.x' into 2.3.x
Closes gh-24023
2020-11-04 09:40:54 +00:00
Andy Wilkinson 28ccf54b21 Ignore schema username when auto-configuring a test DB
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.

This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.

Fixes gh-19321
2020-11-04 09:30:19 +00:00
Andy Wilkinson 7c209478b6 Merge branch '2.2.x' into 2.3.x
Closes gh-24021
2020-11-03 20:32:57 +00:00
Pascal Schumacher 5472fcf433 Fix typo in Spring Session documentation
See gh-24020
2020-11-03 20:31:42 +00:00
Andy Wilkinson b2a058b6fe Merge branch '2.2.x' into 2.3.x
Closes gh-24018
2020-11-03 19:43:15 +00:00
Andy Wilkinson 2f280b01e1 Improve Spring Session back-off documentation
Closes gh-23151
2020-11-03 19:42:57 +00:00
Andy Wilkinson f3d4b3e5ac Allow entries to be streamed from JarURLConnections' jar file
Fixes gh-23821
2020-11-03 17:59:38 +00:00
Andy Wilkinson d1a9dba25d Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
See gh-23999
2020-11-03 17:23:16 +00:00
Michal Růžička 2aac5c0095 Avoid repeated calls of WebFlux and MVC registrations' getters
See gh-23999
2020-11-03 16:51:39 +00:00
Andy Wilkinson f9ff39a7a6 Merge branch '2.2.x' into 2.3.x
Closes gh-24014
2020-11-03 16:38:33 +00:00
Andy Wilkinson 35bff55097 Ensure that Quartz can be auto-configured with a Quartz-specific TM
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.

This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.

Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson dc86e8ce30 Merge branch '2.2.x' into 2.3.x
Closes gh-24012
2020-11-03 14:58:28 +00:00
Andy Wilkinson 6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter
Fixes gh-23978
2020-11-03 14:50:00 +00:00
Andy Wilkinson 2dce4aa42b Merge branch '2.2.x' into 2.3.x
Closes gh-24009
2020-11-03 14:04:08 +00:00
Andy Wilkinson 30a0ccab02 Remove use of `@PostConstruct` from main code
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.

To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.

Closes gh-23723
2020-11-03 13:59:38 +00:00
Andy Wilkinson 2513071b1f Merge branch '2.2.x' into 2.3.x
Closes gh-24006
2020-11-03 10:27:38 +00:00
Andy Wilkinson 622606d85a Make it clearer that only the main DataSource bean may be replaced
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson b846143c37 Merge branch '2.2.x' into 2.3.x
Closes gh-24004
2020-11-03 10:17:00 +00:00
Andy Wilkinson d32d65b02c Add tip about providing as much typo info as possible in @Bean methods
Closes gh-22925
2020-11-03 10:16:20 +00:00
Stephane Nicoll 1e9c9b9d73 Add missing default values in configuration properties metadata
Closes gh-23991
2020-11-02 10:44:06 +01:00
Phillip Webb b0c2687aa9 Update copyright year of changed files 2020-10-29 09:07:42 -07:00
Andy Wilkinson 70d9602b3f Merge branch '2.2.x' into 2.3.x
Closes gh-23969
2020-10-29 15:31:12 +00:00
Andy Wilkinson e7eb7739dc Use overriding rather than overridden getter methods in config prop AP
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Phillip Webb b86dcbec72 Merge branch '2.2.x' into 2.3.x
Closes gh-23959
2020-10-28 21:18:17 -07:00
Phillip Webb cf09451ffb Retain inner-class data on incremental compile
Ensure that metadata sourced from inner-types is not deleted when
performing an incremental compile. Prior to this commit, the source
type was searched using the `Outer$Inner` format. This is not supported
`Elements.getTypeElement` so we now convert the names to `Outer.Inner`.

Closes gh-10886
2020-10-28 21:13:08 -07:00
Stephane Nicoll 425a2084ac Upgrade to Spring Kafka 2.5.7
Closes gh-23787
2020-10-28 22:32:55 +01:00
Stephane Nicoll 11b55f650c Upgrade to Spring Kafka 2.3.12
Closes gh-23786
2020-10-28 22:28:05 +01:00
Stephane Nicoll 124c148c51 Upgrade to Spring Integration 5.2.9
Closes gh-23956
2020-10-28 22:27:19 +01:00
Scott Frederick d5b2836ec9 Provide content-length header to Docker API calls
Docker daemon authorization plugins reject POST or PUT requests that have a
content type `application/json` header but no content length header. This
commit ensures that a content length header is provided in these cases.

Fixes gh-22840
2020-10-28 15:15:32 -05:00
Phillip Webb d79c23ef89 Upgrade MavenBuild versions
Align versions with those in the main build.

Closes gh-23937
2020-10-28 12:37:30 -07:00
Stephane Nicoll d112b8a289 Upgrade to Spring AMQP 2.2.12
Closes gh-23784
2020-10-28 20:27:50 +01:00
Stephane Nicoll 90ee8b5a2a Upgrade to Spring Integration 5.3.3
Closes gh-23780
2020-10-28 20:26:59 +01:00
Stephane Nicoll 47a5d7aab6 Upgrade to Micrometer 1.5.6
Closes gh-23791
2020-10-28 20:26:17 +01:00
Stephane Nicoll f2afd28b9a Upgrade to Spring AMQP 2.2.12
Closes gh-23783
2020-10-28 20:24:56 +01:00
Andy Wilkinson 58aa34489f Wait for DataSource init before allowing context refresh to complete
Closes gh-22852
2020-10-28 16:01:14 +00:00
Stephane Nicoll b94fe90f24 Upgrade to Spring Data Neumann-SR5
Closes gh-23777
2020-10-28 16:37:08 +01:00
Stephane Nicoll 9c4e5904e7 Upgrade to Micrometer 1.3.15
Closes gh-23790
2020-10-28 16:30:05 +01:00
Stephane Nicoll 8bd7cc417e Upgrade to Spring Data Moore-SR11
Closes gh-23776
2020-10-28 16:29:27 +01:00
Stephane Nicoll 0424689aee Merge branch '2.2.x' into 2.3.x
Closes gh-23930
2020-10-28 16:18:00 +01:00
Stephane Nicoll 93e36a97ab Remove version elements from Maven plugin documentation
This commit removes `<version>` from the Maven Plugin documentation
where it makes sense so that versions aren't hardcoded unnecessarily.

Rather, a plugin or dependency management should be in place so those
are not needed.

Closes gh-23909
2020-10-28 13:39:03 +01:00
Stephane Nicoll a3818d690e Fix custom layout example so that tokens are replaced 2020-10-28 13:37:59 +01:00
Stephane Nicoll c02b16eeeb Upgrade to Lettuce 5.3.5.RELEASE
Closes gh-23922
2020-10-28 08:03:44 +01:00
Andy Wilkinson b9516bc77c Await registration of http.server.requests meter
Previously, the test would make an HTTP request and, as soon as the
response was received, it would check the presence and value of the
http.server.requests meter. This create a race condition between the
meter being registered once the response had been flushed and the
meter's presence being checked. If the check won the race, the test
would fail.

This commit updates the test to wait for up to 5 seconds for the
meter to be present and have a count of 1, matching the single request
that has been made.

Fixes gh-23919
2020-10-27 15:54:22 +00:00
Stephane Nicoll 41f3470e09 Upgrade to Spring Framework 5.2.10
Closes gh-23526
2020-10-27 15:49:21 +01:00
Stephane Nicoll 8b49f792cb Upgrade to Spring Framework 5.2.10
Closes gh-23773
2020-10-27 15:48:17 +01:00
Stephane Nicoll 4769889c6b Upgrade to JUnit 4.13.1
Closes gh-23876
2020-10-27 03:41:23 +01:00
Stephane Nicoll 30a9424f6c Upgrade to JUnit Jupiter 5.6.3
Closes gh-23915
2020-10-27 03:40:41 +01:00
Stephane Nicoll f727db3866 Upgrade to RSocket 1.0.3
Closes gh-23911
2020-10-27 03:37:58 +01:00
Stephane Nicoll d5cb6c1a4f Upgrade to RSocket 1.0.3
Closes gh-23910
2020-10-27 03:25:59 +01:00
Stephane Nicoll 3119e85a32 Upgrade to Reactor Dysprosium-SR13
Closes gh-23770
2020-10-26 18:17:13 +01:00
Stephane Nicoll 7fa5ff46f7 Upgrade to Reactor Dysprosium-SR13
Closes gh-23769
2020-10-26 18:15:58 +01:00
Andy Wilkinson c0bb6ff667 Await registration of http.server.requests meter
Previously, the test would make an HTTP request and, as soon as the
response was received, it would check the presence and value of the
http.server.requests meter. This create a race condition between the
meter being registered once the response had been flushed and the
meter's presence being checked. If the check won the race, the test
would fail.

This commit updates the test to wait for up to 5 seconds for the
meter to be present and have a count of 1, matching the single request
that has been made.

Fixes gh-23863
2020-10-26 14:41:58 +00:00
Andy Wilkinson dedd8e603d Upgrade to Tomcat 9.0.39
Closes gh-23885
2020-10-26 12:58:40 +00:00
Andy Wilkinson 4b6ef6ef44 Upgrade to Spring Security 5.3.5.RELEASE
Closes gh-23884
2020-10-26 12:58:40 +00:00
Andy Wilkinson 1520de773d Upgrade to RxJava2 2.2.20
Closes gh-23883
2020-10-26 12:58:40 +00:00
Andy Wilkinson 74e4d8effb Upgrade to R2DBC Bom Arabba-SR8
Closes gh-23882
2020-10-26 12:58:40 +00:00
Andy Wilkinson 87c6ca0757 Upgrade to Postgresql 42.2.18
Closes gh-23881
2020-10-26 12:58:40 +00:00
Andy Wilkinson 48608896ab Upgrade to Netty 4.1.53.Final
Closes gh-23880
2020-10-26 12:58:40 +00:00
Andy Wilkinson 890e61989f Upgrade to Neo4j OGM 3.2.17
Closes gh-23879
2020-10-26 12:58:39 +00:00
Andy Wilkinson b41a4970fa Upgrade to MySQL 8.0.22
Closes gh-23878
2020-10-26 12:58:39 +00:00
Andy Wilkinson 47831a3b34 Upgrade to Lombok 1.18.16
Closes gh-23877
2020-10-26 12:58:39 +00:00
Andy Wilkinson d75288b726 Upgrade to jOOQ 3.13.5
Closes gh-23875
2020-10-26 12:58:39 +00:00
Andy Wilkinson b7704f5a9c Upgrade to Jetty 9.4.33.v20201020
Closes gh-23874
2020-10-26 12:58:39 +00:00
Andy Wilkinson 08ef732483 Upgrade to Jackson Bom 2.11.3
Closes gh-23873
2020-10-26 12:58:38 +00:00
Andy Wilkinson fe1560819e Upgrade to HttpClient 4.5.13
Closes gh-23872
2020-10-26 12:58:38 +00:00