Commit Graph

14370 Commits

Author SHA1 Message Date
Stephane Nicoll 706eb6df60 Upgrade to Dropwizard Metrics 4.1.26
Closes gh-28280
2021-10-11 11:33:32 +02:00
Stephane Nicoll 1662fc915e Upgrade to Jetty 9.4.44.v20210927
Closes gh-28277
2021-10-11 08:42:24 +02:00
Stephane Nicoll bff1ed0e2f Upgrade to Undertow 2.2.12.Final
Closes gh-28276
2021-10-11 08:41:55 +02:00
Stephane Nicoll 32397d7bfb Upgrade to R2DBC Bom Arabba-SR11
Closes gh-28274
2021-10-11 08:41:53 +02:00
Stephane Nicoll 010713df1b Upgrade to Postgresql 42.2.24
Closes gh-28273
2021-10-11 08:41:52 +02:00
Stephane Nicoll 1e834bfcf5 Upgrade to Netty tcNative 2.0.44.Final
Closes gh-28272
2021-10-11 08:41:51 +02:00
Stephane Nicoll 3d9cc639fa Upgrade to Lombok 1.18.22
Closes gh-28271
2021-10-11 08:41:50 +02:00
Stephane Nicoll 43401239ca Upgrade to Dropwizard Metrics 4.1.26
Closes gh-28270
2021-10-11 08:41:49 +02:00
Andy Wilkinson d47260637b Merge branch '2.4.x' into 2.5.x
Closes gh-28262
2021-10-08 12:39:17 +01:00
Andy Wilkinson c5d45585d9 Remove unnecessary overrides of finalize
Closes gh-28209
2021-10-08 12:39:00 +01:00
Stephane Nicoll c0605ffc71 Start building against Spring Batch 4.3.4 snapshots
See gh-28250
2021-10-08 07:52:56 +02:00
Stephane Nicoll 98bc8e711d Start building against Spring Integration 5.5.5 snapshots
See gh-28249
2021-10-08 07:52:12 +02:00
Stephane Nicoll b0aa1cdb00 Start building against Spring Session 2021.0.3 snapshots
See gh-28248
2021-10-08 07:51:20 +02:00
Stephane Nicoll a9513ccf07 Start building against Spring Security 5.5.3 snapshots
See gh-28247
2021-10-08 07:51:19 +02:00
Stephane Nicoll 5396a980c3 Start building against Spring Kafka 2.7.8 snapshots
See gh-28246
2021-10-08 07:49:29 +02:00
Stephane Nicoll 123e93f1d5 Start building against Spring AMQP 2.3.11 snapshots
See gh-28245
2021-10-08 07:48:38 +02:00
Stephane Nicoll bbdb74bff0 Start building against Spring Data 2021.0.6 snapshots
See gh-28244
2021-10-08 07:47:37 +02:00
Stephane Nicoll 70b0fa4512 Start building against Spring HATEOAS 1.3.5 snapshots
See gh-28243
2021-10-08 07:46:51 +02:00
Stephane Nicoll 69e7fe1c57 Start building against Micrometer 1.7.5 snapshots
See gh-28242
2021-10-08 07:46:04 +02:00
Stephane Nicoll 737cea0d73 Start building against Spring Framework 5.3.11 snapshots
See gh-28241
2021-10-08 07:45:15 +02:00
Stephane Nicoll 24ada6f240 Start building against Reactor 2020.0.12 snapshots
See gh-28240
2021-10-08 07:44:35 +02:00
Stephane Nicoll 33ffae8e74 Start building against Spring Batch 4.3.4 snapshots
See gh-28230
2021-10-07 09:07:50 +02:00
Stephane Nicoll 092d3fa81e Start building against Spring Session 2020.0.7 snapshots
See gh-28229
2021-10-07 09:07:22 +02:00
Stephane Nicoll 41eded4b8b Start building against Spring Security 5.4.9 snapshots
See gh-28228
2021-10-07 09:06:54 +02:00
Stephane Nicoll f8d6d76410 Start building against Spring Kafka 2.6.11 snapshots
See gh-28227
2021-10-07 09:06:24 +02:00
Stephane Nicoll 3cf1888cef Start building against Spring AMQP 2.3.11 snapshots
See gh-28226
2021-10-07 09:06:00 +02:00
Stephane Nicoll 6c801b9db9 Start building against Spring Data 2020.0.14 snapshots
See gh-28225
2021-10-07 09:05:35 +02:00
Stephane Nicoll 81da876964 Start building against Micrometer 1.6.12 snapshots
See gh-28224
2021-10-07 09:05:09 +02:00
Stephane Nicoll 9f06a5fe21 Start building against Spring Framework 5.3.11 snapshots
See gh-28223
2021-10-07 09:04:28 +02:00
Stephane Nicoll dd802ba5e0 Start building against Reactor 2020.0.12 snapshots
See gh-28222
2021-10-07 09:03:57 +02:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Madhura Bhave 9f4cf8398b Merge branch '2.4.x' into 2.5.x
Closes gh-28201
2021-10-05 15:46:04 -07:00
Madhura Bhave 61736e9958 Polish " Update configtree docs about dot notation being correctly mapped"
See gh-28170
2021-10-05 15:43:20 -07:00
deb-von-seggern 8f91fc450d Update configtree docs about dot notation being correctly mapped
See gh-28170
2021-10-05 15:14:02 -07:00
Andy Wilkinson 437a1601ef Fix broken content negotiation for Prometheus with OpenMetrics
Update Prometheus `TextOutputFormat` so that OpenMetrics is used in
preference to text output when an appropriate accept header is found.

If the accept header contains `*/*` or is missing then the text format
will be used.

See gh-28130
2021-10-05 11:11:52 +01:00
Phillip Webb d8141e6a8d Allow Producible enums to indicate a default value
Add an `isDefault()` method to `Producible` which can be used to
indicate which of the enum values should be used when the accept header
is `*/*` or `null`.

Prior to this commit, the last enum value was always used as the
default.

See gh-28130
2021-10-05 09:39:28 +01:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x
Closes gh-28193
2021-10-05 08:35:24 +02:00
Pratik Gupta a3423f1edf Fix log4j2 file name reference in reference doc
See gh-28189
2021-10-05 08:32:59 +02:00
Andy Wilkinson ff3eed73ee Merge branch '2.4.x' into 2.5.x
Closes gh-28190
2021-10-04 10:21:49 +01:00
Andy Wilkinson b7a2a2d5e0 Set last access and last modified times in layertools extract
Closes gh-28167
2021-10-04 10:17:11 +01:00
Madhura Bhave 3249d05464 Merge branch '2.4.x' into 2.5.x
Closes gh-28171
2021-10-01 15:54:49 -07:00
Susmitha f94caed7e9 Update ConstructorBinding javadoc with usage information
See gh-28168
2021-10-01 15:53:43 -07:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
2021-10-01 11:32:22 +01:00
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
2021-10-01 11:30:11 +01:00
Stephane Nicoll 1c139b1d23 Merge branch '2.4.x' into 2.5.x
Closes gh-28159
2021-10-01 08:13:49 +02:00
Stephane Nicoll bedd749e1c Polish "Clarify use of @AutoConfigureTestEntityManager"
See gh-28086
2021-10-01 08:12:01 +02:00
Leo Li 70f64f2c26 Clarify use of @AutoConfigureTestEntityManager
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.

See gh-28086
2021-10-01 07:55:57 +02:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
2021-09-26 13:06:14 -07:00
Phillip Webb 01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
2021-09-26 13:05:17 -07:00
Andy Wilkinson ef18a2166d Merge branch '2.4.x' into 2.5.x
Closes gh-28119
2021-09-23 13:23:40 +01:00
Andy Wilkinson 5957dfeea4 Don't include binary jars in loader-tools source jar
Closes gh-28113
2021-09-23 13:23:29 +01:00
Stephane Nicoll 4652bb7adf Upgrade to SendGrid 4.7.5
Closes gh-28109
2021-09-23 07:34:55 +02:00
Andy Wilkinson 2ba593328f Order detector for AbstractDataSourceInitializers
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
2021-09-22 18:30:44 +01:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Stephane Nicoll 01809eccf3 Upgrade to jOOQ 3.14.15
Closes gh-28088
2021-09-22 08:31:04 +02:00
Stephane Nicoll 7a04966d5c Upgrade to jOOQ 3.14.15
Closes gh-28087
2021-09-22 08:29:24 +02:00
Phillip Webb 8c3db23be3 Merge branch '2.4.x' into 2.5.x
Closes gh-28083
2021-09-21 15:53:37 -07:00
cdalexndr 798b282e58 Document that devtools restart doesn't work with AspectJ weaving
See gh-28071
2021-09-21 15:51:36 -07:00
Phillip Webb a862ebc254 Merge branch '2.4.x' into 2.5.x
Closes gh-28081
2021-09-21 15:20:19 -07:00
Phillip Webb bbb4ac1542 Sanitize SPRING_APPLICATION_JSON by default
Update `Sanitizer` default keys to include `SPRING_APPLICATION_JSON`.

Fixes gh-28045
2021-09-21 15:18:50 -07:00
Phillip Webb 40d65a74dc Merge branch '2.4.x' into 2.5.x 2021-09-21 14:43:38 -07:00
Phillip Webb ec12d51f30 Polish 2021-09-21 14:00:28 -07:00
Stephane Nicoll 8fe226d832 Upgrade to Spring Integration 5.5.4
Closes gh-27949
2021-09-21 20:53:04 +02:00
Stephane Nicoll 7ebf71ab66 Upgrade to Spring Integration 5.4.11
Closes gh-27948
2021-09-21 20:52:05 +02:00
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 2021-09-21 11:17:55 -07:00
Phillip Webb dfd36673f7 Update copyright year of changed files 2021-09-21 11:17:19 -07:00
Phillip Webb cfeafee826 Polish 2021-09-21 11:16:46 -07:00
Stephane Nicoll 4ee249c700 Merge branch '2.4.x' into 2.5.x
Closes gh-28072
2021-09-21 08:18:39 +02:00
Stephane Nicoll 15de85d89a Polish contribution
See gh-28061
2021-09-21 08:18:08 +02:00
Leo Li 0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints"
See gh-28061
2021-09-21 08:12:21 +02:00
Andy Wilkinson b2b691b1d0 Merge branch '2.4.x' into 2.5.x
Closes gh-28069
2021-09-20 19:04:48 +01:00
Andy Wilkinson c2361aeb04 Make WebMvcMetricsFilter set status consistently for all exceptions
Closes gh-27988
2021-09-20 18:07:18 +01:00
Andy Wilkinson 6f555c4012 Upgrade to Spring Kafka 2.7.7
Closes gh-27918
2021-09-20 09:59:47 +01:00
Andy Wilkinson e5cdf819a0 Upgrade to Spring Data 2021.0.5
Closes gh-27917
2021-09-20 09:59:06 +01:00
Andy Wilkinson c0895befc2 Upgrade to Spring Data 2020.0.13
Closes gh-27912
2021-09-20 09:56:51 +01:00
Andy Wilkinson 8364840cd5 Merge branch '2.4.x' into 2.5.x
Closes gh-28047
2021-09-17 12:25:13 +01:00
Andy Wilkinson eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config
Closes gh-28038
2021-09-17 12:00:45 +01:00
Stephane Nicoll babf43bdef Upgrade to Spring HATEOAS 1.3.4
Closes gh-27970
2021-09-16 21:39:03 +02:00
Stephane Nicoll 97348f14f7 Upgrade to Spring HATEOAS 1.2.9
Closes gh-27969
2021-09-16 21:38:28 +02:00
Andy Wilkinson 9df099e343 Polish 2021-09-16 12:11:34 +01:00
Andy Wilkinson a4f1d32203 Register application shutdown hook lazily
Previously, SpringApplicationShutdownHook would always register a
shutdown hook, even if SpringApplication was configured not to
use a shutdown hook, such as in a war deployment. This could
result in a memory leak when the war was undeployed. The shutdown
hook registered by SpringApplicationShutdownHook would remain
registered, pinning the web application's class loader in memory.

This commit updates SpringApplicationShutdownHook so that it
registers a shutdown hook with the JVM lazily, upon registeration
of the first application context.

Fixes gh-27987
2021-09-16 10:38:29 +01:00
Andy Wilkinson afb81f14ea Merge branch '2.4.x' into 2.5.x
Closes gh-28032
2021-09-16 09:55:45 +01:00
Andy Wilkinson 1900a11f8a Fix Undertow's resource loading when filename contains reserved chars
Fixes gh-9283
2021-09-16 09:55:26 +01:00
Stephane Nicoll 50308ad6a9 Upgrade to Lettuce 6.1.5.RELEASE
Closes gh-28031
2021-09-16 08:20:52 +02:00
Stephane Nicoll 7f15a37909 Upgrade to Netty tcNative 2.0.43.Final
Closes gh-28030
2021-09-16 07:52:15 +02:00
Stephane Nicoll cee3449653 Upgrade to Lettuce 6.0.8.RELEASE
Closes gh-28029
2021-09-16 07:52:13 +02:00
Stephane Nicoll 17c35c7e31 Upgrade to Micrometer 1.7.4
Closes gh-27916
2021-09-16 06:36:50 +02:00
Stephane Nicoll 3118c16c48 Upgrade to Micrometer 1.6.11
Closes gh-27910
2021-09-16 06:36:11 +02:00
Stephane Nicoll 915f565435 Upgrade to Spring Framework 5.3.10
Closes gh-27915
2021-09-15 12:11:59 +02:00
Stephane Nicoll 4ada440b4d Upgrade to Spring Framework 5.3.10
Closes gh-27909
2021-09-15 12:11:13 +02:00
Scott Frederick a540da11ad Merge branch '2.4.x' into 2.5.x
Closes gh-27993
2021-09-14 16:45:34 -05:00
Scott Frederick c8ff874e91 Add builderFor label to ephemeral builder image
Adding a label to the ephemeral builder image cloned from the base
builder image eliminates contention between builds that are run
concurrently. Without this label, concurrent builds could result in
a race condition in the Docker daemon if the ephemeral builder image
shared by builds was deleted by both builds at exactly the same time.

Fixes gh-27888
2021-09-14 15:22:23 -05:00
Stephane Nicoll c7ded01d05 Upgrade to Reactor 2020.0.11
Closes gh-27914
2021-09-14 18:41:02 +02:00
Stephane Nicoll bb693d73a6 Upgrade to Reactor 2020.0.11
Closes gh-27908
2021-09-14 18:40:12 +02:00
Stephane Nicoll 242631f40e Upgrade to Netty tcNative 2.0.43.Final
Closes gh-27986
2021-09-14 07:15:35 +02:00
Stephane Nicoll 441037ce18 Upgrade to Netty 4.1.68.Final
Closes gh-27985
2021-09-14 07:15:34 +02:00
Stephane Nicoll 9c6138fa1c Upgrade to Maven War Plugin 3.3.2
Closes gh-27984
2021-09-14 07:15:33 +02:00
Stephane Nicoll 8454812df1 Upgrade to Logback 1.2.6
Closes gh-27983
2021-09-14 07:15:32 +02:00
Stephane Nicoll 5813021b7b Upgrade to Kotlin Coroutines 1.5.2
Closes gh-27982
2021-09-14 07:15:31 +02:00
Stephane Nicoll 3e221094c0 Upgrade to jOOQ 3.14.14
Closes gh-27980
2021-09-14 07:15:29 +02:00
Stephane Nicoll afba450e53 Upgrade to Jetty EL 9.0.52
Closes gh-27979
2021-09-14 07:15:28 +02:00
Stephane Nicoll d8254af351 Upgrade to Jackson Bom 2.12.5
Closes gh-27978
2021-09-14 07:15:27 +02:00
Stephane Nicoll c624dc9c78 Upgrade to Gson 2.8.8
Closes gh-27977
2021-09-14 07:15:26 +02:00
Stephane Nicoll f4cbcaf774 Upgrade to Groovy 3.0.9
Closes gh-27976
2021-09-14 07:15:25 +02:00
Stephane Nicoll bffd983d56 Upgrade to Glassfish EL 3.0.4
Closes gh-27975
2021-09-14 07:15:24 +02:00
Stephane Nicoll 1aaa79c841 Upgrade to Ehcache3 3.9.6
Closes gh-27974
2021-09-14 07:15:23 +02:00
Stephane Nicoll 35f61bf1ca Start building against Spring HATEOAS 1.3.4 snapshots
See gh-27970
2021-09-13 14:28:22 +02:00
Stephane Nicoll 57dcb70910 Start building against Spring HATEOAS 1.2.9 snapshots
See gh-27969
2021-09-13 14:27:28 +02:00
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
2021-09-13 10:47:47 +01:00
Andy Wilkinson 273600bcdd Retain distinction between compile and runtime deps of optional deps
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
2021-09-13 10:47:14 +01:00
Stephane Nicoll 2004c062df Upgrade to Tomcat 9.0.53
Closes gh-27963
2021-09-13 11:04:02 +02:00
Stephane Nicoll ab81e3c05c Upgrade to Tomcat 9.0.53
Closes gh-27961
2021-09-13 10:28:42 +02:00
Stephane Nicoll 97f3c82743 Upgrade to Netty tcNative 2.0.42.Final
Closes gh-27960
2021-09-13 10:10:05 +02:00
Stephane Nicoll c8ea3af6f7 Upgrade to Netty 4.1.68.Final
Closes gh-27959
2021-09-13 10:10:04 +02:00
Stephane Nicoll 21c53729ab Upgrade to Maven War Plugin 3.3.2
Closes gh-27958
2021-09-13 10:10:03 +02:00
Stephane Nicoll fadf5ba33a Upgrade to Logback 1.2.6
Closes gh-27957
2021-09-13 10:10:01 +02:00
Stephane Nicoll 3276c977e3 Upgrade to jOOQ 3.14.14
Closes gh-27956
2021-09-13 10:10:00 +02:00
Stephane Nicoll 0e3ac71857 Upgrade to Jetty EL 8.5.70
Closes gh-27955
2021-09-13 10:09:59 +02:00
Stephane Nicoll d09beaf968 Upgrade to Gson 2.8.8
Closes gh-27954
2021-09-13 10:09:58 +02:00
Stephane Nicoll 6eedf9cfe4 Upgrade to Groovy 2.5.15
Closes gh-27953
2021-09-13 10:09:57 +02:00
Stephane Nicoll a5b5b2d10f Upgrade to Glassfish EL 3.0.4
Closes gh-27952
2021-09-13 10:09:56 +02:00
Stephane Nicoll a3762b3f08 Upgrade to Ehcache3 3.9.6
Closes gh-27951
2021-09-13 10:09:54 +02:00
Stephane Nicoll d481a75beb Start building against Spring Integration 5.5.4 snapshots
See gh-27949
2021-09-13 08:41:31 +02:00
Stephane Nicoll c678a0edc0 Start building against Spring Integration 5.4.11 snapshots
See gh-27948
2021-09-13 08:40:32 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
2021-09-12 09:02:35 +02:00
cdalexndr 60bc94e1d4 Clarify Selenium auto-configuration requires HtmlUnit
The auto-configuration requires `HtmlUnit`, so this auto-cofiguration
only works if both Selenium and HtmlUnit are used.

Prevents misinterpretation that WebDriver can be auto configured without
htmlunit.

See gh-27920
2021-09-12 09:00:18 +02:00
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
2021-09-09 16:12:25 +01:00
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
2021-09-09 16:12:09 +01:00
Stephane Nicoll d93a8581d2 Start building against Spring Kafka 2.7.7 snapshots
See gh-27918
2021-09-09 15:57:20 +02:00
Stephane Nicoll 5d1ae23733 Start building against Spring Data 2021.0.5 snapshots
See gh-27917
2021-09-09 15:56:57 +02:00
Stephane Nicoll 2f33720101 Start building against Micrometer 1.7.4 snapshots
See gh-27916
2021-09-09 15:56:32 +02:00
Stephane Nicoll 229e61d3ea Start building against Spring Framework 5.3.10 snapshots
See gh-27915
2021-09-09 15:56:02 +02:00
Stephane Nicoll e918543ce9 Start building against Reactor 2020.0.11 snapshots
See gh-27914
2021-09-09 15:55:32 +02:00
Stephane Nicoll 08e79ee472 Start building against Spring Data 2020.0.13 snapshots
See gh-27912
2021-09-09 15:43:44 +02:00
Stephane Nicoll 348863c4ae Start building against Micrometer 1.6.11 snapshots
See gh-27910
2021-09-09 15:43:19 +02:00
Stephane Nicoll bcc4529cc5 Start building against Spring Framework 5.3.10 snapshots
See gh-27909
2021-09-09 15:42:54 +02:00
Stephane Nicoll f557a8a5d9 Start building against Reactor 2020.0.11 snapshots
See gh-27908
2021-09-09 15:42:22 +02:00
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
2021-09-09 14:40:40 +01:00
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
2021-09-09 14:39:52 +01:00
Andy Wilkinson 7afaffb80e Merge branch '2.4.x' into 2.5.x
Closes gh-27905
2021-09-09 13:38:09 +01:00
Andy Wilkinson 1f2035ae64 Move Docker-based Elasticsearch test into separate class
Closes gh-27904
2021-09-09 13:24:26 +01:00
Andy Wilkinson 37240bda3f Merge branch '2.4.x' into 2.5.x
Closes gh-27900
2021-09-09 10:13:40 +01:00
Andy Wilkinson 47163af9b6 Fix handling of Zip64 jar files larger than 4,294,967,295 bytes
Previously, a Zip64 jar file was identified by the number of entries
in the central directory being 0xFFFF. This value indicates that
there the number of entries is too big for the 2-byte field. However,
a jar may be in Zip64 format due to it exceeding the Zip format's
maximum size rather than its maximum number of entries so this field
cannot be used as a reliable indicator. The Zip specification doesn't
require any of the fields of the end of central directory record to
have a value of 0xFFFF (2-byte fields) or 0xFFFFFFFF (4-byte fields)
when using Zip64 format so we need to take a different approach.

Additionally, a number of places in the code assumed that an entry's
offset would always be available from the central directory file
header directly. This assumption did not hold true when the jar was
a Zip64 archive due to its size as the offset's value would be
0xFFFFFFF indicating that it should be read from the Zip64 extended
information field within the header's extra field instead.

This commit updates the Zip64 detection to look for the Zip64 end of
central directory locator instead. If present, it begins 20 bytes
before the beginning of the end of central directory record. Its
first four bytes are always 0x07064b50. The code that reads the
local header offset has also been updated to refer to the Zip64
extended information field when the offset is too large to fit in
the 4-byte field in the central directory file header. To allow
greater-than-4-byte offsets to be handled, a number of fields,
method parameters, and local variables have had their type changed
from an int to a long.

Fixes gh-27822
2021-09-09 09:17:48 +01:00
Andy Wilkinson ba19577646 Merge branch '2.4.x' into 2.5.x
Closes gh-27885
2021-09-07 17:00:09 +01:00
Andy Wilkinson 93ac6455d3 Document that starter parent enables compilation with -parameters
Closes gh-27762
2021-09-07 16:57:56 +01:00
Andy Wilkinson 4c8cafe731 Merge branch '2.4.x' into 2.5.x
Closes gh-27883
2021-09-07 09:46:33 +01:00
Andy Wilkinson 6e6a6c059c Upgrade to Testcontainers 1.16
Closes gh-27882
2021-09-07 09:46:05 +01:00
Stephane Nicoll d6cc1f6d7d Polish "Use more precise variables to detect Azure App Service"
See gh-27819
2021-09-06 08:28:58 +02:00
Julien Dubois 69b23470c7 Use more precise variables to detect Azure App Service
See gh-27819
2021-09-06 08:12:22 +02:00
Stephane Nicoll 7cc8668540 Merge branch '2.4.x' into 2.5.x
Closes gh-27876
2021-09-05 17:29:01 +02:00
Yanming Zhou 6bf92f06e9 Fix inconsistent devtools doc
See gh-27812
2021-09-05 17:28:02 +02:00
Stephane Nicoll 3dab5ff2c0 Merge branch '2.4.x' into 2.5.x
Closes gh-27873
2021-09-05 17:02:17 +02:00
Henning Pöttker 831e28b001 Fix typo in javadoc
See gh-27856
2021-09-05 17:01:31 +02:00
Phillip Webb 1215bbc10b Merge branch '2.4.x' into 2.5.x
Closes gh-27859
2021-09-02 11:16:42 -07:00
Phillip Webb 61764389c2 Merge branch '2.3.x' into 2.4.x
Closes gh-27858
2021-09-02 11:15:32 -07:00
Phillip Webb 44eb8c39d2 Align ApplicationTemp with Files.createTempDirectory
Update `ApplicationTemp` to align the way that it creates temp folders
with the way that `Files.createTempDirectory` works.

Closes gh-27857
2021-09-02 11:13:26 -07:00
Phillip Webb 15d0078eca Merge branch '2.4.x' into 2.5.x
Closes gh-27830
2021-08-27 22:40:56 -07:00
Phillip Webb 87dbda2339 Ensure TypeConverterConverter is thread safe
Update `TypeConverterConverter` do that a new `SimpleTypeConverter` is
obtained for each `convert` operation. Prior to this commit the same
`SimpleTypeConverter` could be accessed concurrently from multiple
threads which is not allowed.

Fixes gh-27829
2021-08-27 22:08:40 -07:00
Andy Wilkinson b508d77a4e Merge branch '2.4.x' into 2.5.x
Closes gh-27803
2021-08-23 15:45:33 +01:00
Andy Wilkinson 990b766847 Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
See gh-27755
2021-08-23 15:36:16 +01:00
Berchris Requiao c83f6ebaa2 Document how to parameterize REST Docs' output dir with WebTestClient
See gh-27755
2021-08-23 15:30:21 +01:00
Andy Wilkinson 24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
2021-08-23 13:53:34 +01:00
Safeer A efdc19647c Avoid NPE when routing DataSource has target with null key
See gh-27698
2021-08-23 13:40:33 +01:00
Andy Wilkinson e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Stephane Nicoll 0d44503980 Upgrade to Spring Session 2021.0.2
Closes gh-27605
2021-08-18 16:11:05 +02:00
Stephane Nicoll 2baee89971 Upgrade to Spring Session 2020.0.6
Closes gh-27599
2021-08-18 16:10:15 +02:00
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
2021-08-18 13:48:29 +01:00
Stephane Nicoll e0dc55e865 Upgrade to Netty 4.1.67.Final
Closes gh-27745
2021-08-18 09:28:18 +02:00
Stephane Nicoll e0fdddc658 Upgrade to Hazelcast 4.1.5
Closes gh-27744
2021-08-18 09:28:17 +02:00
Stephane Nicoll 42422c40da Upgrade to AppEngine SDK 1.9.91
Closes gh-27743
2021-08-18 09:28:16 +02:00
Stephane Nicoll a97a566d01 Upgrade to ActiveMQ 5.16.3
Closes gh-27742
2021-08-18 09:28:14 +02:00
Stephane Nicoll 253e4b25b1 Upgrade to Netty 4.1.67.Final
Closes gh-27741
2021-08-18 08:56:04 +02:00
Stephane Nicoll c9ec939127 Upgrade to AppEngine SDK 1.9.91
Closes gh-27740
2021-08-18 08:56:03 +02:00
Stephane Nicoll a798288de1 Upgrade to ActiveMQ 5.16.3
Closes gh-27739
2021-08-18 08:56:02 +02:00
Stephane Nicoll 8f12295e9b Upgrade to Spring Integration 5.5.3
Closes gh-27604
2021-08-18 07:38:49 +02:00
Stephane Nicoll 3e47b6e2b1 Upgrade to Spring Integration 5.4.10
Closes gh-27598
2021-08-18 07:38:04 +02:00
Andy Wilkinson b4f0f29bff Test our Gradle plugin against Gradle 7.2
Closes gh-27732
2021-08-17 15:58:40 +01:00
Andy Wilkinson ea641d3aab Merge branch '2.4.x' into 2.5.x
Closes gh-27730
2021-08-17 15:42:05 +01:00
Andy Wilkinson 29f5570208 Stop s-b-configuration-metadata leaking enforced constraints
Fixes gh-27726
2021-08-17 15:34:29 +01:00
Stephane Nicoll 34c83d6016 Upgrade to Nimbus JOSE JWT 9.10.1
Closes gh-27701
2021-08-17 08:09:06 +02:00
Stephane Nicoll 37c9fb09e6 Upgrade to OAuth2 OIDC SDK 9.9.1
Closes gh-27700
2021-08-17 08:09:05 +02:00
Stephane Nicoll d9cb1871fe Upgrade to Spring Security 5.5.2
Closes gh-27603
2021-08-17 08:02:09 +02:00
Stephane Nicoll afaf4421d0 Upgrade to Nimbus JOSE JWT 8.22.1
Closes gh-27699
2021-08-17 08:01:21 +02:00
Stephane Nicoll 0abedb2547 Upgrade to Spring Security 5.4.8
Closes gh-27597
2021-08-17 08:00:15 +02:00
Stephane Nicoll fe64fef7b9 Upgrade to Undertow 2.2.10.Final
Closes gh-27686
2021-08-16 08:14:37 +02:00
Stephane Nicoll 3a83fafebb Upgrade to SendGrid 4.7.4
Closes gh-27684
2021-08-16 08:14:34 +02:00
Stephane Nicoll a61be95f79 Upgrade to MIMEPull 1.9.15
Closes gh-27683
2021-08-16 08:14:33 +02:00
Stephane Nicoll 44b8a94b01 Upgrade to Maven Enforcer Plugin 3.0.0
Closes gh-27682
2021-08-16 08:14:32 +02:00
Stephane Nicoll c0f1adcf54 Upgrade to MariaDB 2.7.4
Closes gh-27681
2021-08-16 08:14:31 +02:00
Stephane Nicoll f6914e5fd1 Upgrade to Logback 1.2.5
Closes gh-27680
2021-08-16 08:14:30 +02:00
Stephane Nicoll 4adc3230c7 Upgrade to Janino 3.1.6
Closes gh-27679
2021-08-16 08:14:29 +02:00
Stephane Nicoll 0b75acfc1c Upgrade to Hazelcast Hibernate5 2.2.1
Closes gh-27678
2021-08-16 08:14:28 +02:00
Stephane Nicoll fb17f6e085 Upgrade to Glassfish JAXB 2.3.5
Closes gh-27677
2021-08-16 08:14:27 +02:00
Stephane Nicoll 7fced191cf Upgrade to Ehcache3 3.9.5
Closes gh-27676
2021-08-16 08:14:26 +02:00
Stephane Nicoll 6e4c35d463 Upgrade to Couchbase Client 3.1.7
Closes gh-27675
2021-08-16 08:14:25 +02:00
Stephane Nicoll eda014e736 Upgrade to Cassandra Driver 4.11.3
Closes gh-27674
2021-08-16 08:14:24 +02:00
Stephane Nicoll b44a7ae3f6 Upgrade to Undertow 2.2.10.Final
Closes gh-27673
2021-08-16 07:36:41 +02:00
Stephane Nicoll de0d940451 Upgrade to MIMEPull 1.9.15
Closes gh-27671
2021-08-16 07:36:41 +02:00
Stephane Nicoll df36225752 Upgrade to Maven Enforcer Plugin 3.0.0
Closes gh-27670
2021-08-16 07:36:41 +02:00
Stephane Nicoll 46ede9cd22 Upgrade to MariaDB 2.7.4
Closes gh-27669
2021-08-16 07:36:41 +02:00
Stephane Nicoll 9728511950 Upgrade to Logback 1.2.5
Closes gh-27668
2021-08-16 07:36:30 +02:00
Stephane Nicoll b32dfaad15 Upgrade to Janino 3.1.6
Closes gh-27667
2021-08-16 07:35:22 +02:00
Stephane Nicoll 8c0aea7acb Upgrade to Glassfish JAXB 2.3.5
Closes gh-27666
2021-08-16 07:35:21 +02:00
Stephane Nicoll 1fdeda0d15 Upgrade to Ehcache3 3.9.5
Closes gh-27665
2021-08-16 07:35:20 +02:00
Stephane Nicoll 9f505788f8 Upgrade to Spring Kafka 2.7.6
Closes gh-27602
2021-08-13 11:08:35 +02:00
Stephane Nicoll 454ea44c39 Upgrade to Spring Data 2021.0.4
Closes gh-27633
2021-08-13 11:08:10 +02:00
Stephane Nicoll c0ed8136d8 Upgrade to Micrometer 1.7.3
Closes gh-27601
2021-08-13 11:07:29 +02:00
Stephane Nicoll fa99ae774a Upgrade to Spring Data 2020.0.12
Closes gh-27632
2021-08-13 11:06:25 +02:00
Stephane Nicoll 69f54c6b6d Upgrade to Micrometer 1.6.10
Closes gh-27596
2021-08-13 11:05:32 +02:00
Andy Wilkinson 119fb6948d Test our Gradle plugin against Gradle 7.2-rc-3
Closes gh-27640
2021-08-12 15:26:50 +01:00
Andy Wilkinson aafa21686a Merge branch '2.4.x' into 2.5.x
Closes gh-27638
2021-08-12 12:32:56 +01:00
Andy Wilkinson 3bed23d9dc Replace PropertyMapper.CachingSupplier with use of SingletonSupplier
Closes gh-27635
2021-08-12 12:04:18 +01:00
Andy Wilkinson 341e129a59 Use SingletonSupplier in MetricsRepositoryFactoryCustomizer
Closes gh-27634
2021-08-12 11:35:11 +01:00
Andy Wilkinson 35ea3b234d Prevent repository metrics from causing a circular reference
Fixes gh-27591
2021-08-12 10:26:16 +01:00
Stephane Nicoll 79462fa2da Start building against Spring Data 2021.0.4 snapshots
See gh-27633
2021-08-12 09:02:14 +02:00
Stephane Nicoll d888eb64de Start building against Spring Data 2020.0.12 snapshots
See gh-27632
2021-08-12 09:01:22 +02:00
Stephane Nicoll 2fd4ac67d1 Upgrade to Reactor 2020.0.10
Closes gh-27600
2021-08-10 16:55:19 +02:00
Stephane Nicoll 7d326bd0dc Upgrade to Reactor 2020.0.10
Closes gh-27595
2021-08-10 16:54:24 +02:00
Andy Wilkinson f19fff4c64 Merge branch '2.4.x' into 2.5.x
Closes gh-27620
2021-08-10 10:45:07 +01:00
Andy Wilkinson d4d1ca007e Mention productionRuntimeClasspath in the docs
Closes gh-27558
2021-08-10 10:44:57 +01:00
Stephane Nicoll 1d29443e71 Merge branch '2.4.x' into 2.5.x
Closes gh-27618
2021-08-10 10:04:01 +02:00
Henning Pöttker 5b15c2191b Fix typo in javadoc
See gh-27614
2021-08-10 09:59:30 +02:00
Stephane Nicoll a393c2982c Merge branch '2.4.x' into 2.5.x
Closes gh-27616
2021-08-10 09:58:40 +02:00
Stephane Nicoll cd0bb969db Fix Potential NPE in TomcatMetricsBinder.findContext()
Closes gh-27576
2021-08-10 09:58:18 +02:00
Stephane Nicoll 585eb00af6 Start building against Spring Session 2021.0.2 snapshots
See gh-27605
2021-08-09 15:18:16 +02:00
Stephane Nicoll a304494508 Start building against Spring Integration 5.5.3 snapshots
See gh-27604
2021-08-09 15:17:50 +02:00
Stephane Nicoll 53bdcc9586 Start building against Spring Security 5.5.2 snapshots
See gh-27603
2021-08-09 15:17:20 +02:00
Stephane Nicoll 93f9c60540 Start building against Spring Kafka 2.7.6 snapshots
See gh-27602
2021-08-09 15:16:54 +02:00
Stephane Nicoll b09aea8ec1 Start building against Micrometer 1.7.3 snapshots
See gh-27601
2021-08-09 15:16:32 +02:00
Stephane Nicoll d4b6fd2344 Start building against Reactor 2020.0.10 snapshots
See gh-27600
2021-08-09 15:16:06 +02:00
Stephane Nicoll a4bf490582 Start building against Spring Session 2020.0.6 snapshots
See gh-27599
2021-08-09 14:24:23 +02:00
Stephane Nicoll e377a59f51 Start building against Spring Integration 5.4.10 snapshots
See gh-27598
2021-08-09 14:23:58 +02:00
Stephane Nicoll 7e3ad42fd3 Start building against Spring Security 5.4.8 snapshots
See gh-27597
2021-08-09 14:23:32 +02:00
Stephane Nicoll 1f2a5becf7 Start building against Micrometer 1.6.10 snapshots
See gh-27596
2021-08-09 14:23:03 +02:00
Stephane Nicoll 50b3b73ca7 Start building against Reactor 2020.0.10 snapshots
See gh-27595
2021-08-09 14:22:25 +02:00
Andy Wilkinson 7610fe02c5 Test our Gradle plugin against 7.2-rc-2
Closes gh-27593
2021-08-09 09:50:07 +01:00
Stephane Nicoll 9826304e29 Merge branch '2.4.x' into 2.5.x
Closes gh-27557
2021-08-04 09:25:25 +02:00
izeye 9f44cefc56 Use deprecated mainClassName in Gradle test
See gh-27537
2021-08-04 09:23:52 +02:00
Stephane Nicoll a9ea8d95f3 Merge branch '2.4.x' into 2.5.x
Closes gh-27555
2021-08-04 08:55:51 +02:00
wuwen 46c47dcd29 Remove dead code in DefaultErrorAttributes
See gh-27538
2021-08-04 08:45:30 +02:00
Scott Frederick f60d998ea1 Merge branch '2.4.x' into 2.5.x
Closes gh-27535
2021-07-30 13:50:56 -05:00
Scott Frederick 5d793afcb5 Prevent hanging when deleting Docker builder container after exception
An exception being thrown while the Maven plugin is uploading the app
archive bits to an ephemeral builder container would leave the
interaction with the Docker daemon in a state that caused further
interaction with the daemon (such as deleting the ephemeral builder)
to hang indefinitely. This commit cleans up the connection on an
exception to prevent this condition.

Fixes gh-27515
2021-07-30 13:41:40 -05:00