root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
35,384 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

15509 Commits

Author SHA1 Message Date
davidh44 b658013a97 Create EndpointWebExtension only if necessary 
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.

See gh-28475
 2021-11-16 08:15:19 +01:00
Stephane Nicoll a4c5f07391 Upgrade to Spring Kafka 2.8.0 
Closes gh-28519
 2021-11-15 19:58:47 +01:00
Stephane Nicoll d058af5be2 Upgrade to Spring AMQP 2.4.0 
Closes gh-28518
 2021-11-15 19:58:29 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9 
Closes gh-28539
 2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12 
Closes gh-28600
 2021-11-15 19:57:15 +01:00
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics 
Fixes gh-28535
 2021-11-15 12:24:50 -06:00
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique 
Fixes gh-28536
 2021-11-15 12:23:25 -06:00
Andy Wilkinson a1e7375fc0 Polish 2021-11-15 13:03:10 +00:00
Andy Wilkinson 2d7e0314f3 Merge branch '2.5.x' 
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
 2021-11-15 12:51:43 +00:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3 
Closes gh-28679
 2021-11-15 12:47:51 +00:00
Andy Wilkinson b1ff60c728 Merge branch '2.5.x' 
Closes gh-28681
 2021-11-15 12:09:06 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x 
Closes gh-28680
 2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc 
See gh-28677
 2021-11-15 12:07:22 +00:00
Filip Hrisafov d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available 
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
 2021-11-15 09:59:20 +01:00
Stephane Nicoll 6e06e69bba Merge branch '2.5.x' 
Closes gh-28673
 2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition 
See gh-28532
 2021-11-14 08:19:43 +01:00
Stephane Nicoll 854d8723cc Upgrade to Spring Data 2021.1.0 
Closes gh-28517
 2021-11-13 16:22:40 +01:00
Stephane Nicoll 818abdc70d Upgrade to Spring HATEOAS 1.4.0 
Closes gh-28610
 2021-11-13 16:22:05 +01:00
Stephane Nicoll 113a7bd525 Upgrade to Neo4j Java Driver 4.3.6 
Closes gh-28667
 2021-11-13 16:21:43 +01:00
Stephane Nicoll 83151a3a72 Upgrade to MongoDB 4.4.0 
Closes gh-28666
 2021-11-13 16:21:42 +01:00
Stephane Nicoll 7f3cff062d Upgrade to Elasticsearch 7.15.2 
Closes gh-28665
 2021-11-13 16:21:40 +01:00
Stephane Nicoll e638ded7e9 Upgrade to Couchbase Client 3.2.3 
Closes gh-28664
 2021-11-13 16:21:39 +01:00
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7 
Closes gh-28512
 2021-11-13 16:17:57 +01:00
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6 
Closes gh-28609
 2021-11-13 16:17:35 +01:00
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15 
Closes gh-28508
 2021-11-13 16:16:51 +01:00
Stephane Nicoll f3e2a40424 Upgrade to Spring HATEOAS 1.2.11 
Closes gh-28608
 2021-11-13 16:16:17 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x' 
Closes gh-28662
 2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson 3ba8184cb1 Merge branch '2.5.x' 
Closes gh-28660
 2021-11-12 20:04:09 +00:00
Andy Wilkinson ef02db9ed1 Merge branch '2.4.x' into 2.5.x 
Closes gh-28659
 2021-11-12 20:03:53 +00:00
Andy Wilkinson 0889cdd516 Add dependency management for Glassfish JSTL 
To be used in place of javax.servlet:jstl

Closes gh-28657
 2021-11-12 20:03:15 +00:00
Stephane Nicoll 303dd4cfe0 Upgrade to Micrometer 1.8.0 
Closes gh-28516
 2021-11-12 10:14:04 +01:00
Andy Wilkinson 5f1103f381 Add missing @Deprecated annotation 
Closes gh-28602
 2021-11-11 12:03:33 +00:00
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 6fa523ed6f Start building against Spring HATEOAS 1.4.0 snapshots 
See gh-28610
 2021-11-11 10:01:37 +00:00
Andy Wilkinson 1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots 
See gh-28609
 2021-11-11 10:00:37 +00:00
Andy Wilkinson ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots 
See gh-28608
 2021-11-11 09:59:05 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x' 
Closes gh-28607
 2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28606
 2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI 
Closes gh-28594
 2021-11-11 09:54:50 +00:00
Stephane Nicoll 74c57bbefa Upgrade to Spring Framework 5.3.13 
Closes gh-28515
 2021-11-11 10:00:04 +01:00
Stephane Nicoll 0b808fdd3c Upgrade to Micrometer 1.7.6 
Closes gh-28511
 2021-11-11 09:59:21 +01:00
Stephane Nicoll f969b60031 Upgrade to Spring Framework 5.3.13 
Closes gh-28510
 2021-11-11 09:57:53 +01:00
Stephane Nicoll 24c578e3ad Upgrade to Micrometer 1.6.13 
Closes gh-28507
 2021-11-11 09:57:22 +01:00
Stephane Nicoll c8d9f94821 Upgrade to Spring Framework 5.3.13 
Closes gh-28506
 2021-11-11 09:56:52 +01:00
Andy Wilkinson ceacb1533a Merge branch '2.5.x' 2021-11-10 20:18:09 +00:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering 
See gh-28506
 2021-11-10 20:15:56 +00:00
Stephane Nicoll 4229039ba4 Start building against Spring AMQP 2.3.12 snapshots 
See gh-28600
 2021-11-10 19:51:53 +01:00
Stephane Nicoll 85e06438e3 Start building against Spring AMQP 2.3.12 snapshots 
See gh-28599
 2021-11-10 19:50:24 +01:00
Leo Li 508841b444 Replace "e.g." by "for example" 
See gh-28583
 2021-11-09 19:50:11 +01:00
Stephane Nicoll 07e3c1f565 Upgrade to Reactor 2020.0.13 
Closes gh-28514
 2021-11-09 19:44:32 +01:00
Stephane Nicoll e5b168a227 Upgrade to Reactor 2020.0.13 
Closes gh-28505
 2021-11-09 19:43:48 +01:00
Stephane Nicoll ab1748f06f Upgrade to Reactor 2020.0.13 
Closes gh-28505
 2021-11-09 19:42:57 +01:00
Stephane Nicoll c27a77341e Upgrade to Postgresql 42.3.1 
Closes gh-28581
 2021-11-09 08:51:40 +01:00
Stephane Nicoll 5c86823548 Upgrade to Netty tcNative 2.0.45.Final 
Closes gh-28580
 2021-11-09 08:51:40 +01:00
Stephane Nicoll ac1f85011b Upgrade to Netty 4.1.70.Final 
Closes gh-28579
 2021-11-09 08:51:40 +01:00
Stephane Nicoll 5442b36982 Upgrade to Neo4j Java Driver 4.3.5 
Closes gh-28578
 2021-11-09 08:51:39 +01:00
Stephane Nicoll 653c3424f3 Upgrade to Johnzon 1.2.15 
Closes gh-28576
 2021-11-09 08:51:39 +01:00
Stephane Nicoll b33a99ce15 Upgrade to HttpClient5 5.1.1 
Closes gh-28575
 2021-11-09 08:51:39 +01:00
Stephane Nicoll e7e7158ab8 Upgrade to Hibernate 5.6.1.Final 
Closes gh-28574
 2021-11-09 08:51:39 +01:00
Stephane Nicoll 179b9136ad Upgrade to Gson 2.8.9 
Closes gh-28573
 2021-11-09 08:51:38 +01:00
Stephane Nicoll 629e1d3ac5 Upgrade to Flyway 8.0.3 
Closes gh-28572
 2021-11-09 08:51:38 +01:00
Stephane Nicoll bbb9a0df12 Upgrade to Byte Buddy 1.11.22 
Closes gh-28571
 2021-11-09 07:29:33 +01:00
Stephane Nicoll 4a88a5fb07 Upgrade to Awaitility 4.1.1 
Closes gh-28570
 2021-11-09 07:29:32 +01:00
Stephane Nicoll 21c5f46182 Upgrade to AppEngine SDK 1.9.92 
Closes gh-28569
 2021-11-09 07:29:31 +01:00
Jay Bryant 3422b1f38b Replace "refer to" with "see" 
Update documentation to replace "refer to" with "see" and to drop
"please" when it is present.

See gh-28537
 2021-11-08 14:40:57 -08:00
Jay Bryant 9f2c8f65ee Replace "check out" with more formal language 
Update documentation to use more formal language rather than
"check out".

See gh-28503
 2021-11-08 14:36:32 -08:00
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation" 
See gh-28497
 2021-11-08 13:27:24 -08:00
Jay Bryant 0d025b672e Remove 'etc' in reference documentation 
Update the reference documentation to replace 'etc' with 'other'.

See gh-28497
 2021-11-08 13:24:33 -08:00
Phillip Webb d8629fc63d Merge branch '2.5.x' 2021-11-08 13:14:52 -08:00
Phillip Webb ddd38a7ac3 Merge branch '2.4.x' into 2.5.x 2021-11-08 13:14:35 -08:00
Phillip Webb 75bf430eb1 Polish ImportsContextCustomizerTests 
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
 2021-11-08 13:13:04 -08:00
Phillip Webb 0a6991e744 Merge branch '2.5.x' 
Closes gh-28566
 2021-11-08 13:11:03 -08:00
Phillip Webb 6406ee5609 Merge branch '2.4.x' into 2.5.x 
Closes gh-28565
 2021-11-08 13:08:52 -08:00
Phillip Webb 8a14e1e2e9 Polish 'Ignore JUnit annotations when caching test contexts' 
See gh-28563
 2021-11-08 13:07:26 -08:00
Loïc Ledoyen 23876d8a32 Ignore JUnit annotations when caching test contexts 
Update `ImportsContextCustomizer` to ignore JUnit annotations.

See gh-28563
 2021-11-08 13:06:23 -08:00
Stephane Nicoll 59151616eb Switch bomr policy to same-minor-version 2021-11-08 09:37:38 +01:00
Stephane Nicoll f37406f7b1 Upgrade to Netty tcNative 2.0.45.Final 
Closes gh-28561
 2021-11-08 08:59:23 +01:00
Stephane Nicoll 4c8dbd7469 Upgrade to Netty 4.1.70.Final 
Closes gh-28560
 2021-11-08 08:59:22 +01:00
Stephane Nicoll 92193caff6 Upgrade to Johnzon 1.2.15 
Closes gh-28559
 2021-11-08 08:59:21 +01:00
Stephane Nicoll 019971f375 Upgrade to Hazelcast 4.1.6 
Closes gh-28558
 2021-11-08 08:59:20 +01:00
Stephane Nicoll 388f8a33a5 Upgrade to Gson 2.8.9 
Closes gh-28557
 2021-11-08 08:59:19 +01:00
Stephane Nicoll c8a1734e0f Upgrade to AppEngine SDK 1.9.92 
Closes gh-28556
 2021-11-08 08:59:18 +01:00
Stephane Nicoll e802d6b102 Upgrade to Netty tcNative 2.0.45.Final 
Closes gh-28555
 2021-11-08 08:32:07 +01:00
Stephane Nicoll c14b07717c Upgrade to Netty 4.1.70.Final 
Closes gh-28554
 2021-11-08 08:32:05 +01:00
Stephane Nicoll e06bb693f8 Upgrade to Johnzon 1.2.15 
Closes gh-28553
 2021-11-08 08:32:04 +01:00
Stephane Nicoll 2584463fed Upgrade to Gson 2.8.9 
Closes gh-28552
 2021-11-08 08:32:03 +01:00
Stephane Nicoll c5830b083c Upgrade to AppEngine SDK 1.9.92 
Closes gh-28551
 2021-11-08 08:32:02 +01:00
Stephane Nicoll 98d3e99ac9 Merge branch '2.5.x' 
Closes gh-28550
 2021-11-08 08:29:56 +01:00
Stephane Nicoll 91f7ff3ba3 Merge branch '2.4.x' into 2.5.x 
Closes gh-28549
 2021-11-08 08:29:43 +01:00
Stephane Nicoll 188278ae4a Polish "Fix typo" 
See gh-28548
 2021-11-08 08:29:11 +01:00
slowjoe007 5a121197fc Fix typo 
See gh-28548
 2021-11-08 08:28:28 +01:00
Stephane Nicoll c05223d9c8 Merge branch '2.5.x' 
Closes gh-28545
 2021-11-06 12:06:14 +01:00
Stephane Nicoll 4304eea319 Polish contribution 
See gh-28531
 2021-11-06 12:03:22 +01:00
dreis2211 7d594aa301 Avoid duplicate AOP proxy class definition with FilteredClassLoader 
See gh-28531
 2021-11-06 11:58:28 +01:00
Stephane Nicoll bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure 
Closes gh-28540
 2021-11-05 14:20:37 +01:00
Stephane Nicoll 11a5055b8f Merge branch '2.5.x' 2021-11-05 13:45:01 +01:00
Stephane Nicoll cd5508a679 Polish 2021-11-05 13:43:38 +01:00
Stephane Nicoll 86bb8de815 Start building against Spring Batch 4.3.4 snapshots 
See gh-28261
 2021-11-05 13:37:30 +01:00
Stephane Nicoll 1c68a3460d Start building against Spring Session 2021.1.0 snapshots 
See gh-28522
 2021-11-05 13:37:30 +01:00
Stephane Nicoll 1ae4691a98 Start building against Spring Integration 5.5.6 snapshots 
See gh-28521
 2021-11-05 13:37:30 +01:00
Stephane Nicoll c618e7c279 Start building against Spring Security 5.6.0 snapshots 
See gh-28520
 2021-11-05 13:37:30 +01:00
Stephane Nicoll 94a99c1167 Start building against Spring Kafka 2.8.0 snapshots 
See gh-28519
 2021-11-05 13:37:29 +01:00
Stephane Nicoll a5a33fc4bf Start building against Spring AMQP 2.4.0 snapshots 
See gh-28518
 2021-11-05 13:37:29 +01:00
Stephane Nicoll 7eb1acb5e1 Start building against Spring Data 2021.1.0 snapshots 
See gh-28517
 2021-11-05 13:37:29 +01:00
Stephane Nicoll 9dd4c8588d Start building against Micrometer 1.8.0 snapshots 
See gh-28516
 2021-11-05 13:37:29 +01:00
Stephane Nicoll 98b9e1ab21 Start building against Spring Framework 5.3.13 snapshots 
See gh-28515
 2021-11-05 13:37:29 +01:00
Stephane Nicoll 71151c27e7 Start building against Reactor 2020.0.13 snapshots 
See gh-28514
 2021-11-05 11:08:55 +01:00
Stephane Nicoll 79c9d21926 Start building against Spring Batch 4.3.4 snapshots 
See gh-28250
 2021-11-05 10:44:30 +01:00
Stephane Nicoll 45deb1ac56 Start building against Spring Kafka 2.7.9 snapshots 
See gh-28539
 2021-11-05 10:43:59 +01:00
Stephane Nicoll 6984d80389 Start building against Spring Integration 5.5.6 snapshots 
See gh-28513
 2021-11-05 10:43:28 +01:00
Stephane Nicoll b9e1bf6b1a Start building against Spring Data 2021.0.7 snapshots 
See gh-28512
 2021-11-05 10:43:00 +01:00
Stephane Nicoll d36c0f21b3 Start building against Micrometer 1.7.6 snapshots 
See gh-28511
 2021-11-05 10:42:34 +01:00
Stephane Nicoll 71fb6ef9e1 Start building against Spring Framework 5.3.13 snapshots 
See gh-28510
 2021-11-05 10:42:04 +01:00
Stephane Nicoll 8426fd9488 Start building against Reactor 2020.0.13 snapshots 
See gh-28509
 2021-11-05 10:41:39 +01:00
Stephane Nicoll 190d39a4f9 Start building against Spring Batch 4.3.4 snapshots 
See gh-28230
 2021-11-05 10:06:58 +01:00
Stephane Nicoll 5c995a2d9b Start building against Spring Data 2020.0.15 snapshots 
See gh-28508
 2021-11-05 10:06:27 +01:00
Stephane Nicoll 176496bd18 Start building against Micrometer 1.6.13 snapshots 
See gh-28507
 2021-11-05 10:05:38 +01:00
Stephane Nicoll 7ae68b6ccc Start building against Spring Framework 5.3.13 snapshots 
See gh-28506
 2021-11-05 10:05:11 +01:00
Stephane Nicoll d887e438eb Start building against Reactor 2020.0.13 snapshots 
See gh-28505
 2021-11-05 10:04:46 +01:00
Stephane Nicoll fbe614a61b Fix bean type visibility 
See gh-28437
 2021-11-02 14:41:32 +01:00
Stephane Nicoll 2be0161f9a Fix bean type visibility 
See gh-28437
 2021-11-02 12:35:19 +01:00
Leo Li 73e9c355f1 Polish 
See gh-28501
 2021-11-02 09:05:44 +01:00
Stephane Nicoll 7ad60df844 Merge branch '2.5.x' 2021-11-02 09:05:11 +01:00
Stephane Nicoll 06e9991e6a Polish 
See gh-28501
 2021-11-02 09:04:32 +01:00
izeye 3e1bc01839 Fix whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff() 
See gh-28492
 2021-11-01 09:00:19 +01:00
izeye 5d8dce70dc Polish 
See gh-28494
 2021-11-01 08:58:40 +01:00
Andy Wilkinson 875479abeb Merge branch '2.5.x' 
Closes gh-28490
 2021-10-29 15:52:18 +01:00
Andy Wilkinson 33249e9414 Merge branch '2.4.x' into 2.5.x 
Closes gh-28489
 2021-10-29 15:52:08 +01:00
Andy Wilkinson 12d8f942be Stop logging to the file used in the generated documentation 
Closes gh-28488
 2021-10-29 15:51:32 +01:00
Andy Wilkinson e54b876536 Merge branch '2.5.x' 
Closes gh-28487
 2021-10-29 15:50:01 +01:00
Andy Wilkinson 5e42f27b36 Merge branch '2.4.x' into 2.5.x 
Closes gh-28486
 2021-10-29 15:49:49 +01:00
Andy Wilkinson e4e1958b65 Make Logback fall back to JVM's default charset 
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.

Fixes gh-27230

[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
 2021-10-29 14:40:05 +01:00
Andy Wilkinson ef2bcdd3ed Merge branch '2.5.x' 
Closes gh-28483
 2021-10-29 11:37:43 +01:00
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x 
Closes gh-28482
 2021-10-29 11:37:33 +01:00
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default 
Closes gh-28481
 2021-10-29 11:23:35 +01:00
Andy Wilkinson c9dd6b7e86 Merge branch '2.5.x' 
Closes gh-28480
 2021-10-29 11:12:18 +01:00
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x 
Closes gh-28479
 2021-10-29 11:12:04 +01:00
Andy Wilkinson 10f0017d69 Fix method validation in child contexts 
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
 2021-10-29 10:08:57 +01:00
Andy Wilkinson 4a15a816ce Polish 'Replace "via" with words more suited to an international audience' 
See gh-28464
 2021-10-28 19:22:11 +01:00
Jay Bryant 73a18c73f4 Replace "via" with words more suited to an international audience 
See gh-28464
 2021-10-28 17:54:14 +01:00
Stephane Nicoll 9241f228d5 Add .gitattributes 
Closes gh-28474
 2021-10-28 15:31:40 +02:00
Stephane Nicoll 66553ac8c7 Add .gitattributes 
Closes gh-28473
 2021-10-28 15:27:49 +02:00
Stephane Nicoll 1b3f52d609 Harmonize line endings 
See gh-27615
 2021-10-28 15:22:57 +02:00
Andy Wilkinson 24ef4e6fb9 Merge branch '2.5.x' 
Closes gh-28471
 2021-10-28 13:07:22 +01:00
Andy Wilkinson 7fbbb4e08a Merge branch '2.4.x' into 2.5.x 
Closes gh-28470
 2021-10-28 13:07:07 +01:00
Andy Wilkinson 72f80f3ae6 Upgrade to Testcontainers 1.16.1 
Closes gh-28468
 2021-10-28 13:06:41 +01:00
Andy Wilkinson e340429a1a Merge branch '2.5.x' 
Closes gh-28469
 2021-10-28 12:50:23 +01:00
Andy Wilkinson b375f9fac0 Ignore parameters when checking if */* is accepted 
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.

This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.

Fixes gh-28446
 2021-10-28 12:27:34 +01:00
Stephane Nicoll ea8a8ecd0e Merge branch '2.5.x' 
Closes gh-28467
 2021-10-28 11:53:34 +02:00
Stephane Nicoll ce38d592f9 Merge branch '2.4.x' into 2.5.x 
Closes gh-28466
 2021-10-28 11:53:19 +02:00
Stephane Nicoll 265199f42b Polish "Fix description of "logging.logback.rollingpolicy.max-history"" 
See gh-28448
 2021-10-28 11:50:38 +02:00
Guillaume Husta a05b2207f8 Fix description of "logging.logback.rollingpolicy.max-history" 
See gh-28448
 2021-10-28 11:45:42 +02:00
Phillip Webb 9cb5f035e7 Fix typo 
See gh-20971
 2021-10-23 08:29:51 -07:00
Stephane Nicoll 837e2ac277 Fix bean type visibility 
Closes gh-28437
 2021-10-23 07:31:27 +02:00
Phillip Webb c384fbd14e Polish 'Support both kebab-case and camelCase as Spring init CLI Options' 
Refine the command so that camelCase options are supported but not
advertised.

See gh-28138
 2021-10-22 11:23:14 -07:00
vignesh1992 ad3473208f Support both kebab-case and camelCase as Spring init CLI Options 
Update `InitCommand` to support both camelCase and kebab-case.

See gh-28138
 2021-10-22 11:23:14 -07:00
Andy Wilkinson b9f0ec5df8 Merge branch '2.5.x' 
Closes gh-28443
 2021-10-22 15:48:43 +01:00
Andy Wilkinson 4d811f66ec Merge branch '2.4.x' into 2.5.x 
Closes gh-28442
 2021-10-22 15:48:28 +01:00
Andy Wilkinson 7607587b6c Stabilize liveReloadOnClassPathChanged() 
Closes gh-28441
 2021-10-22 15:47:51 +01:00
Andy Wilkinson 3605388787 Merge branch '2.5.x' 
Closes gh-28440
 2021-10-22 15:24:13 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x 
Closes gh-28439
 2021-10-22 15:23:07 +01:00
Andy Wilkinson a545b6e0b4 Polish "Polish" 
See gh-28367
 2021-10-22 15:19:13 +01:00
Leo Li 1586232761 Polish 
See gh-28367
 2021-10-22 15:11:57 +01:00
Stephane Nicoll 475e9c9969 Polish "Fix classpath condition for Lettuce metrics auto-configuration" 
See gh-28436
 2021-10-22 14:49:33 +02:00
sokomishalov 1f86fe3d48 Fix classpath condition for Lettuce metrics auto-configuration 
See gh-28436
 2021-10-22 14:47:56 +02:00
Andy Wilkinson 1005159eab Merge branch '2.5.x' 
Closes gh-28435
 2021-10-22 12:30:47 +01:00
Andy Wilkinson 3fb5af9dd3 Merge branch '2.4.x' into 2.5.x 
Closes gh-28434
 2021-10-22 12:29:14 +01:00
Andy Wilkinson 8a78864edd Polish "Explain how to disable/configure the ActiveMQ embedded broker" 
See gh-28183
 2021-10-22 12:27:50 +01:00
Moritz Kammerer 0c5f0efcea Explain how to disable/configure the ActiveMQ embedded broker 
See gh-28183
 2021-10-22 12:27:37 +01:00
Stephane Nicoll 1edd1e8c20 Merge branch '2.4.x' into 2.5.x 
Closes gh-28433
 2021-10-22 11:26:54 +02:00
Stephane Nicoll 773b0f93b7 Upgrade to Commons Compress 1.21 
Closes gh-28429
 2021-10-22 11:26:22 +02:00
Andy Wilkinson 47da70632f Merge branch '2.5.x' 
Closes gh-28430
Closes gh-28431
 2021-10-22 10:12:53 +01:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages" 
See 2f6651c3cb.

Closes gh-28408
 2021-10-22 10:08:27 +01:00
Scott Frederick e84c1abb0f Prevent Docker volume name clashes in tests during parallel builds 
See gh-28292
 2021-10-21 15:07:15 -05:00
Phillip Webb e25f216eab Merge branch '2.5.x' 
Closes gh-28425
 2021-10-21 11:28:33 -07:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages 
Closes gh-28408
 2021-10-21 11:24:54 -07:00
Andy Wilkinson d52b649bd7 Fix links to Spring Security's reference documentation 
Closes gh-28407
 2021-10-21 19:11:52 +01:00
Andy Wilkinson 284725f5be Polish "Expose Stackdriver's useSemanticMetricTypes property" 
See gh-28403
 2021-10-21 17:57:23 +01:00
Jonatan Ivanov 9397121a98 Expose Stackdriver's useSemanticMetricTypes property 
See gh-28403
 2021-10-21 17:57:07 +01:00
Andy Wilkinson 4903ce1806 Merge pull request #28400 from jonatan-ivanov 
* gh-28400:
  Polish "Expose Elastic's apiKeyCredentials property"
  Expose Elastic's apiKeyCredentials property

Closes gh-28400
 2021-10-21 17:52:01 +01:00
Andy Wilkinson 8bf3780c15 Polish "Expose Elastic's apiKeyCredentials property" 
See gh-28400
 2021-10-21 17:35:32 +01:00
Jonatan Ivanov dd475a2445 Expose Elastic's apiKeyCredentials property 
See gh-28400
 2021-10-21 17:17:01 +01:00
Andy Wilkinson 2ffcda3415 Upgrade to XmlUnit2 2.8.3 
Closes gh-28422
 2021-10-21 14:50:37 +01:00
Andy Wilkinson eee699aa6e Upgrade to SendGrid 4.7.6 
Closes gh-28421
 2021-10-21 14:50:37 +01:00
Andy Wilkinson a929734f2c Upgrade to Selenium HtmlUnit 2.54.0 
Closes gh-28420
 2021-10-21 14:50:37 +01:00
Andy Wilkinson 124bf2604a Upgrade to Postgresql 42.3.0 
Closes gh-28418
 2021-10-21 14:43:24 +01:00
Andy Wilkinson 5e7c023273 Upgrade to MySQL 8.0.27 
Closes gh-28417
 2021-10-21 14:43:22 +01:00
Andy Wilkinson 733b5eee41 Upgrade to HtmlUnit 2.54.0 
Closes gh-28415
 2021-10-21 14:43:17 +01:00
Andy Wilkinson 96e9421c8e Upgrade to Flyway 8.0.2 
Closes gh-28414
 2021-10-21 14:43:16 +01:00
Andy Wilkinson cdc9d5b1fc Upgrade to Elasticsearch 7.15.1 
Closes gh-28413
 2021-10-21 14:43:14 +01:00
Andy Wilkinson b46fc940e9 Upgrade to Byte Buddy 1.11.21 
Closes gh-28412
 2021-10-21 14:43:12 +01:00
Andy Wilkinson 700f872164 Upgrade to Artemis 2.19.0 
Closes gh-28411
 2021-10-21 14:43:09 +01:00
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka 
Closes gh-28406
 2021-10-21 10:46:50 +01:00
Stephane Nicoll 6cdafc4b72 Upgrade to Spring Session 2021.0.3 
Closes gh-28248
 2021-10-21 09:13:41 +02:00
Phillip Webb 1ad39b5fce Fix ReactiveSessionAutoConfigurationRedisTests 
See gh-26714
 2021-10-21 00:10:40 -07:00
Stephane Nicoll 3abda656f0 Upgrade to Spring Session 2020.0.7 
Closes gh-28229
 2021-10-21 09:00:26 +02:00
Stephane Nicoll 1b2a1fa685 Upgrade to Spring Session 2021.1.0-RC1 
Closes gh-28260
 2021-10-21 08:55:16 +02:00
Stephane Nicoll b9fe9e12aa Upgrade to Spring Framework 5.3.12 
Closes gh-28252
 2021-10-21 08:54:54 +02:00
Stephane Nicoll d80d692029 Upgrade to Spring Framework 5.3.12 
Closes gh-28241
 2021-10-21 08:53:57 +02:00
Stephane Nicoll 91524ccc95 Upgrade to Spring Framework 5.3.12 
Closes gh-28223
 2021-10-21 08:53:23 +02:00
Phillip Webb ec79f14639 Drop AbstractJettyServletWebServerFactoryTests 
Drop `AbstractJettyServletWebServerFactoryTests` and merge the existing
code into `JettyServletWebServerFactoryTests`.
 2021-10-20 22:58:46 -07:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers 
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-10-20 22:58:31 -07:00
Phillip Webb b72ff25220 Relocate and unify reactive cookie properties 
Relocate the recently introduced `spring.webflux.session` properties
to `server.reactive.session` and create a unified `Cookie` properties
class.

Reactive session properties now mirror the existing
`server.servlet.session` properties and better reflect the fact that
they are related to the server and not just for WebFlux.

See gh-26714
 2021-10-20 22:09:33 -07:00
Phillip Webb 3c71637fa2 Polish 'Add more session properties for reactive web servers' 
See gh-26714
 2021-10-20 22:09:30 -07:00
weixsun a2a802a14a Add more session properties for reactive web servers 
Expand the session properties supported by reactive web servers to
include `timeout` support and additional `cookie` properties.

See gh-26714
 2021-10-20 22:09:21 -07:00
Phillip Webb 3729c4909a Polish package name for web sample code 
See gh-27132
 2021-10-20 21:31:41 -07:00
Madhura Bhave ea65c28bfa Polish 2021-10-20 19:45:46 -07:00
Madhura Bhave 07aeb2156d Merge pull request #28123 from timtebeek 
* pr/28123:
  Polish "Support PEM format for Kafka SSL certs and private key"
  Support PEM format for Kafka SSL certs and private key

Closes gh-28123
 2021-10-20 19:38:11 -07:00
Madhura Bhave 0d06a2854d Polish "Support PEM format for Kafka SSL certs and private key" 
See gh-28123
 2021-10-20 17:10:49 -07:00
Tim te Beek 7a98364a23 Support PEM format for Kafka SSL certs and private key 
See gh-28123
 2021-10-20 17:10:13 -07:00
Andy Wilkinson 56b8494f15 Disable the env info contributor by default 
Closes gh-28311
 2021-10-20 12:42:17 +01:00
Andy Wilkinson f98c1e7231 Disable the java info contributor by default 
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
 2021-10-20 12:18:54 +01:00
Andy Wilkinson f2b3f1f41f Make URL- and property-based pooling config mutually exclusive 
Closes gh-28144
 2021-10-20 11:22:05 +01:00
Stephane Nicoll 7328f609c2 Upgrade to XmlUnit2 2.8.3 
Closes gh-28397
 2021-10-20 09:26:11 +02:00
Stephane Nicoll 8d3e67e561 Upgrade to SendGrid 4.7.6 
Closes gh-28396
 2021-10-20 09:26:10 +02:00
Stephane Nicoll 80e3c9a9cc Upgrade to MySQL 8.0.27 
Closes gh-28395
 2021-10-20 09:26:09 +02:00
Stephane Nicoll cae0b50393 Upgrade to Ehcache3 3.9.7 
Closes gh-28394
 2021-10-20 09:26:07 +02:00
Stephane Nicoll 3d2091136a Upgrade to Nimbus JOSE JWT 8.23 
Closes gh-28392
 2021-10-20 08:47:14 +02:00
Stephane Nicoll 3e6da7ee2b Upgrade to MySQL 8.0.27 
Closes gh-28391
 2021-10-20 08:47:13 +02:00
Stephane Nicoll 5865246920 Upgrade to Ehcache3 3.9.7 
Closes gh-28390
 2021-10-20 08:47:12 +02:00
Stephane Nicoll 9b1660a111 Upgrade to Spring Integration 5.5.5 
Closes gh-28249
 2021-10-20 08:43:36 +02:00
Stephane Nicoll 052726f5d9 Upgrade to Spring Integration 5.5.5 
Closes gh-28259
 2021-10-20 08:43:03 +02:00
Madhura Bhave 40a3824279 Reinstate ConditionalOnBean 
See gh-28131
 2021-10-19 21:23:48 -07:00
Madhura Bhave b7521e2fda Auto-configure health web components only if endpoint is exposed over HTTP 
Fixes gh-28131

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-10-19 20:26:44 -07:00
Scott Frederick 871468931f Polish "Add option to customize cache volume names when building an image" 
See gh-28292
 2021-10-19 15:38:12 -05:00
Julian Liebig dc36346285 Add option to customize cache volume names when building an image 
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the names of build and launch cache volumes provided
to the CNB builder.

See gh-28292
 2021-10-19 15:38:12 -05:00
Andy Wilkinson 9d6a0cfd24 Starting building against Spring Framework 5.3.12 snapshots 
This reverts commit 3969e63ced, reversing
changes made to f01d086a8d.

Closes gh-28385
See gh-28252
 2021-10-19 18:43:53 +01:00
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots 
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
 2021-10-19 18:41:23 +01:00
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots 
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
 2021-10-19 17:50:59 +01:00
Andy Wilkinson 6c43914652 Merge branch '2.5.x' 
Closes gh-28383
 2021-10-19 17:43:40 +01:00
Andy Wilkinson 76272ffb62 Merge branch '2.4.x' into 2.5.x 
Closes gh-28382
 2021-10-19 17:43:30 +01:00
Andy Wilkinson 54ce51e43c Polish "Fix typos in EnvironmentPostProcessor javadoc" 
See gh-28376
 2021-10-19 17:43:16 +01:00
fml2 ded396b728 Fix typos in EnvironmentPostProcessor javadoc 
See gh-28376
 2021-10-19 17:41:46 +01:00
Andy Wilkinson 356554311f Merge branch '2.5.x' 
Closes gh-28381
 2021-10-19 17:17:29 +01:00
Artem Bilan 344d008848 Remove redundant info about DefaultMetricsFactory 
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
 2021-10-19 16:55:51 +01:00
Andy Wilkinson 9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean" 
See gh-28361
 2021-10-19 16:30:06 +01:00
Bartosz Jaszczak 31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean 
See gh-28361
 2021-10-19 16:19:12 +01:00
Andy Wilkinson 791f3f57c6 Upgrade to Spring Kafka 2.8.0-RC1 
Closes gh-28257
 2021-10-19 14:45:44 +01:00
Andy Wilkinson ab3396de26 Upgrade to Spring Security 5.5.3 
Closes gh-28247
 2021-10-19 14:35:22 +01:00
Andy Wilkinson d767e0e1f1 Upgrade to Spring Kafka 2.7.8 
Closes gh-28246
 2021-10-19 14:34:39 +01:00
Andy Wilkinson ce8671ff37 Upgrade to Spring Security 5.4.9 
Closes gh-28228
 2021-10-19 14:32:57 +01:00
Andy Wilkinson 669caa92f8 Upgrade to Spring Kafka 2.6.11 
Closes gh-28227
 2021-10-19 14:32:33 +01:00
Andy Wilkinson a27dfcb9b0 Make R2DBC auto-config back off without a connection provider 
Closes gh-26439
 2021-10-19 14:18:34 +01:00
Andy Wilkinson 2af2a02fbb Merge branch '2.5.x' 
Closes gh-28380
 2021-10-19 14:18:12 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x 
Closes gh-28379
 2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC 
Fixes gh-28378
 2021-10-19 13:52:45 +01:00
Andy Wilkinson 8ac2a59000 Upgrade to Spring Security 5.6.0-RC1 
Closes gh-28258
 2021-10-19 11:18:41 +01:00
Andy Wilkinson 657eb86dad Polish "Add a config prop to enable/disable SI's default logging" 
See gh-28355
 2021-10-19 11:04:32 +01:00
Artem Bilan c6891c5184 Add a config prop to enable/disable SI's default logging 
See gh-28355
 2021-10-19 11:04:32 +01:00
Andy Wilkinson 14fb9c437d Merge branch '2.5.x' 
See gh-28377
 2021-10-19 11:03:51 +01:00
Andy Wilkinson bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration 
See gh-28345
 2021-10-19 11:03:20 +01:00
Andy Wilkinson 89b40e1e00 Add support for Log4j2's composite configuration 
Closes gh-27110
 2021-10-19 10:01:30 +01:00
Phillip Webb 04123e0a0e Merge branch '2.5.x' 
Closes gh-28377
 2021-10-18 21:47:07 -07:00
Phillip Webb b93a629dbe Shutdown in-memory R2DBC databases before devtools restart 
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
 2021-10-18 21:46:12 -07:00
Phillip Webb 19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson 9ff17edb78 Upgrade to Spring Data 2021.1.0-RC1 
Closes gh-28255
 2021-10-18 19:17:20 +01:00
Andy Wilkinson 43a10eab59 Upgrade to Spring AMQP 2.4.0-RC1 
Closes gh-28256
 2021-10-18 19:15:37 +01:00
Andy Wilkinson f87b2478d5 Upgrade to Spring AMQP 2.3.11 
Closes gh-28245
 2021-10-18 19:14:28 +01:00
Andy Wilkinson 754b52c6bc Upgrade to Spring AMQP 2.3.11 
Closes gh-28226
 2021-10-18 19:12:19 +01:00
Andy Wilkinson 31d88c3d3c Improve failure analysis action when circular references are allowed 
Closes gh-27735
 2021-10-18 16:02:13 +01:00
Andy Wilkinson 42ef97b9ec Merge branch '2.5.x' 
Closes gh-28372
 2021-10-18 15:07:16 +01:00
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x 
Closes gh-28371
 2021-10-18 15:06:58 +01:00
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled 
Closes gh-28335
 2021-10-18 13:37:45 +01:00
Andy Wilkinson a722fe46fb Upgrade to Spring Data 2020.0.14 
Closes gh-28225
 2021-10-18 13:32:15 +01:00
Andy Wilkinson 779439311d Revert "Upgrade to Spring Data 2020.0.14" 
This reverts commit 752789d3ee.

See gh-28225
 2021-10-18 12:59:20 +01:00
Andy Wilkinson c39e9fa918 Revert "Start building against Spring Batch 4.3.4 snapshots" 
This reverts commit fda26703b2.

See gh-28261
 2021-10-18 12:32:37 +01:00
Andy Wilkinson c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots" 
This reverts commit c0605ffc71.

See gh-28250
 2021-10-18 12:31:23 +01:00
Andy Wilkinson 22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots" 
This reverts commit 33ffae8e74.

See gh-28230
 2021-10-18 12:30:20 +01:00
Andy Wilkinson 16dbdc5d88 Upgrade to Spring Data 2021.0.6 
Closes gh-28244
 2021-10-18 12:28:20 +01:00
Andy Wilkinson 752789d3ee Upgrade to Spring Data 2020.0.14 
Closes gh-28225
 2021-10-18 12:26:24 +01:00
Andy Wilkinson 3969e63ced Merge branch '2.5.x' 
See gh-28252
 2021-10-18 10:37:09 +01:00
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x 
See gh-28241
 2021-10-18 10:23:31 +01:00
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC 
See gh-28223
 2021-10-18 10:15:53 +01:00
Stephane Nicoll f01d086a8d Upgrade to MongoDB 4.4.0-beta1 
Closes gh-28364
 2021-10-15 18:03:51 +02:00
Stephane Nicoll 302d616b8c Upgrade to Ehcache3 3.9.7 
Closes gh-28363
 2021-10-15 18:03:49 +02:00
Stephane Nicoll a445304584 Upgrade to Netty 4.1.69.Final 
Closes gh-28360
 2021-10-15 11:36:47 +02:00
Stephane Nicoll bad37f9e37 Upgrade to Netty 4.1.69.Final 
Closes gh-28359
 2021-10-15 11:30:53 +02:00
Stephane Nicoll a312dd5905 Upgrade to Spring HATEOAS 1.4.0-RC1 
Closes gh-28254
 2021-10-15 10:08:27 +02:00
Stephane Nicoll ad819f6085 Upgrade to Micrometer 1.8.0-RC1 
Closes gh-28253
 2021-10-15 10:08:01 +02:00
Stephane Nicoll 1a1d074f5b Upgrade to Spring HATEOAS 1.3.5 
Closes gh-28243
 2021-10-15 10:07:02 +02:00
Stephane Nicoll e3a2d42a96 Upgrade to Micrometer 1.7.5 
Closes gh-28242
 2021-10-15 10:06:33 +02:00
Stephane Nicoll c743442a78 Upgrade to Spring HATEOAS 1.2.10 
Closes gh-28358
 2021-10-15 09:58:05 +02:00
Stephane Nicoll a569786b79 Upgrade to Micrometer 1.6.12 
Closes gh-28224
 2021-10-15 09:57:29 +02:00
Phillip Webb bcef8ee4c9 Merge branch '2.5.x' 
Closes gh-28357
 2021-10-14 21:49:06 -07:00
Phillip Webb a93304c973 Merge branch '2.4.x' into 2.5.x 
Closes gh-28356
 2021-10-14 21:48:53 -07:00
Phillip Webb 7388f2b60b Attempt to reduce JarFileWrapper heap consumption 
Update `JarURLConnection` to use a single shared wrapper per
jar file rather than creating a new one each time. This update
should help to reduce GC pressure.

Fixes gh-28042
 2021-10-14 21:48:01 -07:00
Phillip Webb 66aa713b85 Merge branch '2.5.x' 2021-10-14 17:41:06 -07:00
Phillip Webb 467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb 8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion 
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
 2021-10-14 17:38:05 -07:00
Phillip Webb 670d1672de Revert "Remove unnecessary bind-api dependency from test starter" 
This reverts commit 9867651024.

See gh-28085
 2021-10-14 14:26:02 -07:00
Phillip Webb 37426df148 Merge branch '2.5.x' 
Closes gh-28354
 2021-10-14 12:25:38 -07:00
Phillip Webb cf8a1b8b04 Merge branch '2.4.x' into 2.5.x 
Closes gh-28353
 2021-10-14 12:24:04 -07:00
Phillip Webb b68b3737d7 Sanitize flattened VCAP_SERVICES properties 
Update `Sanitizer` to also include flattened `vcap.services.*`
properties.

Fixes gh-28085
 2021-10-14 12:22:57 -07:00
Phillip Webb 8c748cd01f Merge branch '2.5.x' 
Closes gh-28352
 2021-10-14 12:16:48 -07:00
Phillip Webb aeadb0ceb6 Merge branch '2.4.x' into 2.5.x 
Closes gh-28351
 2021-10-14 12:16:38 -07:00
Andy Wilkinson 540468b2f0 Fix parsing of day duration meter values 
Switch `MeterValue` parsing logic so that we try `Duration` before
`double`. Prior to this commit, the value `1d` would result in `1.0`
rather than "1 day".

Fixes gh-28302
 2021-10-14 12:13:39 -07:00
Phillip Webb 8c3815d4c8 Merge branch '2.5.x' 
Closes gh-28350
 2021-10-14 12:05:42 -07:00
Phillip Webb a9df8c3ef4 Merge branch '2.4.x' into 2.5.x 
Closes gh-28349
 2021-10-14 12:05:22 -07:00
Martin Vietz 9867651024 Remove unnecessary bind-api dependency from test starter 
See gh-28344
 2021-10-14 12:02:57 -07:00
Phillip Webb 4da7d2a6a7 Merge branch '2.5.x' 
Closes gh-28348
 2021-10-14 11:27:35 -07:00
Phillip Webb 2430d8a41a Merge branch '2.4.x' into 2.5.x 
Closes gh-28347
 2021-10-14 11:27:17 -07:00
Phillip Webb 4dc5142128 Prevent cache from consuming too much memory 
Change the cache in `CachingOperationInvoker` to be a reference based
map and also clean stale entries when a specific threshold is met.

Fixes gh-28313
 2021-10-14 11:23:56 -07:00
Andy Wilkinson 05aab86275 Merge branch '2.5.x' 
Closes gh-28341
 2021-10-14 14:16:16 +01:00
Andy Wilkinson 865615e099 Merge branch '2.4.x' into 2.5.x 
Closes gh-28340
 2021-10-14 14:10:33 +01:00
Andy Wilkinson ce1a1415ab Use official Jakarta Management API dependency in ActiveMQ starter 
Fixes gh-28339
 2021-10-14 14:10:18 +01:00
Andy Wilkinson 2d837a6eae Merge branch '2.5.x' 
Closes gh-28337
 2021-10-14 13:48:08 +01:00
Andy Wilkinson 3800f060b5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28336
 2021-10-14 13:42:54 +01:00
Andy Wilkinson 2fb8c8d27e Check starters for unnecessary exclusions 
Closes gh-28332
 2021-10-14 13:37:53 +01:00
Stephane Nicoll 5623d1ecd4 Upgrade to Spring Framework 5.3.11 
Closes gh-28252
 2021-10-14 14:21:54 +02:00
Stephane Nicoll 0dcdabed9e Upgrade to Spring Framework 5.3.11 
Closes gh-28241
 2021-10-14 14:20:06 +02:00
Stephane Nicoll 26d0afc205 Upgrade to Spring Framework 5.3.11 
Closes gh-28223
 2021-10-14 14:18:54 +02:00
Andy Wilkinson a119956c66 Merge branch '2.5.x' 
Closes gh-28334
 2021-10-14 10:37:29 +01:00
Andy Wilkinson 5fd5556b1f Merge branch '2.4.x' into 2.5.x 
Closes gh-28333
 2021-10-14 10:37:16 +01:00
Martin Vietz a10db66b16 Remove unnecessary mail dependency from oauth2-client starter 
See gh-28308
 2021-10-14 10:36:16 +01:00
Andy Wilkinson 191b50241d Merge branch '2.5.x' 
Closes gh-28331
 2021-10-14 10:13:37 +01:00
Andy Wilkinson d3037103fe Merge branch '2.4.x' into 2.5.x 
Closes gh-28330
 2021-10-14 10:13:24 +01:00
Andy Wilkinson 9f13941c2f Prohibit org.jboss.spec.* dependencies 
Closes gh-28329
 2021-10-14 10:09:30 +01:00
Stephane Nicoll 19eae4736c Upgrade to Undertow 2.2.12.Final 
Closes gh-28328
 2021-10-14 09:49:04 +02:00
Stephane Nicoll c4a7fd86b5 Upgrade to R2DBC Bom Arabba-SR11 
Closes gh-28326
 2021-10-14 09:49:01 +02:00
Stephane Nicoll f195dbec4f Upgrade to Postgresql 42.2.24 
Closes gh-28325
 2021-10-14 09:49:00 +02:00
Stephane Nicoll 09e4220edd Upgrade to Netty tcNative 2.0.44.Final 
Closes gh-28324
 2021-10-14 09:48:58 +02:00
Stephane Nicoll 641a68efbf Upgrade to Netty 4.1.69.Final 
Closes gh-28323
 2021-10-14 09:48:57 +02:00
Stephane Nicoll cfe30db38d Upgrade to MongoDB 4.3.3 
Closes gh-28322
 2021-10-14 09:48:56 +02:00
Stephane Nicoll f92a1a45ff Upgrade to Lombok 1.18.22 
Closes gh-28321
 2021-10-14 09:48:55 +02:00
Stephane Nicoll 30812008b5 Upgrade to Jetty 9.4.44.v20210927 
Closes gh-28320
 2021-10-14 09:48:53 +02:00
Stephane Nicoll e039d9bc1f Upgrade to Jaybird 4.0.4.java8 
Closes gh-28319
 2021-10-14 09:48:52 +02:00
Stephane Nicoll 06c574e291 Upgrade to HttpCore5 5.1.2 
Closes gh-28318
 2021-10-14 09:48:51 +02:00
Stephane Nicoll 7e01b7444f Upgrade to Elasticsearch 7.15.0 
Closes gh-28317
 2021-10-14 09:48:49 +02:00
Stephane Nicoll b155ef5135 Upgrade to Dropwizard Metrics 4.2.4 
Closes gh-28316
 2021-10-14 09:48:48 +02:00
Stephane Nicoll 7bfa4172d0 Upgrade to Couchbase Client 3.2.2 
Closes gh-28315
 2021-10-14 09:48:47 +02:00
Stephane Nicoll f1bc372883 Upgrade to Byte Buddy 1.11.20 
Closes gh-28314
 2021-10-14 09:48:45 +02:00
Stephane Nicoll 0b32215c13 Polish "Log URLs for all DataSources" 
See gh-28204
 2021-10-14 09:24:07 +02:00
StitzL f31b8ec226 Log URLs for all DataSources 
This commit logs the path of the H2 console, followed by the
comma-separated ordered URLs of each data source that offers a
connection.

See gh-28204
 2021-10-14 09:17:49 +02:00
Phillip Webb f4bd8956af Polish "Allow build info properties to be excluded" 
Update the Maven plugin to use an alternative syntax to exclude
the info properties and apply some minor polishing.

See gh-27412
 2021-10-13 21:12:45 -07:00
Vedran Pavic ea9faf8690 Allow build info properties to be excluded 
Update Maven and Gradle plugins to allow build info properties to be
excluded.

Prior to this commit, the `BuildPropertiesWriter` would fail with an
NPE if the group, artifact, name or version properties were `null`.

This was specifically problematic with the Gradle plugin, since its
DSL allows `null` properties which would either be passed to the writer
or, in the case of `artifact`, converted into a string value of
"unspecified".

See gh-27412
 2021-10-13 21:07:09 -07:00
Phillip Webb 2034ad4827 Merge branch '2.5.x' 2021-10-13 18:48:18 -07:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering 
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
 2021-10-13 18:45:22 -07:00
Andy Wilkinson 9514a72d5a Test using an up-to-date version of Postgres 
See gh-28296
 2021-10-13 11:56:44 +01:00
Andy Wilkinson b0dfca7d92 Configure Flyway with spring.flyway.script-placeholder-suffix 
Fixes gh-28307
 2021-10-13 10:57:21 +01:00
Andy Wilkinson 578ed9e08b Upgrade to Mockito 4.0.0 
Closes gh-28300
 2021-10-13 10:32:18 +01:00
Andy Wilkinson bcbc747466 Upgrade to Liquibase 4.5.0 
Closes gh-28299
 2021-10-13 10:32:17 +01:00
Andy Wilkinson 84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +01:00
Andy Wilkinson 3918eb3314 Upgrade to Hibernate 5.6.0.Final 
Closes gh-28297
 2021-10-13 10:16:50 +01:00
Andy Wilkinson 509427b671 Upgrade to Flyway 8.0.0 
Closes gh-28296
 2021-10-13 10:16:50 +01:00
Stephane Nicoll cc8d7fc605 Polish contribution 
See gh-28239
 2021-10-13 09:10:11 +02:00
Leo Li 1770f065a5 Polish 
See gh-28239
 2021-10-13 09:07:33 +02:00
Stephane Nicoll e978654c88 Polish "Fix Integration `fixedRate` property setting" 
See gh-28237
 2021-10-13 09:03:07 +02:00
Artem Bilan 769b5039b6 Fix Integration `fixedRate` property setting 
The `spring.integration.poller.fixed-rate` property must be set to the
constructor of the `PeriodicTrigger` and its `fixedRate` flag should be
set to `true`. The current code-base has it exactly opposite: the flag
is set to `true` when `fixed-delay` is provided.

* Fix `IntegrationAutoConfiguration.asTrigger()` method for the proper
`fixedRate` setting logic.
* Cover the change with a new test-case
* Add a message handling verification to the `defaultPoller()` test to
be sure that poller auto-configuration works as it is claimed.

See gh-28237
 2021-10-13 09:03:07 +02:00
Scott Frederick 3c9354305a Merge branch '2.5.x' 
Closes gh-28305
 2021-10-12 18:09:32 -05:00
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x 
Closes gh-28304
 2021-10-12 18:00:15 -05:00
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class 
Fixes gh-28303
 2021-10-12 17:59:19 -05:00
Scott Frederick a74b911870 Merge branch '2.5.x' 2021-10-12 16:46:19 -05:00
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick 3c6e061917 Remove unused import 
See gh-28223
 2021-10-12 16:45:43 -05:00
Scott Frederick 604b4a004d Merge branch '2.5.x' 2021-10-12 16:18:21 -05:00
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
Scott Frederick 207b76c39e Modify tests to expect filtering of static resource locations 
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
 2021-10-12 16:17:16 -05:00
Stephane Nicoll 6e97331a9e Upgrade to Reactor 2020.0.12 
Closes gh-28251
 2021-10-12 16:08:22 +02:00
Stephane Nicoll f04da491b2 Upgrade to Reactor 2020.0.12 
Closes gh-28240
 2021-10-12 16:06:21 +02:00
Stephane Nicoll fdf4e14f54 Upgrade to Reactor 2020.0.12 
Closes gh-28222
 2021-10-12 16:05:47 +02:00
Stephane Nicoll 3e1b91911a Upgrade to Undertow 2.2.12.Final 
Closes gh-28289
 2021-10-11 11:33:42 +02:00
Stephane Nicoll 9118644d2a Upgrade to R2DBC Bom Arabba-SR11 
Closes gh-28287
 2021-10-11 11:33:40 +02:00
Stephane Nicoll 3e8229e6a1 Upgrade to Postgresql 42.2.24 
Closes gh-28286
 2021-10-11 11:33:39 +02:00
Stephane Nicoll ed77189d69 Upgrade to Netty tcNative 2.0.44.Final 
Closes gh-28285
 2021-10-11 11:33:38 +02:00
Stephane Nicoll c5abb57bdb Upgrade to Lombok 1.18.22 
Closes gh-28284
 2021-10-11 11:33:37 +02:00
Stephane Nicoll 45507a3d19 Upgrade to Jetty 9.4.44.v20210927 
Closes gh-28283
 2021-10-11 11:33:36 +02:00
Stephane Nicoll 5c0b76ec18 Upgrade to Jaybird 4.0.4.java8 
Closes gh-28282
 2021-10-11 11:33:35 +02:00
Stephane Nicoll f2a5c6bcd0 Upgrade to HttpCore5 5.1.2 
Closes gh-28281
 2021-10-11 11:33:34 +02:00
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
Stephane Nicoll c56bba98d9 Harmonize bean type visibility in TestDatabaseAutoConfiguration 
Closes gh-28264
 2021-10-08 15:45:36 +02:00
Stephane Nicoll 6e4ded30df Start building against Spring HATEOAS 1.4.0-RC1 snapshots 
See gh-28254
 2021-10-08 14:04:19 +02:00
Andy Wilkinson 48b1175559 Merge branch '2.5.x' 
Closes gh-28263
 2021-10-08 12:39:45 +01: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 c86c01d35e Revert "Start building against Spring HATEOAS 1.4.0-RC1 snapshots" 
Spring Data does not build against the snapshot yet.

See gh-28254
 2021-10-08 10:36:48 +02:00
Stephane Nicoll 022a64aba7 Merge pull request #28151 from garyrussell 
* pr/28151:
  Upgrade to Apache Kafka 3.0.0

Closes gh-28151
 2021-10-08 09:33:36 +02:00
Gary Russell c88f72fa8f Upgrade to Apache Kafka 3.0.0 
See gh-28151
 2021-10-08 08:59:51 +02:00
Stephane Nicoll fda26703b2 Start building against Spring Batch 4.3.4 snapshots 
See gh-28261
 2021-10-08 08:59:18 +02:00
Stephane Nicoll 5a4b7b86d2 Start building against Spring Integration 5.5.5 snapshots 
See gh-28259
 2021-10-08 08:57:41 +02:00
Stephane Nicoll 9b4c05e7ff Start building against Spring AMQP 2.4.0-RC1 snapshots 
See gh-28256
 2021-10-08 08:55:03 +02:00
Stephane Nicoll ed25d2409d Start building against Spring Data 2021.1.0-RC1 snapshots 
See gh-28255
 2021-10-08 08:54:18 +02:00
Stephane Nicoll 59d35db0d6 Start building against Spring HATEOAS 1.4.0-RC1 snapshots 
See gh-28254
 2021-10-08 08:53:29 +02:00
Stephane Nicoll 0fffada6c4 Start building against Micrometer 1.8.0-RC1 snapshots 
See gh-28253
 2021-10-08 08:52:42 +02:00
Stephane Nicoll 8d7dfdf59d Start building against Spring Framework 5.3.11 snapshots 
See gh-28252
 2021-10-08 08:52:01 +02:00
Stephane Nicoll 8d09d81173 Start building against Reactor 2020.0.12 snapshots 
See gh-28251
 2021-10-08 08:51:11 +02: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
Madhura Bhave e571894903 Merge pull request #28169 from Pooja199 
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
 2021-10-06 16:40:05 -07:00
Anjee 4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup 
See gh-28169
 2021-10-06 16:39:26 -07:00
Madhura Bhave 1ff900cce8 Merge pull request #28173 from kandulsh 
* pr/28173:
  Polish "Add smoke test with Spring Session and Hazelcast"
  Add smoke test with Spring Session and Hazelcast

Closes gh-28173
 2021-10-06 16:02:24 -07:00
Susmitha 70dd655b60 Add smoke test with Spring Session and Hazelcast 
See gh-28173
 2021-10-06 16:00:27 -07:00
Andy Wilkinson 1a505964ee Merge branch '2.5.x' 
Closes gh-28207
 2021-10-06 10:03:24 +01: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 a86a84e00b Merge branch '2.5.x' into main 
Closes gh-28202
 2021-10-05 15:46:26 -07: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
dreis2211 c5088a3bd3 Avoid explicit initialization of Atomics with their default values 
See gh-28162
 2021-10-05 15:37:00 +02:00
Stephane Nicoll 5d17257a52 Polish "Add Java InfoContributor" 
See gh-28136
 2021-10-05 15:11:58 +02:00
Jonatan Ivanov fc87da7ef3 Add Java InfoContributor 
See gh-28136
 2021-10-05 13:52:42 +02:00
Andy Wilkinson 8aa9d0c13d Merge branch '2.5.x' 
Closes gh-28198
 2021-10-05 11:12:22 +01: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 1008b754d7 Merge branch '2.5.x' 
Closes gh-28194
 2021-10-05 08:36:28 +02: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 2b7645b806 Merge branch '2.5.x' 
Closes gh-28191
 2021-10-04 10:23:02 +01: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 fb9f1eba41 Merge branch '2.5.x' into main 
Closes gh-28172
 2021-10-01 15:55:06 -07: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 bddfe9ef6e Merge branch '2.5.x' 
See gh-28135
 2021-10-01 11:32:59 +01:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x 
See gh-28134
 2021-10-01 11:32:22 +01:00