root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
33,146 Commits 23 Branches 353 Tags 301 MiB
Commit Graph

13930 Commits

Author SHA1 Message Date
Andy Wilkinson 29c83bfd76 Instantiate detectors with ClassLoader that discovered them 
Fixes gh-27422
 2021-07-21 10:57:30 +01:00
Andy Wilkinson dfe91be885 Upgrade to Spring Integration 5.5.2 
Closes gh-27166
 2021-07-20 19:14:21 +01:00
Andy Wilkinson a5e95ef4c8 Merge branch '2.4.x' into 2.5.x 
Closes gh-27419
 2021-07-20 17:59:53 +01:00
Andy Wilkinson b5587b053d Use ClassLoader that will load Yaml to check if it's present 
Fixes gh-27133
 2021-07-20 17:59:40 +01:00
dreis2211 0ea3b9246a Add Java 17 to JavaVersion enum 
See gh-26769
 2021-07-20 15:12:50 +01:00
dreis2211 f0df9671cd Remove redundant deprecation suppressions 
See gh-27409
 2021-07-20 14:53:28 +01:00
Andy Wilkinson 5783caabd7 Upgrade to Spring AMQP 2.3.10 
Closes gh-27392
 2021-07-20 13:14:48 +01:00
Andy Wilkinson 47289de332 Upgrade to Spring Kafka 2.7.4 
Closes gh-27165
 2021-07-20 13:14:07 +01:00
Andy Wilkinson 9d2cb162e6 Configure initializer dependencies grouped by detector 
Previously, database initializers were detected and were configured
with dependencies based on their detection order. For example, if
detectors a, b, and c detected initializers a1, b1, b2, and c1,
c1 would depend on b2, b2 on b1, and b1 on a1:

------     ------     ------     ------
| c1 | --> | b2 | --> | b1 | --> | a1 |
------     ------     ------     ------

This could cause a dependency cycle in certain situations, for
example because the user had already configured b1 to depend on b2.

This commit reduces the risk of a cycle being created by batching
the initializers by their detector, with dependencies being
configured between each batch rather than between every initializer.
In the example above, this results in c1 depending on b1 and b2,
and b1 and b2 depending on a1:

           ------
------     | b1 |     ------
| c1 | --> |    | --> | a1 |
------     | b2 |     ------
           ------

As b1 and b2 were detected by the same detector, no dependency
between those initializers is defined.

Closes gh-27131
 2021-07-19 20:00:59 +01:00
Andy Wilkinson 9d64269552 Upgrade to Logback 1.2.4 
Closes gh-27380
 2021-07-19 17:16:28 +01:00
Andy Wilkinson 9973937af3 Upgrade to Spring AMQP 2.3.10 
Closes gh-27391
 2021-07-19 17:15:50 +01:00
Andy Wilkinson b354188bd8 Upgrade to Spring Data 2021.0.3 
Closes gh-27164
 2021-07-19 11:15:11 +01:00
Andy Wilkinson 6c8e040089 Upgrade to Netty 4.1.66.Final 
Closes gh-27390
 2021-07-19 11:13:59 +01:00
Andy Wilkinson ff31dffb0b Upgrade to jOOQ 3.14.13 
Closes gh-27389
 2021-07-19 11:13:58 +01:00
Andy Wilkinson 67739d9126 Upgrade to Jetty Reactive HTTPClient 1.1.10 
Closes gh-27388
 2021-07-19 11:13:56 +01:00
Andy Wilkinson db6ab63a38 Upgrade to Jedis 3.6.2 
Closes gh-27387
 2021-07-19 11:13:55 +01:00
Andy Wilkinson f6e4e0b299 Upgrade to Infinispan 12.1.7.Final 
Closes gh-27386
 2021-07-19 11:13:54 +01:00
Andy Wilkinson b4c3d00bd0 Upgrade to Dropwizard Metrics 4.1.25 
Closes gh-27385
 2021-07-19 11:13:52 +01:00
Andy Wilkinson 0ffafae375 Upgrade to AppEngine SDK 1.9.90 
Closes gh-27384
 2021-07-19 11:13:51 +01:00
Andy Wilkinson 3e0829cd47 Upgrade to Spring Data 2020.0.11 
Closes gh-27161
 2021-07-19 10:30:49 +01:00
Andy Wilkinson d8959f4bb2 Upgrade to Netty 4.1.66.Final 
Closes gh-27381
 2021-07-19 10:30:49 +01:00
Andy Wilkinson 47afdc0218 Upgrade to jOOQ 3.14.13 
Closes gh-27379
 2021-07-19 10:20:14 +01:00
Andy Wilkinson f8e3d86223 Upgrade to Dropwizard Metrics 4.1.25 
Closes gh-27378
 2021-07-19 10:20:12 +01:00
Andy Wilkinson 1d3b0d6262 Upgrade to AppEngine SDK 1.9.90 
Closes gh-27377
 2021-07-19 10:20:11 +01:00
Andy Wilkinson 96111514e1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27369
 2021-07-16 15:46:27 +01:00
Andy Wilkinson 06a3c40506 Use a 10s init query timeout in Cassandra tests 
Closes gh-27368
 2021-07-16 15:45:49 +01:00
dreis2211 be38ce3645 Disable Gradle plugin tests that fail on JDK 17 
See gh-27328
 2021-07-16 11:42:51 +01:00
Andy Wilkinson 1e09ef1db3 Merge branch '2.4.x' into 2.5.x 
Closes gh-27361
 2021-07-16 09:43:33 +01:00
Andy Wilkinson fe081b1742 Add Gson converter immediately before default Jackson converter 
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.

This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.

Fixes gh-27354
 2021-07-16 09:04:46 +01:00
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc 
See gh-27357
 2021-07-15 16:14:55 -07:00
izeye 198e40c72e Remove Flyway references from DependsOn BFPPs for Liquibase 
See gh-27348
 2021-07-15 20:18:27 +01:00
Andy Wilkinson c8c784bd5c Allow @SpyBean to be used to spy on a Spring Data repository 
Fixes gh-7033
 2021-07-15 19:44:52 +01:00
Andy Wilkinson 62695f76f7 Provide complete dependency management for Prometheus's Pushgateway 
Fixes gh-27349
 2021-07-15 19:26:25 +01:00
Andy Wilkinson d4159130a5 Merge branch '2.4.x' into 2.5.x 
Closes gh-27346
 2021-07-15 11:50:51 +01:00
Andy Wilkinson 7a23a12ce0 Fix configprops endpoint's handling of config tree values 
Fixes gh-27327
 2021-07-15 11:50:40 +01:00
Stephane Nicoll 39626fa4e7 Upgrade to Spring HATEOAS 1.3.3 
Closes gh-27184
 2021-07-15 09:00:17 +02:00
Stephane Nicoll 8268c21158 Upgrade to Micrometer 1.7.2 
Closes gh-27342
 2021-07-15 08:58:14 +02:00
Stephane Nicoll 1c69789ca4 Upgrade to Lettuce 6.1.4.RELEASE 
Closes gh-27341
 2021-07-15 08:58:12 +02:00
Stephane Nicoll 8694b67744 Upgrade to Spring HATEOAS 1.2.8 
Closes gh-27183
 2021-07-15 08:51:42 +02:00
Stephane Nicoll 52996e139e Upgrade to Micrometer 1.6.9 
Closes gh-27340
 2021-07-15 08:50:47 +02:00
Stephane Nicoll 6f949a1744 Upgrade to Lettuce 6.0.7.RELEASE 
Closes gh-27339
 2021-07-15 08:50:46 +02:00
Andy Wilkinson 9a81d2fe09 Merge branch '2.4.x' into 2.5.x 
Closes gh-27332
 2021-07-14 17:19:39 +01:00
Andy Wilkinson c005e1de9a Rename test classes to match our naming conventions 
Closes gh-27331
 2021-07-14 17:19:11 +01:00
Stephane Nicoll d8f9a20221 Add missing XSD version for layers configuration 
Closes gh-27321
 2021-07-14 14:32:08 +02:00
Stephane Nicoll 3c38e46c05 Upgrade to Spring Framework 5.3.9 
Closes gh-27163
 2021-07-14 14:15:34 +02:00
Stephane Nicoll 3511a007a2 Upgrade to Spring Framework 5.3.9 
Closes gh-27160
 2021-07-14 14:14:01 +02:00
Stephane Nicoll de3dbaf1d5 Upgrade to Kotlin Coroutines 1.5.1 
Closes gh-27317
 2021-07-14 07:34:15 +02:00
Madhura Bhave ed22e4a897 Merge branch '2.4.x' into 2.5.x 2021-07-13 15:18:40 -07:00
Madhura Bhave 23b377e1a1 Fix typo 2021-07-13 15:18:17 -07:00
Andy Wilkinson 705feeed6a Polish "Allow additional JVM args when running tests via toolchain" 
See gh-27089
 2021-07-13 15:28:04 +01:00
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain 
See gh-27089
 2021-07-13 15:24:45 +01:00
Andy Wilkinson 685b78f504 Merge branch '2.4.x' into 2.5.x 
Closes gh-27304
 2021-07-13 14:56:26 +01:00
Andy Wilkinson 49baacbc1c Polish "Mark Redis as down when cluster_state is fail" 
See gh-27300
 2021-07-13 14:56:01 +01:00
Hoan Vu Hong f31141de09 Mark Redis as down when cluster_state is fail 
See gh-27300
 2021-07-13 14:35:59 +01:00
Andy Wilkinson 7332b43a9e Merge branch '2.4.x' into 2.5.x 
Closes gh-27162
 2021-07-13 13:53:45 +01:00
Andy Wilkinson 96e58d815d Upgrade to Reactor 2020.0.9 
Closes gh-27159
 2021-07-13 13:52:00 +01:00
Andy Wilkinson 6ed7e692a9 Merge branch '2.4.x' into 2.5.x 
See gh-27163
 2021-07-13 13:13:36 +01:00
Andy Wilkinson 1341ca99db Align with Framework's deprecation of getLastModified 
See gh-27160
 2021-07-13 13:12:45 +01:00
Andy Wilkinson d9e525c326 Merge branch '2.4.x' into 2.5.x 
Closes gh-27301
 2021-07-13 12:18:07 +01:00
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics 
Closes gh-27299
 2021-07-13 12:06:28 +01:00
Stephane Nicoll 895a2ed013 Upgrade to Postgresql 42.2.23 
Closes gh-27244
 2021-07-11 08:12:08 +02:00
Stephane Nicoll bed528f203 Upgrade to jOOQ 3.14.12 
Closes gh-27243
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 5811b22554 Upgrade to Johnzon 1.2.14 
Closes gh-27242
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 3c6db2bc28 Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27241
 2021-07-11 08:12:06 +02:00
Stephane Nicoll 58b03ac56f Upgrade to Jetty Reactive HTTPClient 1.1.10 
Closes gh-27240
 2021-07-11 08:12:05 +02:00
Stephane Nicoll 88e0916ad6 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27239
 2021-07-11 08:12:04 +02:00
Stephane Nicoll 2d671021d9 Upgrade to AspectJ 1.9.7 
Closes gh-27238
 2021-07-11 08:12:02 +02:00
dreis2211 dacfe27350 Fix tests for multi-release JARs on JDK 17 
See gh-27229
 2021-07-10 17:38:16 +02:00
Andy Wilkinson 1cd3a54e88 Rework Quartz DB init dependencies to use a detector 
Closes gh-27222
 2021-07-09 15:02:15 +01:00
Andy Wilkinson 3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init 
Fixes gh-27220
 2021-07-09 14:17:23 +01:00
Andy Wilkinson f008228f1a Polish "Detect JobRepository as depending on DB init" 
See gh-27221
 2021-07-09 12:36:30 +01:00
Henning Pöttker cf69785393 Detect JobRepository as depending on DB init 
See gh-27221
 2021-07-09 12:36:19 +01:00
Andy Wilkinson 94f94f30f5 Polish "Detect AbstractDataSourceInitializers as DB initializers" 
See gh-27215
 2021-07-09 12:05:56 +01:00
Henning Pöttker 433f3d6bc4 Detect AbstractDataSourceInitializers as DB initializers 
See gh-27215
 2021-07-09 12:04:17 +01:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed 
Fixes gh-27208
 2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers 
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
 2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed 
Fixes gh-27193
 2021-07-09 09:47:48 +01:00
Stephane Nicoll 25fe6a107a Fix visibility of a type exposed as a bean 
Closes gh-27189
 2021-07-09 10:40:00 +02:00
Madhura Bhave 0f70c46746 Merge branch '2.4.x' into 2.5.x 
Closes gh-27210
Closes gh-27211
 2021-07-08 13:04:48 -07:00
Madhura Bhave 42e556dd73 Handle file with name matching an optional wildcard location 
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
 2021-07-08 13:01:15 -07:00
Phillip Webb f32f4a2e3d Merge branch '2.4.x' into 2.5.x 
Closes gh-27204
 2021-07-08 11:36:25 -07:00
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key' 
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
 2021-07-08 11:29:29 -07:00
Andy Wilkinson b50cefbf8b Upgrade to Postgresql 42.2.23 
Closes gh-27202
 2021-07-08 18:44:11 +01:00
Andy Wilkinson bce7b9c711 Upgrade to jOOQ 3.14.12 
Closes gh-27201
 2021-07-08 18:44:09 +01:00
Andy Wilkinson 2c7105965d Upgrade to Johnzon 1.2.14 
Closes gh-27200
 2021-07-08 18:44:08 +01:00
Andy Wilkinson 81a68651dc Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27199
 2021-07-08 18:44:07 +01:00
Andy Wilkinson d52117014f Upgrade to Jackson Bom 2.12.4 
Closes gh-27198
 2021-07-08 18:44:06 +01:00
Andy Wilkinson c96ee0d448 Upgrade to Infinispan 12.1.6.Final 
Closes gh-27197
 2021-07-08 18:44:04 +01:00
Andy Wilkinson 958c6649f4 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27196
 2021-07-08 18:44:03 +01:00
Andy Wilkinson 4b965ac1ef Upgrade to Caffeine 2.9.2 
Closes gh-27195
 2021-07-08 18:44:02 +01:00
Andy Wilkinson bcbc742a0e Upgrade to AspectJ 1.9.7 
Closes gh-27194
 2021-07-08 18:44:00 +01:00
dreis2211 00d3330c9a Avoid illegal reflective access on ZipEntry.xdostime 
See gh-27100
 2021-07-08 18:05:16 +01:00
Andy Wilkinson ff79787def Avoid using deprecated API to get Kotlin Plugin's version 
Closes gh-27090
 2021-07-08 10:45:09 +01:00
Andy Wilkinson 283b4a6ed2 Improve error message for non-options-capable ConnectionFactory 
Fixes gh-26977
 2021-07-08 09:17:55 +01:00
Stephane Nicoll 7eb6cf71f6 Start building against Spring Integration 5.5.2 snapshots 
See gh-27166
 2021-07-08 08:52:18 +02:00
Stephane Nicoll e426ff6196 Start building against Spring Kafka 2.7.4 snapshots 
See gh-27165
 2021-07-08 08:51:55 +02:00
Stephane Nicoll 745b79714f Start building against Spring Data 2021.0.3 snapshots 
See gh-27164
 2021-07-08 08:51:29 +02:00
Stephane Nicoll 36f5d6762b Start building against Spring HATEOAS 1.3.3 snapshots 
See gh-27184
 2021-07-08 08:51:04 +02:00
Stephane Nicoll 3119179c62 Start building against Spring Framework 5.3.9 snapshots 
See gh-27163
 2021-07-08 08:50:32 +02:00
Stephane Nicoll 74a0354bf1 Start building against Reactor 2020.0.9 snapshots 
See gh-27162
 2021-07-08 08:50:06 +02:00