Commit Graph

10836 Commits

Author SHA1 Message Date
Phillip Webb 5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith 33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb 60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang 6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Phillip Webb 464b302655 Set withTestKitDir per Gradle version
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
2021-01-25 21:35:25 -08:00
Andy Wilkinson 46d908f632 Upgrade to Gradle 6.8.1
Closes gh-24737
2021-01-22 14:20:57 +00:00
Andy Wilkinson 0b06ac9938 Use AssertJ's doesNotContainKey
Closes gh-24970
2021-01-22 13:28:41 +00:00
Stephane Nicoll 244a6ac7e5 Polish "Deprecate Spring Data Solr"
See gh-24942
2021-01-20 14:02:59 +01:00
Stephane Nicoll 10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Stephane Nicoll 1ad5a3fe2e Update copyright of changed file
See gh-24753
2021-01-18 17:01:31 +01:00
izeye ddfa1e632b Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures
See gh-24753
2021-01-18 17:00:26 +01:00
Stephane Nicoll b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll 9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Stephane Nicoll 283ed48d63 Unwrap Datasource against an actual interface
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
2021-01-14 18:00:35 +01:00
Stephane Nicoll 3ecd1001a1 Upgrade to Spring Kafka 2.5.11.RELEASE
Closes gh-24826
2021-01-14 08:38:29 +01:00
Stephane Nicoll 696539c68f Upgrade to Spring Integration 5.3.5.RELEASE
Closes gh-24825
2021-01-14 08:38:27 +01:00
Stephane Nicoll 8908969a6c Upgrade to Spring AMQP 2.2.14.RELEASE
Closes gh-24824
2021-01-14 08:38:26 +01:00
Stephane Nicoll 92f132ae35 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24823
2021-01-14 08:38:25 +01:00
Stephane Nicoll 6f9e3a6e94 Upgrade to Netty 4.1.58.Final
Closes gh-24822
2021-01-14 08:38:24 +01:00
Stephane Nicoll 1dd445b6ca Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24821
2021-01-14 08:38:23 +01:00
Stephane Nicoll 6d5d8cbc2c Upgrade to Lettuce 5.3.6.RELEASE
Closes gh-24801
2021-01-13 14:02:36 +01:00
Stephane Nicoll 6b353aee8d Upgrade to Micrometer 1.5.10
Closes gh-24785
2021-01-13 14:01:19 +01:00
Phillip Webb 9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Andy Wilkinson 7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
2021-01-12 15:47:33 +00:00
Stephane Nicoll c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
2021-01-12 15:00:11 +01:00
Andy Wilkinson 997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
2021-01-12 13:11:46 +00:00
Stephane Nicoll f02951fb17 Upgrade to Netty 4.1.56.Final
Closes gh-24764
2021-01-12 09:55:44 +01:00
Stephane Nicoll 2e69198f97 Upgrade to Neo4j OGM 3.2.19
Closes gh-24763
2021-01-12 09:55:43 +01:00
Stephane Nicoll 5fb1ca6043 Upgrade to Johnzon 1.2.9
Closes gh-24762
2021-01-12 09:55:41 +01:00
Stephane Nicoll 37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24761
2021-01-12 09:55:40 +01:00
Stephane Nicoll 3ae9639cbb Upgrade to Jackson Bom 2.11.4
Closes gh-24760
2021-01-12 09:55:38 +01:00
Stephane Nicoll 371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24759
2021-01-12 09:55:37 +01:00
Stephane Nicoll e48e48988a Upgrade to Hibernate 5.4.27.Final
Closes gh-24758
2021-01-12 09:55:35 +01:00
Stephane Nicoll 66daeab221 Upgrade to Hazelcast 3.12.11
Closes gh-24757
2021-01-12 09:55:34 +01:00
Stephane Nicoll 682c952306 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24756
2021-01-12 09:55:32 +01:00
Stephane Nicoll 7ab9fad062 Upgrade to Byte Buddy 1.10.19
Closes gh-24755
2021-01-12 09:55:31 +01:00
Stephane Nicoll b3bc79b10f Upgrade to AppEngine SDK 1.9.84
Closes gh-24754
2021-01-12 09:55:29 +01:00
Phillip Webb 72dd3b5628 Merge branch '2.2.x' into 2.3.x
Closes gh-24747
2021-01-11 14:21:56 -08:00
Phillip Webb f9e3e0d532 Register default resource path using a Resource
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
2021-01-11 14:20:46 -08:00
Andy Wilkinson 7625a979db Configure bootRun to use project's Java toolchain by default
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
2021-01-11 11:21:53 +00:00
Andy Wilkinson 064de4e073 Check configured JavaLauncher when determining version of the JVM
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
2021-01-11 10:36:16 +00:00
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
2021-01-08 15:32:19 +00:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
2021-01-07 15:59:02 -06:00
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
2021-01-06 17:29:24 -08:00
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
2021-01-06 16:58:05 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl
Fixes gh-24168
2021-01-06 16:42:09 -08:00
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:33:25 -08:00
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:04:58 -08:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
2021-01-06 08:58:13 +01:00
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers"
See gh-24606
2021-01-05 16:02:26 -08:00
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
2021-01-05 15:56:25 -08:00
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
2021-01-05 14:07:22 -08:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll f33c7bc27c Polish "Remove unnecessary semicolon"
See gh-24628
2021-01-05 08:24:03 +01:00
Andrey Kolchanov 097104584c Remove unnecessary semicolon
See gh-24628
2021-01-05 08:15:32 +01:00
Madhura Bhave 9928d74a9e Revert fix to enable cors for actuator endpoints
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.

See gh-11987
2021-01-04 12:25:43 -08:00
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll d0a1c49873 Polish
See gh-24604
2020-12-23 16:07:27 +01:00
Stephane Nicoll d86eba3b6b Upgrade to Thymeleaf 3.0.12
Closes gh-24599
2020-12-23 10:57:36 +01:00
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
2020-12-22 12:18:47 -08:00
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
2020-12-22 09:44:49 +01:00
Stephane Nicoll 306b964ce3 Fix multi-release JAR test on JDK 16
See gh-24453
2020-12-21 09:59:01 +01:00
izeye 97dd4c0871 Polish
See gh-24558
2020-12-21 09:35:41 +01:00
Madhura Bhave b82f5a408a Add a note about disabling git info
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave 302ba77812 Improve documentation regarding git commit info
Closes gh-24205
2020-12-18 17:13:30 -08:00
Madhura Bhave c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated
Closes gh-24531
2020-12-18 14:15:27 -08:00
Madhura Bhave 1db271c2c5 Reorder documentation about building images
Closes gh-24560
2020-12-18 14:02:29 -08:00
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
2020-12-17 20:43:41 -08:00
Madhura Bhave 361198ebba Fix tests
See gh-11987
2020-12-16 15:25:02 -08:00
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
2020-12-16 14:55:36 -08:00
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
2020-12-16 15:58:53 -06:00
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
2020-12-16 12:50:54 -08:00
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
2020-12-16 13:23:43 -06:00
Phillip Webb 29300530c6 Polish 2020-12-15 19:44:40 -08:00
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix
Closes gh-24486
2020-12-15 17:20:21 +00:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll 0533ac58fb Test the Gradle plugin against 6.7.1
Closes gh-24449
2020-12-10 15:33:37 +01:00
Stephane Nicoll ab99de4349 Polish
See gh-24418
2020-12-10 13:52:11 +01:00
Stephane Nicoll 94b6b62077 Upgrade to Undertow 2.1.5.Final
Closes gh-24441
2020-12-10 09:03:03 +01:00
Stephane Nicoll 30748b8dd0 Upgrade to Tomcat 9.0.41
Closes gh-24440
2020-12-10 09:03:02 +01:00
Stephane Nicoll 264cd83f4b Upgrade to Netty tcNative 2.0.35.Final
Closes gh-24439
2020-12-10 09:03:01 +01:00
Stephane Nicoll 1c720a56b2 Upgrade to Netty 4.1.55.Final
Closes gh-24438
2020-12-10 09:03:00 +01:00
Stephane Nicoll b6b046702f Upgrade to Caffeine 2.8.8
Closes gh-24437
2020-12-10 09:02:58 +01:00
Stephane Nicoll fd91daaf21 Upgrade to ActiveMQ 5.15.14
Closes gh-24436
2020-12-10 09:02:57 +01:00
Stephane Nicoll 5f8900ea0e Upgrade to Spring Kafka 2.5.10
Closes gh-24293
2020-12-10 09:00:35 +01:00
Stephane Nicoll 18e2ce1682 Upgrade to Spring Batch 4.2.5
Closes gh-24290
2020-12-10 08:59:47 +01:00
Stephane Nicoll c08310ca35 Upgrade to Spring AMQP 2.2.13
Closes gh-24287
2020-12-10 08:56:38 +01:00
Stephane Nicoll 388f00612e Upgrade to Micrometer 1.5.9
Closes gh-24427
2020-12-10 08:55:51 +01:00
Stephane Nicoll 7f9d0d2d7c Upgrade to Tomcat 9.0.41
Closes gh-24435
2020-12-10 08:20:55 +01:00
Stephane Nicoll 1094b7c10c Upgrade to Activemq 5.15.14
Closes gh-24434
2020-12-10 08:20:54 +01:00
Stephane Nicoll b8c68ef374 Upgrade to Undertow 2.0.33.Final
Closes gh-24433
2020-12-10 08:20:53 +01:00
Stephane Nicoll a9924c3576 Upgrade to Netty Tcnative 2.0.35.Final
Closes gh-24432
2020-12-10 08:20:51 +01:00
Stephane Nicoll 55b680e452 Upgrade to Netty 4.1.55.Final
Closes gh-24431
2020-12-10 08:20:50 +01:00
Stephane Nicoll 6d5e3b2c0d Upgrade to Caffeine 2.8.8
Closes gh-24430
2020-12-10 08:20:49 +01:00
Stephane Nicoll 60e69c2c3e Upgrade to Spring Kafka 2.3.13
Closes gh-24292
2020-12-10 08:19:26 +01:00
Stephane Nicoll 520b4bba9c Upgrade to Spring Batch 4.2.5
Closes gh-24289
2020-12-10 08:18:45 +01:00
Stephane Nicoll 317ec32458 Upgrade to Spring Integration 5.2.10
Closes gh-24429
2020-12-10 08:18:17 +01:00
Stephane Nicoll 241730bf10 Upgrade to Spring AMQP 2.2.13
Closes gh-24286
2020-12-10 08:17:25 +01:00
Phillip Webb 0bfa9cf107 Merge branch '2.2.x' into 2.3.x
Closes gh-24424
2020-12-09 18:19:28 -08:00
Phillip Webb 869141766b Use deterministic ordering of JavaBean methods
Update `JavaBeanBinder` so that methods and fields are sorted before
being processed. This ensures that setters are called in a deterministic
order, rather than the unspecified and variable order that reflection
provides.

Fixes gh-24068
2020-12-09 18:19:07 -08:00
Stephane Nicoll f4ed2e72c5 Upgrade to Spring Data Neumann-SR6
Closes gh-24283
2020-12-09 17:30:13 +01:00
Stephane Nicoll 6a8ad73e2e Upgrade to Spring Data Moore-SR12
Closes gh-24282
2020-12-09 17:27:30 +01:00
Stephane Nicoll 84b92bc531 Upgrade to Spring HATEOAS 1.1.3
Closes gh-24419
2020-12-09 14:12:33 +01:00
Stephane Nicoll 52b5c36750 Upgrade to Micrometer 1.5.8
Closes gh-24280
2020-12-09 10:52:26 +01:00
Stephane Nicoll 8c676a43bd Upgrade to Spring Framework 5.2.12
Closes gh-24277
2020-12-09 10:51:54 +01:00
Stephane Nicoll 275816d9f9 Upgrade to Micrometer 1.3.16
Closes gh-24279
2020-12-09 10:49:35 +01:00
Stephane Nicoll e961afd64f Upgrade to Spring Framework 5.2.12
Closes gh-24276
2020-12-09 10:48:56 +01:00
Phillip Webb 0d157e046f Fix checkstyle violations
See gh-21015
2020-12-08 18:12:30 -08:00
Phillip Webb 49e754f48b Merge branch '2.2.x' into 2.3.x
Closes gh-24411
2020-12-08 17:23:33 -08:00
Phillip Webb 286ef61071 Narrow auto-configure checkstyle suppressions
Closes gh-21015
2020-12-08 17:04:03 -08:00
Phillip Webb 30717b6ae3 Merge branch '2.2.x' into 2.3.x 2020-12-08 16:32:26 -08:00
Phillip Webb 4f95486822 Polish note about Maven/Gradle restarts
See gh-24271
2020-12-08 16:31:46 -08:00
Phillip Webb 445c6b8aa6 Merge branch '2.2.x' into 2.3.x
Closes gh-24409
2020-12-08 16:25:03 -08:00
Phillip Webb 10d3121e27 Polish "Triggering a restart" formatting
See gh-24271
2020-12-08 16:24:18 -08:00
Billy T. Hernandez 0503079dc5 Document devtools restart with Maven/Gradle
Update the documentation to help avoid confusion for people who aren't
using an IDE.

See gh-24271
2020-12-08 16:20:32 -08:00
Phillip Webb 06531b9b71 Merge branch '2.2.x' into 2.3.x
Closes gh-24407
2020-12-08 16:08:32 -08:00
Phillip Webb 89642f0ce8 Add link to appendix from error handling
Improve documentation by adding a link from the "Error Handling" section
to the appendix.

Closes gh-24265
2020-12-08 16:06:21 -08:00
Phillip Webb 11f285bde5 Merge branch '2.2.x' into 2.3.x
Closes gh-24403
2020-12-08 12:12:51 -08:00
izeye 8c55803931 Polish
See gh-24306
2020-12-08 12:08:35 -08:00
Stephane Nicoll 06671aa50e Stop deferring JPA bootstrap mode by default
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.

Closes gh-24249
2020-12-08 15:42:14 +01:00
Stephane Nicoll f84cb1b765 Upgrade to Reactor Dysprosium-SR15
Closes gh-24274
2020-12-08 05:07:59 +01:00
Stephane Nicoll 07a1ef3604 Upgrade to Reactor Dysprosium-SR15
Closes gh-24273
2020-12-08 05:05:33 +01:00
Stephane Nicoll 64d4648ad1 Upgrade to Spring Security 5.3.6
Closes gh-24296
2020-12-07 17:42:46 +01:00
Stephane Nicoll 9b4cf0c2fc Start building against Spring Kafka 2.5.10 snapshots
See gh-24293
2020-12-07 17:42:17 +01:00
Stephane Nicoll 4d29098e6a Start building against Spring Batch 4.2.5 snapshots
See gh-24290
2020-12-07 17:41:35 +01:00
Stephane Nicoll c17442c37b Start building against Spring AMQP 2.2.13 snapshots
See gh-24287
2020-12-07 17:40:53 +01:00
Stephane Nicoll 92d088f33f Start building against Spring Data Neumann-SR6 snapshots
See gh-24283
2020-12-07 17:39:09 +01:00
Stephane Nicoll 60523b07b9 Start building against Spring Kafka 2.3.13 snapshots
See gh-24292
2020-12-07 16:56:56 +01:00
Stephane Nicoll 4c07539a9f Start building against Spring Batch 4.2.5 snapshots
See gh-24289
2020-12-07 16:56:11 +01:00
Stephane Nicoll dab6d0a53f Start building against Spring AMQP 2.2.13 snapshots
See gh-24286
2020-12-07 16:55:43 +01:00
Stephane Nicoll 9ce919d6dc Start building against Spring Data Moore-SR12 snapshots
See gh-24282
2020-12-07 16:55:00 +01:00
Stephane Nicoll 6e040740c6 Upgrade to Tomcat 9.0.40
Closes gh-24375
2020-12-07 15:22:26 +01:00
Stephane Nicoll ddda80909e Upgrade to Jetty 9.4.35.v20201120
Closes gh-24374
2020-12-07 15:22:25 +01:00
Stephane Nicoll 9eeae227b0 Upgrade to HttpCore 4.4.14
Closes gh-24373
2020-12-07 15:22:23 +01:00
Stephane Nicoll c1ef49ae63 Upgrade to Hibernate 5.4.25.Final
Closes gh-24372
2020-12-07 15:22:22 +01:00
Stephane Nicoll 1e252ab382 Upgrade to Groovy 2.5.14
Closes gh-24371
2020-12-07 15:22:20 +01:00
Stephane Nicoll ae71111893 Upgrade to Dropwizard Metrics 4.1.16
Closes gh-24370
2020-12-07 15:22:19 +01:00
Stephane Nicoll dfae03704b Upgrade to DB2 JDBC 11.5.5.0
Closes gh-24369
2020-12-07 15:22:18 +01:00
Stephane Nicoll fa3723eb8b Upgrade to Caffeine 2.8.7
Closes gh-24368
2020-12-07 15:22:16 +01:00
Stephane Nicoll 530b3e79a4 Upgrade to Spring Security 5.2.8.RELEASE
Closes gh-24366
2020-12-07 12:27:49 +01:00
Stephane Nicoll cabe0ef28b Upgrade to Neo4j Ogm 3.2.18
Closes gh-24365
2020-12-07 12:27:48 +01:00
Stephane Nicoll 6779180a94 Upgrade to Infinispan 9.4.21.Final
Closes gh-24364
2020-12-07 12:27:47 +01:00
Stephane Nicoll 75059beac3 Upgrade to Hibernate 5.4.25.Final
Closes gh-24363
2020-12-07 12:27:46 +01:00
Stephane Nicoll aa87b788e2 Upgrade to Jetty 9.4.35.v20201120
Closes gh-24362
2020-12-07 12:27:44 +01:00
Stephane Nicoll 28cf851ed8 Upgrade to Groovy 2.5.14
Closes gh-24361
2020-12-07 12:27:43 +01:00
Stephane Nicoll 0ea2ab1005 Upgrade to Tomcat 9.0.40
Closes gh-24360
2020-12-07 12:27:42 +01:00
Stephane Nicoll 193e3e5e82 Upgrade to Httpcore 4.4.14
Closes gh-24359
2020-12-07 12:27:40 +01:00
Stephane Nicoll e06c106a4f Upgrade to Byte Buddy 1.10.18
Closes gh-24358
2020-12-07 12:27:39 +01:00
Stephane Nicoll e8f6f6be17 Upgrade to Netty 4.1.54.Final
Closes gh-24357
2020-12-07 12:27:38 +01:00
Stephane Nicoll 8498f402e5 Upgrade to Dropwizard Metrics 4.1.16
Closes gh-24356
2020-12-07 12:27:36 +01:00
Stephane Nicoll 7689609f81 Upgrade to Db2 Jdbc 11.5.5.0
Closes gh-24355
2020-12-07 12:27:35 +01:00
Stephane Nicoll cf51d80278 Upgrade to Appengine Sdk 1.9.83
Closes gh-24354
2020-12-07 12:27:34 +01:00
Stephane Nicoll 264ff95753 Upgrade to Caffeine 2.8.7
Closes gh-24353
2020-12-07 12:27:33 +01:00
Stephane Nicoll d8706cdcfe Upgrade to Jackson 2.10.5.20201202
Closes gh-24352
2020-12-07 12:27:31 +01:00
Stephane Nicoll aba4c20823 Upgrade to Couchbase Client 2.7.18
Closes gh-24351
2020-12-07 12:27:30 +01:00
Phillip Webb ff0725f6bf Fix HazelcastHealthIndicatorTests
See gh-24337
2020-12-05 07:52:53 -08:00
Phillip Webb 55ae5be84b Revert "Restore HazelcastHealthIndicatorTests"
This reverts commit 5a51b5853e.
2020-12-05 07:47:50 -08:00
Phillip Webb 5a51b5853e Restore HazelcastHealthIndicatorTests
Restore `HazelcastHealthIndicatorTests` which was accidentally replaced
with a version from 2.4.x.

See gh-24337
2020-12-05 07:28:08 -08:00
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb d8a05090b3 Fix checkstyle BDD Mockito violations
See gh-24337
2020-12-04 18:06:54 -08:00
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
2020-12-04 18:05:53 -08:00
Stephane Nicoll 065fde2996 Start building against Spring Framework 5.2.12 snapshots
See gh-24277
2020-11-30 16:42:38 +01:00
Stephane Nicoll 5f81882305 Start building against Reactor Dysprosium-SR15 snapshots
See gh-24274
2020-11-30 16:41:32 +01:00
Stephane Nicoll 9763ba56ba Start building against Spring Framework 5.2.12 snapshots
See gh-24276
2020-11-30 16:04:27 +01:00
Stephane Nicoll afeb9f29d4 Start building against Reactor Dysprosium-SR15 snasphots
See gh-24273
2020-11-30 14:32:15 +01:00
Jim Stockwell bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc
See gh-24257
2020-11-26 09:00:52 +01:00
Stephane Nicoll 9b992af34b Merge branch '2.2.x' into 2.3.x
Closes gh-24250
2020-11-25 14:31:30 +01:00
Stephane Nicoll d506f0c73e Polish "Reduce redis health indicator info command result size"
See gh-24208
2020-11-25 14:27:07 +01:00
xJoeWoo 99cc3f4bfc Reduce redis health indicator info command result size
See gh-24208
2020-11-25 14:23:57 +01:00
Stephane Nicoll 016b69aa78 Polish "Allow to exclude an empty set of ErrorAttributes"
See gh-24230
2020-11-23 20:44:18 +01:00
Wanderlei Souza 6518f8f7fd Allow to exclude an empty set of ErrorAttributes
See gh-24230
2020-11-23 20:43:59 +01:00
Andy Wilkinson 7efa1e47aa Merge branch '2.2.x' into 2.3.x
Closes gh-24222
2020-11-20 11:48:25 +00:00
Andy Wilkinson 12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses
Fixes gh-24123
2020-11-20 11:38:31 +00:00
Andy Wilkinson 0ed7f7f40a Merge branch '2.2.x' into 2.3.x
Closes gh-24219
2020-11-20 11:36:31 +00:00
Andy Wilkinson 08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
See gh-24095
2020-11-20 11:20:31 +00:00
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
2020-11-20 11:18:09 +00:00
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
2020-11-18 11:35:11 +00:00
Stephane Nicoll f3afd8a0f4 Fix location of Spring LDAP and Spring Session properties
Closes gh-23558
2020-11-18 10:28:54 +01:00
Stephane Nicoll 76912d1952 Merge branch '2.2.x' into 2.3.x
Closes gh-24193
2020-11-18 10:09:03 +01:00
Stephane Nicoll d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags"
See gh-24147
2020-11-18 09:58:03 +01:00
Peter Paul Bakker b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags
See gh-24147
2020-11-18 09:58:03 +01:00
Stephane Nicoll dea12f7551 Merge branch '2.2.x' into 2.3.x
Closes gh-24185
2020-11-17 21:36:34 +01:00
izeye b17895844d Provide dependency management for elasticsearch-rest-client-sniffer
See gh-24173
2020-11-17 21:32:37 +01:00
Scott Frederick da2276e7d4 Use stable builder and run images in integration tests
Fixes gh-24183
2020-11-17 13:54:10 -06:00
Sergey Kolesnikov b341b478a6 Rename "sla" to "slo" in reference documentation
See gh-24160
2020-11-16 07:20:23 +01:00
Stephane Nicoll 8311edf722 Upgrade to Neo4j OGM 3.2.18
Closes gh-24125
2020-11-12 07:15:26 +01:00
Stephane Nicoll 79835dc20f Upgrade to Netty 4.1.54.Final
Closes gh-24124
2020-11-12 07:08:37 +01:00
Andy Wilkinson 3e243de41b Merge branch '2.2.x' into 2.3.x
Closes gh-24121
2020-11-11 20:16:39 +00:00
dreis2211 033c78b945 Fix link to Flyway callback docs
See gh-24119
2020-11-11 20:14:08 +00:00
Andy Wilkinson e35c8e0214 Upgrade to Micrometer 1.5.7
Closes gh-24050
2020-11-11 19:33:12 +00:00
Andy Wilkinson 6507175d35 Upgrade to Spring Kafka 2.5.8.RELEASE
Closes gh-24075
2020-11-11 19:30:09 +00:00
Andy Wilkinson 0053fb7871 Upgrade to Spring Integration 5.3.4.RELEASE
Closes gh-24096
2020-11-11 19:28:49 +00:00
Andy Wilkinson 4a630dc7a9 Only skip ..-prefixed locations when found via wildcard
Closes gh-23983
2020-11-11 15:36:39 +00:00
Andy Wilkinson e8a1c3b9f8 Start building against Spring Integration 5.3.4 snapshots
See gh-24096
2020-11-11 09:16:30 +00:00
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
Andy Wilkinson dccc82d729 Upgrade to Hibernate Validator 6.1.6.Final
Closes gh-23871
2020-10-26 12:58:38 +00:00
Andy Wilkinson eb9dafe4ee Upgrade to Hibernate 5.4.22.Final
Closes gh-23870
2020-10-26 12:58:38 +00:00
Andy Wilkinson 7d0f5ce8fd Upgrade to Hazelcast 3.12.10
Closes gh-23869
2020-10-26 12:58:38 +00:00
Andy Wilkinson 1b0cb179e7 Upgrade to Dropwizard Metrics 4.1.14
Closes gh-23868
2020-10-26 12:58:38 +00:00
Andy Wilkinson 2958ff3b16 Upgrade to Couchbase Client 3.0.9
Closes gh-23867
2020-10-26 12:58:37 +00:00
Andy Wilkinson 5e71a72545 Upgrade to Caffeine 2.8.6
Closes gh-23866
2020-10-26 12:58:37 +00:00
Andy Wilkinson fca4ab78f4 Upgrade to Byte Buddy 1.10.17
Closes gh-23865
2020-10-26 12:58:37 +00:00
Andy Wilkinson 16b26cc9da Align versions of scala-library and scala-reflect
Closes gh-23887
2020-10-26 12:58:37 +00:00
Andy Wilkinson ac8d55db78 Upgrade to Spring Security 5.2.7.RELEASE
Closes gh-23862
2020-10-26 10:25:29 +00:00
Andy Wilkinson dc523c1bbd Upgrade to Lombok 1.18.16
Closes gh-23861
2020-10-26 10:25:27 +00:00
Andy Wilkinson 072bfae4af Upgrade to Postgresql 42.2.18
Closes gh-23860
2020-10-26 10:25:26 +00:00
Andy Wilkinson e9fe96b0ba Upgrade to Neo4j Ogm 3.2.17
Closes gh-23859
2020-10-26 10:25:25 +00:00
Andy Wilkinson 3b63e2c6da Upgrade to Hibernate Validator 6.0.21.Final
Closes gh-23858
2020-10-26 10:25:24 +00:00
Andy Wilkinson fdf44f1fd1 Upgrade to Hibernate 5.4.22.Final
Closes gh-23857
2020-10-26 10:25:22 +00:00
Andy Wilkinson 53a458ffcf Upgrade to Elasticsearch 6.8.13
Closes gh-23856
2020-10-26 10:25:21 +00:00
Andy Wilkinson 5854abcbf1 Upgrade to Jetty 9.4.33.v20201020
Closes gh-23855
2020-10-26 10:25:19 +00:00
Andy Wilkinson 4588889da4 Upgrade to Tomcat 9.0.39
Closes gh-23854
2020-10-26 10:25:18 +00:00
Andy Wilkinson 1ef399b6fa Upgrade to Httpclient 4.5.13
Closes gh-23853
2020-10-26 10:25:16 +00:00
Andy Wilkinson e8cf97bdbb Upgrade to Byte Buddy 1.10.17
Closes gh-23852
2020-10-26 10:25:15 +00:00
Andy Wilkinson 46392bc50d Upgrade to Mysql 8.0.22
Closes gh-23851
2020-10-26 10:25:14 +00:00
Andy Wilkinson 39e81521cb Upgrade to Joda Time 2.10.8
Closes gh-23850
2020-10-26 10:25:13 +00:00
Andy Wilkinson 1cc0a45749 Upgrade to Undertow 2.0.32.Final
Closes gh-23849
2020-10-26 10:25:11 +00:00
Andy Wilkinson fc94588d9f Upgrade to Rxjava2 2.2.20
Closes gh-23848
2020-10-26 10:25:10 +00:00
Andy Wilkinson d6c20b917b Upgrade to Netty 4.1.53.Final
Closes gh-23847
2020-10-26 10:25:09 +00:00
Andy Wilkinson b0ddcdd695 Upgrade to Dropwizard Metrics 4.1.14
Closes gh-23846
2020-10-26 10:25:07 +00:00
Andy Wilkinson 91a71e3ca7 Upgrade to Hazelcast 3.12.10
Closes gh-23845
2020-10-26 10:25:06 +00:00
Andy Wilkinson 1b10af0c55 Upgrade to Caffeine 2.8.6
Closes gh-23844
2020-10-26 10:25:04 +00:00
Stephane Nicoll d1e503602b Polish 2020-10-24 07:39:50 +02:00
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
2020-10-22 20:55:09 -07:00
Brian Clozel b37eecc015 Merge branch '2.2.x' into 2.3.x
Closes gh-23812
2020-10-22 20:16:01 +02:00
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
2020-10-22 20:04:35 +02:00
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
2020-10-22 20:02:45 +02:00
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
2020-10-21 18:01:44 -05:00
Stephane Nicoll 37cbf1bb2d Start building against Spring Kafka 2.5.7 snapshots
See gh-23787
2020-10-21 15:27:42 +02:00
Stephane Nicoll 77637ddd7d Start building against Spring AMQP 2.2.12 snapshots
See gh-23784
2020-10-21 15:27:03 +02:00
Stephane Nicoll 55a0152fe5 Start building against Spring Integration 5.3.3 snapshots
See gh-23780
2020-10-21 15:26:27 +02:00
Stephane Nicoll 5e6595b771 Start building against Spring Data Neumann-SR5 snapshots
See gh-23777
2020-10-21 15:25:46 +02:00
Stephane Nicoll a601901a6c Start building against Spring Kafka 2.3.12 snapshots
See gh-23786
2020-10-21 15:06:01 +02:00
Stephane Nicoll 2415987c70 Start building against Spring AMQP 2.2.12 snapshots
See gh-23783
2020-10-21 15:05:07 +02:00
Stephane Nicoll bc8d200905 Start building against Spring Data Moore-SR11 Snapshots
See gh-23776
2020-10-21 15:04:18 +02:00
Stephane Nicoll e61595927b Start building against Reactor Dysprosium-SR13 snapshots
See gh-23770
2020-10-21 10:11:09 +02:00
Stephane Nicoll 551623435b Start building against Spring Framework 5.2.10 snapshots
See gh-23773
2020-10-21 09:49:47 +02:00
Stephane Nicoll 7b4e3462ec Start building against Reactor Dysprosium-SR13 snapshots
See gh-23769
2020-10-21 09:48:50 +02:00
Stephane Nicoll 4371a3c080 Merge branch '2.2.x' into 2.3.x
Closes gh-23764
2020-10-20 17:05:49 +02:00
Stephane Nicoll 4f4cc8b182 Polish contribution
See gh-23755
2020-10-20 16:56:30 +02:00
cdalexndr 2f2b1b9656 Note that using LiveReload requires Devtools restart to be enabled
See gh-23755
2020-10-20 16:53:49 +02:00
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
2020-10-20 09:59:07 +02:00
Stephane Nicoll b7a8b0f19b Hacking
See gh-23740
2020-10-20 09:32:40 +02:00
Andy Wilkinson 633027b1cd Upgrade to Gradle 6.7
Closes gh-23754
2020-10-19 17:52:01 +01:00