Commit Graph

10623 Commits (911cb21a3e2d220a21ce05916e26c95eee4e19e3)

Author SHA1 Message Date
Phillip Webb 55ae5be84b Revert "Restore HazelcastHealthIndicatorTests"
This reverts commit 5a51b5853e.
4 years ago
Phillip Webb 5a51b5853e Restore HazelcastHealthIndicatorTests
Restore `HazelcastHealthIndicatorTests` which was accidentally replaced
with a version from 2.4.x.

See gh-24337
4 years ago
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
4 years ago
Phillip Webb d8a05090b3 Fix checkstyle BDD Mockito violations
See gh-24337
4 years ago
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
4 years ago
Stephane Nicoll 065fde2996 Start building against Spring Framework 5.2.12 snapshots
See gh-24277
4 years ago
Stephane Nicoll 5f81882305 Start building against Reactor Dysprosium-SR15 snapshots
See gh-24274
4 years ago
Stephane Nicoll 9763ba56ba Start building against Spring Framework 5.2.12 snapshots
See gh-24276
4 years ago
Stephane Nicoll afeb9f29d4 Start building against Reactor Dysprosium-SR15 snasphots
See gh-24273
4 years ago
Jim Stockwell bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc
See gh-24257
4 years ago
Stephane Nicoll 9b992af34b Merge branch '2.2.x' into 2.3.x
Closes gh-24250
4 years ago
Stephane Nicoll d506f0c73e Polish "Reduce redis health indicator info command result size"
See gh-24208
4 years ago
xJoeWoo 99cc3f4bfc Reduce redis health indicator info command result size
See gh-24208
4 years ago
Stephane Nicoll 016b69aa78 Polish "Allow to exclude an empty set of ErrorAttributes"
See gh-24230
4 years ago
Wanderlei Souza 6518f8f7fd Allow to exclude an empty set of ErrorAttributes
See gh-24230
4 years ago
Andy Wilkinson 7efa1e47aa Merge branch '2.2.x' into 2.3.x
Closes gh-24222
4 years ago
Andy Wilkinson 12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses
Fixes gh-24123
4 years ago
Andy Wilkinson 0ed7f7f40a Merge branch '2.2.x' into 2.3.x
Closes gh-24219
4 years ago
Andy Wilkinson 08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
See gh-24095
4 years ago
Artem Bilan 7d712aaa2d Ensure that MeterRegistry bean is defined before SI looks for it
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.

Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.

See gh-24095
4 years ago
Andy Wilkinson 988526bee9 Only attempt unwrapping of interfaces
Wrapper's isWrapperFor and unwrap methods both take a Class<?> target
but document that the target should be an interface. Prior to this
change, we were calling isWrapperFor with any Class<?> irrespective of
whether or not it was an interface. When using Oracle UCP each call
to isWrapperFor with an interface results in an exception stack trace
being logged.

This commit upates DataSourceUnwrapper to adhere to Wrapper's contract
by only calling isWrapperFor and unwrap with interfaces.

Fixes gh-24154
4 years ago
Stephane Nicoll f3afd8a0f4 Fix location of Spring LDAP and Spring Session properties
Closes gh-23558
4 years ago
Stephane Nicoll 76912d1952 Merge branch '2.2.x' into 2.3.x
Closes gh-24193
4 years ago
Stephane Nicoll d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags"
See gh-24147
4 years ago
Peter Paul Bakker b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags
See gh-24147
4 years ago
Stephane Nicoll dea12f7551 Merge branch '2.2.x' into 2.3.x
Closes gh-24185
4 years ago
izeye b17895844d Provide dependency management for elasticsearch-rest-client-sniffer
See gh-24173
4 years ago
Scott Frederick da2276e7d4 Use stable builder and run images in integration tests
Fixes gh-24183
4 years ago
Sergey Kolesnikov b341b478a6 Rename "sla" to "slo" in reference documentation
See gh-24160
4 years ago
Stephane Nicoll 8311edf722 Upgrade to Neo4j OGM 3.2.18
Closes gh-24125
4 years ago
Stephane Nicoll 79835dc20f Upgrade to Netty 4.1.54.Final
Closes gh-24124
4 years ago
Andy Wilkinson 3e243de41b Merge branch '2.2.x' into 2.3.x
Closes gh-24121
4 years ago
dreis2211 033c78b945 Fix link to Flyway callback docs
See gh-24119
4 years ago
Andy Wilkinson e35c8e0214 Upgrade to Micrometer 1.5.7
Closes gh-24050
4 years ago
Andy Wilkinson 6507175d35 Upgrade to Spring Kafka 2.5.8.RELEASE
Closes gh-24075
4 years ago
Andy Wilkinson 0053fb7871 Upgrade to Spring Integration 5.3.4.RELEASE
Closes gh-24096
4 years ago
Andy Wilkinson 4a630dc7a9 Only skip ..-prefixed locations when found via wildcard
Closes gh-23983
4 years ago
Andy Wilkinson e8a1c3b9f8 Start building against Spring Integration 5.3.4 snapshots
See gh-24096
4 years ago
Andy Wilkinson 85cb5d4b3b Upgrade to Reactor Dysprosium-SR14
Closes gh-24109
4 years ago
Andy Wilkinson e6ab20b029 Merge branch '2.2.x' into 2.3.x
Closes gh-24111
4 years ago
Andy Wilkinson 31042bfc49 Test inclusion of system scope dependencies in repackaged war
Closes gh-22503
4 years ago
Stephane Nicoll afe721bc34 Start building against Reactor Dysprosium-SR14 snapshots
See gh-24109
4 years ago
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
4 years ago
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
4 years ago
Stephane Nicoll 0c43d13789 Upgrade to Spring Framework 5.2.11
Closes gh-24034
4 years ago
Stephane Nicoll 339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 4 years ago
Stephane Nicoll 5123eb0c74 Fix deprecation in Testcontainers 1.15.0
See gh-24103
4 years ago
Stephane Nicoll c1a1b5fe71 Upgrade to Testcontainers 1.15.0
Closes gh-24103
4 years ago
Stephane Nicoll 48bfdc1314 Revert "Upgrade to testcontainers 1.15.0"
This reverts commit b1c446d1b2.
4 years ago
Stephane Nicoll b1c446d1b2 Upgrade to testcontainers 1.15.0
Closes gh-24103
4 years ago
Stephane Nicoll 6aca0275ad Polish 4 years ago
Stephane Nicoll d962a074c3 Upgrade to jOOQ 3.13.6
Closes gh-24081
4 years ago
Stephane Nicoll 2c67acb970 Upgrade to Hibernate 5.4.23.Final
Closes gh-24080
4 years ago
Stephane Nicoll 0142ed1e5c Upgrade to Couchbase Client 3.0.10
Closes gh-24079
4 years ago
Stephane Nicoll ebfa494b2e Upgrade to Byte Buddy 1.10.18
Closes gh-24078
4 years ago
Stephane Nicoll df6181f6bf Upgrade to AppEngine SDK 1.9.83
Closes gh-24077
4 years ago
Stephane Nicoll 2282c73aab Start building against Spring Framework 5.2.11 snapshots
See gh-24034
4 years ago
Andy Wilkinson 44d0ce5ff1 Merge branch '2.2.x' into 2.3.x
Closes gh-24060
4 years ago
Andy Wilkinson 9c5d1646bd Show how to configure a case-sensitive physical naming strategy
Closes gh-24045
4 years ago
Stephane Nicoll 4a8646bd09 Merge branch '2.2.x' into 2.3.x
Closes gh-24058
4 years ago
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
4 years ago
Andy Wilkinson 91f4541a91 Merge branch '2.2.x' into 2.3.x
See gh-24052
4 years ago
Andy Wilkinson 006d4bc36d Do not set Tomcat's trust store password when null
See gh-24041
4 years ago
Andy Wilkinson 2ffb81f0d9 Merge branch '2.2.x' into 2.3.x
Closes gh-24052
4 years ago
Andy Wilkinson 2425dcd200 Do not set Tomcat's key store and key pass when null
Fixes gh-24041
4 years ago
Andy Wilkinson e447be6df7 Upgrade to Jetty 9.4.34.v20201102
Closes gh-24046
4 years ago
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
4 years ago
Andy Wilkinson 84cee76700 Merge branch '2.2.x' into 2.3.x
Closes gh-24032
4 years ago
Andy Wilkinson d5980be623 Clarify documentation for relaxed binding of environment variables
Closes gh-22974
4 years ago
Andy Wilkinson e83f3f40be Merge branch '2.2.x' into 2.3.x
Closes gh-24029
4 years ago
Andy Wilkinson a8b8f43180 Improve description of spring.datasource.initialization-mode
Closes gh-21121
4 years ago
Andy Wilkinson 28f7bc37a5 Merge branch '2.2.x' into 2.3.x
Closes gh-24025
4 years ago
Andy Wilkinson c289ba0c2c Recommend disabling context root redirects with proxied Tomcat
Closes gh-22908
4 years ago
Andy Wilkinson 81f672eae3 Merge branch '2.2.x' into 2.3.x
Closes gh-24023
4 years ago
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
4 years ago
Andy Wilkinson 7c209478b6 Merge branch '2.2.x' into 2.3.x
Closes gh-24021
4 years ago
Pascal Schumacher 5472fcf433 Fix typo in Spring Session documentation
See gh-24020
4 years ago
Andy Wilkinson b2a058b6fe Merge branch '2.2.x' into 2.3.x
Closes gh-24018
4 years ago
Andy Wilkinson 2f280b01e1 Improve Spring Session back-off documentation
Closes gh-23151
4 years ago
Andy Wilkinson f3d4b3e5ac Allow entries to be streamed from JarURLConnections' jar file
Fixes gh-23821
4 years ago
Andy Wilkinson d1a9dba25d Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
See gh-23999
4 years ago
Michal Růžička 2aac5c0095 Avoid repeated calls of WebFlux and MVC registrations' getters
See gh-23999
4 years ago
Andy Wilkinson f9ff39a7a6 Merge branch '2.2.x' into 2.3.x
Closes gh-24014
4 years ago
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
4 years ago
Andy Wilkinson dc86e8ce30 Merge branch '2.2.x' into 2.3.x
Closes gh-24012
4 years ago
Andy Wilkinson 6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter
Fixes gh-23978
4 years ago
Andy Wilkinson 2dce4aa42b Merge branch '2.2.x' into 2.3.x
Closes gh-24009
4 years ago
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
4 years ago
Andy Wilkinson 2513071b1f Merge branch '2.2.x' into 2.3.x
Closes gh-24006
4 years ago
Andy Wilkinson 622606d85a Make it clearer that only the main DataSource bean may be replaced
Closes gh-23808
4 years ago
Andy Wilkinson b846143c37 Merge branch '2.2.x' into 2.3.x
Closes gh-24004
4 years ago
Andy Wilkinson d32d65b02c Add tip about providing as much typo info as possible in @Bean methods
Closes gh-22925
4 years ago
Stephane Nicoll 1e9c9b9d73 Add missing default values in configuration properties metadata
Closes gh-23991
4 years ago
Phillip Webb b0c2687aa9 Update copyright year of changed files 4 years ago
Andy Wilkinson 70d9602b3f Merge branch '2.2.x' into 2.3.x
Closes gh-23969
4 years ago
Andy Wilkinson e7eb7739dc Use overriding rather than overridden getter methods in config prop AP
Fixes gh-23966
4 years ago
Phillip Webb b86dcbec72 Merge branch '2.2.x' into 2.3.x
Closes gh-23959
4 years ago
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
4 years ago
Stephane Nicoll 425a2084ac Upgrade to Spring Kafka 2.5.7
Closes gh-23787
4 years ago
Stephane Nicoll 11b55f650c Upgrade to Spring Kafka 2.3.12
Closes gh-23786
4 years ago
Stephane Nicoll 124c148c51 Upgrade to Spring Integration 5.2.9
Closes gh-23956
4 years ago
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
4 years ago
Phillip Webb d79c23ef89 Upgrade MavenBuild versions
Align versions with those in the main build.

Closes gh-23937
4 years ago
Stephane Nicoll d112b8a289 Upgrade to Spring AMQP 2.2.12
Closes gh-23784
4 years ago
Stephane Nicoll 90ee8b5a2a Upgrade to Spring Integration 5.3.3
Closes gh-23780
4 years ago
Stephane Nicoll 47a5d7aab6 Upgrade to Micrometer 1.5.6
Closes gh-23791
4 years ago
Stephane Nicoll f2afd28b9a Upgrade to Spring AMQP 2.2.12
Closes gh-23783
4 years ago
Andy Wilkinson 58aa34489f Wait for DataSource init before allowing context refresh to complete
Closes gh-22852
4 years ago
Stephane Nicoll b94fe90f24 Upgrade to Spring Data Neumann-SR5
Closes gh-23777
4 years ago
Stephane Nicoll 9c4e5904e7 Upgrade to Micrometer 1.3.15
Closes gh-23790
4 years ago
Stephane Nicoll 8bd7cc417e Upgrade to Spring Data Moore-SR11
Closes gh-23776
4 years ago
Stephane Nicoll 0424689aee Merge branch '2.2.x' into 2.3.x
Closes gh-23930
4 years ago
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
4 years ago
Stephane Nicoll a3818d690e Fix custom layout example so that tokens are replaced 4 years ago
Stephane Nicoll c02b16eeeb Upgrade to Lettuce 5.3.5.RELEASE
Closes gh-23922
4 years ago
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
4 years ago
Stephane Nicoll 41f3470e09 Upgrade to Spring Framework 5.2.10
Closes gh-23526
4 years ago
Stephane Nicoll 8b49f792cb Upgrade to Spring Framework 5.2.10
Closes gh-23773
4 years ago
Stephane Nicoll 4769889c6b Upgrade to JUnit 4.13.1
Closes gh-23876
4 years ago
Stephane Nicoll 30a9424f6c Upgrade to JUnit Jupiter 5.6.3
Closes gh-23915
4 years ago
Stephane Nicoll f727db3866 Upgrade to RSocket 1.0.3
Closes gh-23911
4 years ago
Stephane Nicoll d5cb6c1a4f Upgrade to RSocket 1.0.3
Closes gh-23910
4 years ago
Stephane Nicoll 3119e85a32 Upgrade to Reactor Dysprosium-SR13
Closes gh-23770
4 years ago
Stephane Nicoll 7fa5ff46f7 Upgrade to Reactor Dysprosium-SR13
Closes gh-23769
4 years ago
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
4 years ago
Andy Wilkinson dedd8e603d Upgrade to Tomcat 9.0.39
Closes gh-23885
4 years ago
Andy Wilkinson 4b6ef6ef44 Upgrade to Spring Security 5.3.5.RELEASE
Closes gh-23884
4 years ago
Andy Wilkinson 1520de773d Upgrade to RxJava2 2.2.20
Closes gh-23883
4 years ago
Andy Wilkinson 74e4d8effb Upgrade to R2DBC Bom Arabba-SR8
Closes gh-23882
4 years ago
Andy Wilkinson 87c6ca0757 Upgrade to Postgresql 42.2.18
Closes gh-23881
4 years ago
Andy Wilkinson 48608896ab Upgrade to Netty 4.1.53.Final
Closes gh-23880
4 years ago
Andy Wilkinson 890e61989f Upgrade to Neo4j OGM 3.2.17
Closes gh-23879
4 years ago
Andy Wilkinson b41a4970fa Upgrade to MySQL 8.0.22
Closes gh-23878
4 years ago
Andy Wilkinson 47831a3b34 Upgrade to Lombok 1.18.16
Closes gh-23877
4 years ago
Andy Wilkinson d75288b726 Upgrade to jOOQ 3.13.5
Closes gh-23875
4 years ago
Andy Wilkinson b7704f5a9c Upgrade to Jetty 9.4.33.v20201020
Closes gh-23874
4 years ago
Andy Wilkinson 08ef732483 Upgrade to Jackson Bom 2.11.3
Closes gh-23873
4 years ago
Andy Wilkinson fe1560819e Upgrade to HttpClient 4.5.13
Closes gh-23872
4 years ago
Andy Wilkinson dccc82d729 Upgrade to Hibernate Validator 6.1.6.Final
Closes gh-23871
4 years ago
Andy Wilkinson eb9dafe4ee Upgrade to Hibernate 5.4.22.Final
Closes gh-23870
4 years ago
Andy Wilkinson 7d0f5ce8fd Upgrade to Hazelcast 3.12.10
Closes gh-23869
4 years ago
Andy Wilkinson 1b0cb179e7 Upgrade to Dropwizard Metrics 4.1.14
Closes gh-23868
4 years ago
Andy Wilkinson 2958ff3b16 Upgrade to Couchbase Client 3.0.9
Closes gh-23867
4 years ago
Andy Wilkinson 5e71a72545 Upgrade to Caffeine 2.8.6
Closes gh-23866
4 years ago
Andy Wilkinson fca4ab78f4 Upgrade to Byte Buddy 1.10.17
Closes gh-23865
4 years ago
Andy Wilkinson 16b26cc9da Align versions of scala-library and scala-reflect
Closes gh-23887
4 years ago
Andy Wilkinson ac8d55db78 Upgrade to Spring Security 5.2.7.RELEASE
Closes gh-23862
4 years ago
Andy Wilkinson dc523c1bbd Upgrade to Lombok 1.18.16
Closes gh-23861
4 years ago
Andy Wilkinson 072bfae4af Upgrade to Postgresql 42.2.18
Closes gh-23860
4 years ago
Andy Wilkinson e9fe96b0ba Upgrade to Neo4j Ogm 3.2.17
Closes gh-23859
4 years ago
Andy Wilkinson 3b63e2c6da Upgrade to Hibernate Validator 6.0.21.Final
Closes gh-23858
4 years ago
Andy Wilkinson fdf44f1fd1 Upgrade to Hibernate 5.4.22.Final
Closes gh-23857
4 years ago
Andy Wilkinson 53a458ffcf Upgrade to Elasticsearch 6.8.13
Closes gh-23856
4 years ago
Andy Wilkinson 5854abcbf1 Upgrade to Jetty 9.4.33.v20201020
Closes gh-23855
4 years ago
Andy Wilkinson 4588889da4 Upgrade to Tomcat 9.0.39
Closes gh-23854
4 years ago
Andy Wilkinson 1ef399b6fa Upgrade to Httpclient 4.5.13
Closes gh-23853
4 years ago
Andy Wilkinson e8cf97bdbb Upgrade to Byte Buddy 1.10.17
Closes gh-23852
4 years ago
Andy Wilkinson 46392bc50d Upgrade to Mysql 8.0.22
Closes gh-23851
4 years ago
Andy Wilkinson 39e81521cb Upgrade to Joda Time 2.10.8
Closes gh-23850
4 years ago
Andy Wilkinson 1cc0a45749 Upgrade to Undertow 2.0.32.Final
Closes gh-23849
4 years ago
Andy Wilkinson fc94588d9f Upgrade to Rxjava2 2.2.20
Closes gh-23848
4 years ago
Andy Wilkinson d6c20b917b Upgrade to Netty 4.1.53.Final
Closes gh-23847
4 years ago
Andy Wilkinson b0ddcdd695 Upgrade to Dropwizard Metrics 4.1.14
Closes gh-23846
4 years ago
Andy Wilkinson 91a71e3ca7 Upgrade to Hazelcast 3.12.10
Closes gh-23845
4 years ago
Andy Wilkinson 1b10af0c55 Upgrade to Caffeine 2.8.6
Closes gh-23844
4 years ago
Stephane Nicoll d1e503602b Polish 4 years ago
Phillip Webb f84323fe3e Prevent duplicate jar entries from being written
Update the `AbstractJarWriter` so that it can directly build the layer
index as entries are written. Prior to this commit, a layer tracking
was handled by a decorator class which was broken because it didn't
override enough methods. Since `AbstractJarWriter` has quite a complex
API, it seems sensible to have it handle the layer index directly,
removing the need for a decorator entirely.

Fixes gh-23801
4 years ago
Brian Clozel b37eecc015 Merge branch '2.2.x' into 2.3.x
Closes gh-23812
4 years ago
Brian Clozel 9478cd2dfb Document how to configure h2c protocol
Prior to this commit, the how-to documentation would say that Spring
Boot does not support the h2c protocol. While it's not supported
out-of-the-box with a configuration property, this protocol can still be
configured using server customizers.

This commit documents, with code snippets, the server customizers one
should use to configure the h2c protocol in an application - for each
supported server.

Closes gh-21997
4 years ago
Brian Clozel 5eb1e26e10 Add HttpEncodingAutoConfiguration to WebMvcTest
Prior to this commit, tests using the `@WebMvcTest` annotation would not
include the `HttpEncodingAutoConfiguration`. This means that, even if
configured, the encoding filter would not be configured in MVC tests,
resulting in an inconsistency with `@SpringBootTest` tests.

This commit ensures that the `HttpEncodingAutoConfiguration` is included
when `@WebMvcTest` is used.

Fixes gh-23749
4 years ago
Scott Frederick 43cfebaca0 Ignore properties files in hidden directories
This commit modifies the logic for finding properties files using
wildcard paths to ignore files if any part of the file path contains
a hidden directory. Hidden directories are common when Kubernetes
mounts config maps onto volumes in a pod, which was causing the same
properties files to be loaded multiple times.

Fixes gh-23160
4 years ago
Stephane Nicoll 37cbf1bb2d Start building against Spring Kafka 2.5.7 snapshots
See gh-23787
4 years ago
Stephane Nicoll 77637ddd7d Start building against Spring AMQP 2.2.12 snapshots
See gh-23784
4 years ago
Stephane Nicoll 55a0152fe5 Start building against Spring Integration 5.3.3 snapshots
See gh-23780
4 years ago
Stephane Nicoll 5e6595b771 Start building against Spring Data Neumann-SR5 snapshots
See gh-23777
4 years ago
Stephane Nicoll a601901a6c Start building against Spring Kafka 2.3.12 snapshots
See gh-23786
4 years ago
Stephane Nicoll 2415987c70 Start building against Spring AMQP 2.2.12 snapshots
See gh-23783
4 years ago
Stephane Nicoll bc8d200905 Start building against Spring Data Moore-SR11 Snapshots
See gh-23776
4 years ago
Stephane Nicoll e61595927b Start building against Reactor Dysprosium-SR13 snapshots
See gh-23770
4 years ago
Stephane Nicoll 551623435b Start building against Spring Framework 5.2.10 snapshots
See gh-23773
4 years ago
Stephane Nicoll 7b4e3462ec Start building against Reactor Dysprosium-SR13 snapshots
See gh-23769
4 years ago
Stephane Nicoll 4371a3c080 Merge branch '2.2.x' into 2.3.x
Closes gh-23764
4 years ago
Stephane Nicoll 4f4cc8b182 Polish contribution
See gh-23755
4 years ago
cdalexndr 2f2b1b9656 Note that using LiveReload requires Devtools restart to be enabled
See gh-23755
4 years ago
Stephane Nicoll f4e822f650 Prevent access to the EMF within the singleton lock
This commit makes sure to defer registration of hibernate statistics
outside of the singleton lock as it can lead to deadlocks when the
EntityManagerFactory is initialized in deferred mode.

Closes gh-23740
4 years ago
Stephane Nicoll b7a8b0f19b Hacking
See gh-23740
4 years ago
Andy Wilkinson 633027b1cd Upgrade to Gradle 6.7
Closes gh-23754
4 years ago
Andy Wilkinson a754b791a2 Merge branch '2.2.x' into 2.3.x
Closes gh-23750
4 years ago
Andy Wilkinson 11bc62fb83 Stop using PostConstruct to default session timeout to ServerProperties'
Fixes gh-23716
4 years ago
Stephane Nicoll dd74810c80 Revert "Fix detection logic for embedded databases"
This reverts commit c4a5a34702.

See gh-23721
4 years ago
Andy Wilkinson e8187f9bb0 Merge branch '2.2.x' into 2.3.x
Closes gh-23743
4 years ago
Andy Wilkinson 2a40bd7853 Register shutdown hook so it can tidy up a partial refresh
Previously, the shutdown hook was only registered once refresh has
completed. If the JVM was shut down during refresh (or after refresh
and before the hook was registered) the hook wouldn't run and the
partially refreshed context would not be cleaned up.

This commit moves the registration of the shutdown hook to before
refresh processing begins. This ensures that the hook is available
to clean up the context if the JVM is shutdown while refresh is in
progress.

Fixes gh-23625
4 years ago
Andy Wilkinson 11b5e86ffd Deprecate BootJar#getConfigurations
Fixes gh-23527
4 years ago
Asha Somayajula c4a5a34702 Fix detection logic for embedded databases
Closes gh-23721
4 years ago
Scott Frederick 9c672deb2d Add javadoc links in Maven plugin parameter docs
This commit modifies the documentation generated for the
Maven plugin to include links to javadoc when Spring
Boot types are mentioned. Some javadoc was also polished
to improve the generated docs.

Fixes gh-21555
4 years ago
Stephane Nicoll 6beb0c939f Document how to override plugin configuration on the command line
Closes gh-21536
4 years ago
Stephane Nicoll b210d0680a Polish 4 years ago
Andy Wilkinson 0abe38d478 Merge branch '2.2.x' into 2.3.x
Closes gh-23676
4 years ago
Andy Wilkinson 7fc345f587 Apply server.undertow.eager-filter-init to factory
Fixes gh-23675
4 years ago
Andy Wilkinson a9a32f39b5 Merge branch '2.2.x' into 2.3.x
Closes gh-23671
4 years ago
Andy Wilkinson 667ccdae84 Simplify temp directory creation and improve diagnostics
Closes gh-23622
4 years ago
Scott Frederick de685bdca4 Document buildpack configuration of JVM options
Fixes gh-21582
4 years ago
Scott Frederick 49b0707f1a Clarify image builder configuration documentation
This commit qualifies examples of configuring the CNB builder to clarify
that the examples apply to use of the default Paketo builder, and adds links
to the official Paketo docs for more details.

Fixes gh-19967
4 years ago
Phillip Webb 0709c7671f Merge branch '2.2.x' into 2.3.x
Closes gh-23614
4 years ago
Phillip Webb ce70e7d768 Merge branch '2.1.x' into 2.2.x
Closes gh-23613
4 years ago
Phillip Webb 1db2f5f960 Support Formatter conversion service beans
Update `ConversionServiceDeducer` to also include `Formatter` beans
when they are qualified with `@ConfigurationPropertiesBinding`.

Fixes gh-23576
4 years ago
Phillip Webb 61181b4554 Merge branch '2.2.x' into 2.3.x
Closes gh-23611
4 years ago
Phillip Webb c523295694 Merge branch '2.1.x' into 2.2.x
Closes gh-23610
4 years ago
Phillip Webb 206356728c Add upgrading section to reference docs
Add a section to the reference documentation with links to the release
notes on the wiki.

Closes gh-23529
4 years ago
Andy Wilkinson 543763462c Update tests to look for snippets in correct location
See gh-23598
4 years ago
Andy Wilkinson 7eb92cc71a More Gradle snippets to correct location
See gh-23598
4 years ago
Andy Wilkinson 2d3291fb83 Merge branch '2.2.x' into 2.3.x
Closes gh-23598
4 years ago
Andy Wilkinson 7ac14203ab Expand Gradle plugin's docs on setting bootRun's system properties
Closes gh-23578
4 years ago
Thorasine 6c3dfac1d0 Fix typos
See gh-23561
4 years ago
Madhura Bhave e2289e2f21 Merge branch '2.2.x' into 2.3.x
Closes gh-23569
4 years ago
Madhura Bhave c0f158dffd Polish "Do not fail if h2Console bean cannot connect to db"
See gh-23566
4 years ago
Shraddha Yeole 2d76de29ff Do not fail if h2Console bean cannot connect to db
See gh-23566
4 years ago
Madhura Bhave 9a6d52e30d Merge branch '2.2.x' into 2.3.x 4 years ago
Madhura Bhave 3118ca9313 Polish 4 years ago
Madhura Bhave 121ba2b0ab Merge branch '2.2.x' into 2.3.x
Closes gh-23567
4 years ago
ketaki-t 66aa24b5f0 Remove documentation for unsupported gradle versions
See gh-23562
4 years ago
Andy Wilkinson 914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
4 years ago
Andy Wilkinson 323af718e2 Only change the method of requests that Jetty won't handle by default
Previously, JettyEmbeddedErrorHandler would change the method of every
request that is handles to GET. This was being done to work around
Jetty's error handling only dealing with GET, POST, and HEAD requests
by default. It had the unwanted side-effect of causing an error
response to a HEAD request having a body as, from the error handling's
perspective, it was a GET request.

This commit updates JettyEmbeddedErrorHandler to only set the method
on a request for which error handling is being performed if the method
isn't already one that will be handled, leaving the method of GET,
POST, and HEAD requests unchanged.

Unfortunately, short of implementing an HTTP client, this change cannot
be tested as the Apache HttpClient, OkHttp, and the JDK's
HttpURLConnection all silently drop the body of a response to a HEAD
request, preventing a test from asserting that a body hasn't been sent.

Closes gh-23551
4 years ago
Andy Wilkinson bd4934b0fd Fix matching of SNAPSHOT artifacts when customizing layers
Previously the artifact's version was used. In an artifact's version,
SNAPSHOT is replaced with the timestamped version number of a specific
snapshot. As a result, it no longer matches the *:*:*SNAPSHOT pattern.

This commit replaces switches to using the artifact's base version.
This preserves the SNAPSHOT in the version number. For non-snapshot
artifacts, the version and base version are identical.

Fixes gh-23533
4 years ago
Stephane Nicoll cd15cbdc79 Do not execute datasource initialization in a separate thread
This commit makes sure that `data.sql` is performed in the same thread
as the one initializing the JPA container.

Closes gh-22852
4 years ago
Stephane Nicoll 789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
4 years ago
Stephane Nicoll 466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
4 years ago
Stephane Nicoll fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
4 years ago
Stephane Nicoll 2c1634e6ed Merge branch '2.2.x' into 2.3.x
Closes gh-23508
4 years ago
Rujun Chen 8330752b11 Add mising entry for Netty tcnative dependency management
See gh-23502
4 years ago
Andy Wilkinson 9bd040cb0f Merge branch '2.2.x' into 2.3.x
Closes gh-23500
4 years ago
Andy Wilkinson e74f777971 Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
4 years ago
Andy Wilkinson df5cd21ca5 Merge branch '2.2.x' into 2.3.x
Closes gh-23481
4 years ago
Andy Wilkinson 6dc8e6815d Align default tldScanPatterns with Tomcat's
Previously, we configured embedded Tomcat in such a way that no TLD
scan patterns were configured. This differed from a standalone
Tomcat installation where 4 patterns are configured that take
precedence over some of the skip patterns. The missing scan patterns
resulted in the skip patterns preventing the discovery of Log4j2's
TLDs.

This commit updates TomcatServletWebServerFactory to configure the
same four scan patterns as standalone Tomcat configures by default.

Fixes gh-23302
4 years ago
Andy Wilkinson e626f7f47e Merge branch '2.2.x' into 2.3.x
Closes gh-23477
4 years ago
Andy Wilkinson bf9d23e55a Consider SpringBootTest's web environment in context cache key
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.

This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.

Fixes gh-23085
4 years ago
Stephane Nicoll b3c5588c86 Merge branch '2.2.x' into 2.3.x
Closes gh-23461
4 years ago
Pavel Gordon 62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation
See gh-23459
4 years ago
Andy Wilkinson 232c310df2 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 24102656f2 Fix Log4j2 XML configuration tests on Windows
See gh-22983
4 years ago
Stephane Nicoll 3adf06df17 Merge branch '2.2.x' into 2.3.x
Closes gh-23452
4 years ago
Stephane Nicoll 2999f09a40 Rework tip on templates location in the IDE
This commit rework the tip on locating templates when running the app
in the IDE. Using classpath* should not change anything as this won't
make a difference without a pattern in the path.

Closes gh-23068
4 years ago
Stephane Nicoll 531690b8e1 Merge branch '2.2.x' into 2.3.x
Closes gh-23448
4 years ago
Stephane Nicoll 7f84a92ef1 Document that Java 15 is supported
Closes gh-23447
4 years ago
Stephane Nicoll 37ded9f6d3 Merge branch '2.2.x' into 2.3.x
Closes gh-23446
4 years ago
dreis2211 fba1fb23e4 Fix multi-release JAR test on JDK 15
Backport of 54f93e9

See gh-23445
4 years ago
Phillip Webb 363d35a0ac Merge branch '2.2.x' into 2.3.x
Closes gh-23444
4 years ago
Phillip Webb b443d22c59 Merge branch '2.1.x' into 2.2.x
Closes gh-23443
4 years ago
Phillip Webb cc442c5c0d Make HandlerFunctionDescription JDK 15 compatible
Update `HandlerFunctionDescription` so that it will work with JDK 15.

Closes gh-23442
4 years ago
Phillip Webb 3fca8c6b4e Merge branch '2.2.x' into 2.3.x
Closes gh-23441
4 years ago
Phillip Webb 4945806d84 Make `StringSequence.isEmpty()` public
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.

Closes gh-23440
4 years ago
Andy Wilkinson 0963218be1 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 0edf7cb9b9 Polish Log4j2 XML configuration tests
See gh-22983
4 years ago
Andy Wilkinson 13e08a4344 Merge branch '2.2.x' into 2.3.x
Closes gh-23428
4 years ago
Andy Wilkinson f6492cd0c0 Consume level and dateformat patterns as system props in Log4j config
Previously LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN were not
consumed as system properties in log4j2.xml and log4j2-file.xml. As a
result, the logging.pattern.level and logging.pattern.dateformat
configuration properties, which are translated into the
LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN system properties
respectively had no effect.

This commit updates the log4j2.xml and log4j2-file.xml config files to
consume LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN as system
properties. When the system property is not set, the configuation falls
back to the default values specified in the config files. Tests for
both log4j2.xml and log4j2-file.xml to verify the behaviour have also
bean added.

Fixes gh-22983
4 years ago
Andy Wilkinson 8667e9ded8 Merge branch '2.2.x' into 2.3.x
Closes gh-23426
4 years ago
Andy Wilkinson 581190d7a0 Test the Gradle plugin against 6.7-rc-1
Closes gh-23425
4 years ago
Andy Wilkinson d06af28cd8 Merge branch '2.2.x' into 2.3.x
Closes gh-23422
4 years ago
Andy Wilkinson 360e29af48 Polish "Add note about Kotlin main class name"
See gh-23418
4 years ago
Sebastiaan Fernandez 0bde5fda9b Add note about Kotlin main class name
See gh-23418
4 years ago
Andy Wilkinson 55bfef9901 Merge branch '2.2.x' into 2.3.x
Closes gh-23408
4 years ago
Andy Wilkinson 95f26c6358 Configure Flyway with initSqls for any DataSource configuration
Previously, spring.flyway.init-sqls was only applied to Flyway's
configuration if Flyway was being configured to create the DataSource.
If Flyway was being configured to use an existing DataSource, init-sqls
was not applied. This is a hangover from when the init SQLs support was
introduced. At that time, Flyway only supported SQL to initialize the
connection when it was creating the DataSource. Flyway 5.2 added init
SQL support no matter how Flyway's DataSource was configured.

This commit updates FlywayAutoConfiguration to always apply the
init-sqls property to Flyway's configuration. The property's
documentation does not describe the current limitation so this change
should align the behaviour with what the documentation leads people to
expect.

Fixes gh-23392
4 years ago
Andy Wilkinson 3861ef13fb Merge branch '2.2.x' into 2.3.x
Closes gh-23406
4 years ago
Andy Wilkinson 5ec673ff2a Add anchors to section headers in Gradle plugin docs
Fixes gh-23402
4 years ago
Andy Wilkinson 07dc202966 Upgrade to Micrometer 1.5.5
Closes gh-23393
4 years ago
Stephane Nicoll 3622fd5b04 Upgrade to Spring Session Dragonfruit-SR1
Closes gh-23187
4 years ago
Stephane Nicoll ab2115633f Upgrade to Micrometer 1.3.14
Closes gh-23388
4 years ago
Stephane Nicoll 35b33303d0 Upgrade to Spring Session Corn-SR4
Closes gh-23186
4 years ago
Stephane Nicoll 91c1d52fc1 Upgrade to Micrometer 1.1.18
Closes gh-23384
4 years ago
Stephane Nicoll db04672403 Upgrade to Spring Session Bean-SR12
Closes gh-23185
4 years ago
Stephane Nicoll a2be6e0817 Upgrade to Spring Kafka 2.5.6
Closes gh-23199
4 years ago
Stephane Nicoll e5d135c61c Upgrade to Spring Kafka 2.3.11
Closes gh-23198
4 years ago
Andy Wilkinson d3d96f0417 Upgrade to Spring REST Docs 2.0.5.RELEASE
Closes gh-23374
4 years ago
Andy Wilkinson d6586b8354 Merge branch '2.2.x' into 2.3.x
Closes gh-23376
4 years ago
Andy Wilkinson e87e52d035 Merge branch '2.1.x' into 2.2.x
Closes gh-23375
4 years ago
Andy Wilkinson 106968a115 Upgrade to Spring REST Docs 2.0.5.RELEASE
Closes gh-23374
4 years ago
Stephane Nicoll 7a7aef80d9 Upgrade to Spring AMQP 2.2.11
Closes gh-23373
4 years ago
Stephane Nicoll 9ab8ad6e74 Upgrade to Spring AMQP 2.2.11
Closes gh-23372
4 years ago
Stephane Nicoll 9a09a3c570 Upgrade to Spring AMQP 2.1.17
Closes gh-23371
4 years ago
Stephane Nicoll 68ea2ca210 Upgrade to Spring Data Neumann-SR4
Closes gh-23196
4 years ago
Stephane Nicoll bac5a7909e Upgrade to Spring Data Moore-SR10
Closes gh-23195
4 years ago
Stephane Nicoll b1e47811af Upgrade to Spring Data Lovelace-SR20
Closes gh-23194
4 years ago
Stephane Nicoll 8faa08f585 Merge branch '2.2.x' into 2.3.x
Closes gh-23341
4 years ago
Stephane Nicoll 15dd780eb4 Upgrade to Spring WS 3.0.10.RELEASE
Closes gh-23339
4 years ago
Stephane Nicoll e5af0d51aa Upgrade to Spring HATEOAS 1.1.2.RELEASE
Closes gh-23338
4 years ago
Stephane Nicoll 83d9385946 Upgrade to Lettuce 5.3.4.RELEASE
Closes gh-23337
4 years ago
Stephane Nicoll d7a5d44a75 Upgrade to Spring Ws 3.0.10.RELEASE
Closes gh-23336
4 years ago
Stephane Nicoll d5aeb828e6 Upgrade to Neo4j Ogm 3.2.16
Closes gh-23335
4 years ago
Stephane Nicoll 3f520f18d7 Upgrade to Tomcat 9.0.38
Closes gh-23334
4 years ago
Stephane Nicoll 297735a7e7 Upgrade to Spring Ws 3.0.10.RELEASE
Closes gh-23333
4 years ago
Stephane Nicoll b37d79a07e Upgrade to Neo4j Ogm 3.1.22
Closes gh-23332
4 years ago
Stephane Nicoll 9f3b3504ef Upgrade to Tomcat 9.0.38
Closes gh-23331
4 years ago
Phillip Webb f590225c82 Merge branch '2.2.x' into 2.3.x
Closes gh-23328
4 years ago
Phillip Webb bd87ba33d0 Use ephemeral ports for RSocket tests
Closes gh-23325
4 years ago
Phillip Webb 5c1055dc22 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 195def0ec3 Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb e0030094e2 Fix missing jar entry certificates
Ensure that the source jar entry is closed before reading
certificates and code signers from the entry.

gh-19041
4 years ago
Andy Wilkinson 409743eddb Merge branch '2.2.x' into 2.3.x
Closes gh-23320
4 years ago
Andy Wilkinson 5a266155b0 Disable proxyBeanMethods on Spring Session config sub-classes
Closes gh-23280
4 years ago
Stephane Nicoll 2df947cedb Upgrade to Undertow 2.1.4.Final
Closes gh-23318
4 years ago