Commit Graph

17728 Commits

Author SHA1 Message Date
Phillip Webb 2a989b31aa Create Environment and apply ConversionService to management contexts
Update `ManagementContextFactory` implementations to create an
appropriate `Environment` type and to apply the `ConversionService`
from the parent context.

Prior to this commit, the management context `Environment` would not
be able to convert values from a `configtree:` source due to a missing
converter.

Fixes gh-32941
2022-11-14 15:06:30 -08:00
Stephane Nicoll 51a1673252 Upgrade to Undertow 2.2.21.Final
Closes gh-33165
2022-11-14 16:03:26 +01:00
Stephane Nicoll 7885387d24 Upgrade to Spring WS 3.1.4
Closes gh-33163
2022-11-14 16:03:21 +01:00
Stephane Nicoll cd7f6d049e Upgrade to Spring Security 5.6.9
Closes gh-33162
2022-11-14 16:03:18 +01:00
Stephane Nicoll 925cd10d9d Upgrade to Netty 4.1.85.Final
Closes gh-33161
2022-11-14 16:03:15 +01:00
Stephane Nicoll d8867e7c2e Upgrade to MariaDB 2.7.7
Closes gh-33160
2022-11-14 16:03:12 +01:00
Stephane Nicoll c1e105ffea Upgrade to Jaybird 4.0.7.java8
Closes gh-33159
2022-11-14 16:03:10 +01:00
Stephane Nicoll 83ec78b2af Upgrade to HttpCore5 5.1.5
Closes gh-33158
2022-11-14 16:03:07 +01:00
Stephane Nicoll bdc80ec484 Upgrade to Hibernate 5.6.14.Final
Closes gh-33157
2022-11-14 16:03:04 +01:00
Stephane Nicoll 2d09711942 Start building against Spring GraphQL 1.0.3 snapshots
See gh-33150
2022-11-14 10:11:13 +01:00
Stephane Nicoll 41914ab15b Start building against Spring Batch 4.3.8 snapshots
See gh-33135
2022-11-14 09:20:52 +01:00
Stephane Nicoll cf3a22b495 Start building against Spring REST Docs 2.0.7 snapshots
See gh-33134
2022-11-14 09:20:21 +01:00
Stephane Nicoll 2d90378595 Start building against Spring Kafka 2.8.11 snapshots
See gh-33133
2022-11-14 09:19:52 +01:00
Stephane Nicoll 6705d1b087 Start building against Spring Data 2021.2.6 snapshots
See gh-33132
2022-11-14 09:19:26 +01:00
Stephane Nicoll 2eb6cef081 Start building against Spring Framework 5.3.24 snapshots
See gh-33131
2022-11-14 09:18:58 +01:00
Stephane Nicoll 9c289b7090 Start building against Reactor 2020.0.25 snapshots
See gh-33130
2022-11-14 09:18:23 +01:00
Stephane Nicoll dfbf0be6f9 Start building against Micrometer 1.9.6 snapshots
See gh-33129
2022-11-14 09:17:56 +01:00
Stephane Nicoll 2b4ceb35a2 Start building against Spring Batch 4.3.8 snapshots
See gh-33128
2022-11-14 08:57:30 +01:00
Stephane Nicoll 579daad219 Start building against Spring REST Docs 2.0.7 snapshots
See gh-33127
2022-11-14 08:57:06 +01:00
Stephane Nicoll 37ffaa3e12 Start building against Spring Kafka 2.8.11 snapshots
See gh-33126
2022-11-14 08:56:41 +01:00
Stephane Nicoll 4873671ada Start building against Spring Data 2021.1.10 snapshots
See gh-33125
2022-11-14 08:56:16 +01:00
Stephane Nicoll 22e56d27a6 Start building against Spring Framework 5.3.24 snapshots
See gh-33124
2022-11-14 08:55:50 +01:00
Stephane Nicoll 89212aa3ba Start building against Reactor 2020.0.25 snapshots
See gh-33123
2022-11-14 08:55:23 +01:00
Stephane Nicoll 36c5ddbd13 Start building against Micrometer 1.8.12 snapshots
See gh-33122
2022-11-14 08:54:58 +01:00
Phillip Webb 9193e527cc Merge branch '2.6.x' into 2.7.x
Closes gh-33101
2022-11-10 11:12:25 -08:00
67 e55e23482a Fix kafka streams start description typo in documentation
See gh-33098
2022-11-10 11:11:13 -08:00
Phillip Webb ea10a64a0c Merge branch '2.6.x' into 2.7.x 2022-11-09 11:39:53 -08:00
Phillip Webb f423a26dd5 Polish 2022-11-09 11:39:48 -08:00
Phillip Webb 0ef03d725f Merge branch '2.6.x' into 2.7.x 2022-11-09 11:31:55 -08:00
Phillip Webb a431ae04e6 Polish 2022-11-09 11:30:11 -08:00
Andy Wilkinson b1494d4a39 Merge branch '2.6.x' into 2.7.x
Closes gh-33084
2022-11-09 10:37:06 +00:00
Andy Wilkinson 6423535f67 Delete temp directory after MavenBuild has exected
Closes gh-33083
2022-11-09 10:35:56 +00:00
Andy Wilkinson 1c3a4906fa Merge pull request #32861 from izeye
* gh-32861:
  Polish "Provide dependency management for missing Selenium modules"
  Provide dependency management for missing Selenium modules

Closes gh-32861
2022-11-08 17:35:48 +00:00
Andy Wilkinson 03d1631d4c Polish "Provide dependency management for missing Selenium modules"
See gh-32861
2022-11-08 17:35:36 +00:00
Andy Wilkinson 00d22c9fc5 Merge branch '2.6.x' into 2.7.x
Closes gh-33074
2022-11-08 17:28:50 +00:00
Andy Wilkinson f42e90a2b4 Add missing dependency management for Selenum
Closes gh-32721
2022-11-08 17:27:48 +00:00
Andy Wilkinson eed86c0d0a Test Boot's Gradle plugin against Gradle 7.6-rc-2
Closes gh-33073
2022-11-08 16:46:22 +00:00
Johnny Lim 4161f5bdf1 Provide dependency management for missing Selenium modules
See gh-32861
2022-11-08 15:11:21 +00:00
Andy Wilkinson bb141ffc09 Merge branch '2.6.x' into 2.7.x
Closes gh-33068
2022-11-08 13:14:30 +00:00
EricGao888 569e752159 Fix a minor bug in an example in oauth2 doc
See gh-32931
2022-11-08 13:14:06 +00:00
Andy Wilkinson 0e70c33725 Merge branch '2.6.x' into 2.7.x
Closes gh-33066
2022-11-08 13:10:40 +00:00
dreis2211 34902f5a02 Fix possible type pollution in ConditionEvaluationReport
See gh-32916
2022-11-08 13:01:27 +00:00
Andy Wilkinson 7c0f397129 Merge branch '2.6.x' into 2.7.x
See gh-33015
2022-11-07 13:36:11 +00:00
Andy Wilkinson ac6ad7c0f1 Fix ModifiedClassPathExtension with parameterized tests
Closes gh-33014
2022-11-07 13:34:54 +00:00
Andy Wilkinson 651f4f7236 Polish "Polish ImportCandidates"
See gh-33013
2022-11-06 11:30:29 +00:00
biergit d7090b500b Polish ImportCandidates
See gh-33013
2022-11-06 11:30:29 +00:00
Phillip Webb b4283d45c5 Merge branch '2.6.x' into 2.7.x 2022-11-05 17:03:02 -07:00
Phillip Webb d2cceb6b77 Polish 2022-11-05 17:02:57 -07:00
Phillip Webb 2ab1f49442 Merge branch '2.6.x' into 2.7.x
Closes gh-33018
2022-11-05 16:35:26 -07:00
Phillip Webb caf46043c6 Add @DirtiesUrlFactories annotation
Add `@DirtiesUrlFactories` annotation that can be used to reset URL
factories.

Closes gh-33017
2022-11-05 16:30:27 -07:00
Phillip Webb 948893f36d Merge branch '2.6.x' into 2.7.x
Closes gh-33015
2022-11-05 16:04:40 -07:00
Phillip Webb d4cc8fc3a6 Support modified classpath on methods and parameterized tests
Update `ModifiedClassPathExtension` and related classes so that
annotations can be used directly on test methods, or on classes
passed into parameterized tests.

Closes gh-33014
2022-11-05 16:04:19 -07:00
Andy Wilkinson 06c83e5345 Merge branch '2.6.x' into 2.7.x
Closes gh-32999
2022-11-04 10:42:55 +00:00
Andy Wilkinson d00e004622 Add missing XMLUnit dependency management
Closes gh-32998
2022-11-04 10:42:26 +00:00
Andy Wilkinson 394ae76b04 Merge branch '2.6.x' into 2.7.x
Closes gh-32989
2022-11-03 10:44:21 +00:00
Andy Wilkinson fcd3413ba0 Allow histograms to be disabled for Lettuce metrics
Closes gh-32985
2022-11-03 10:34:41 +00:00
Andy Wilkinson a3870f8da7 Merge branch '2.6.x' into 2.7.x
Closes gh-32987
2022-11-03 10:23:30 +00:00
Andy Wilkinson beb62be843 Test Boot's Gradle plugin against Gradle 7.6-rc-1
Closes gh-32933
2022-11-03 10:22:14 +00:00
Phillip Webb f44531a7a2 Merge branch '2.6.x' into 2.7.x 2022-10-25 16:02:04 -07:00
Phillip Webb 92b513dc8d Polish 2022-10-25 16:01:58 -07:00
Phillip Webb c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Phillip Webb d7ac20cd6c Update copyright year of changed files 2022-10-25 15:47:30 -07:00
Andy Wilkinson 032487117b Merge branch '2.6.x' into 2.7.x
Closes gh-32836
2022-10-21 11:04:09 +01:00
Andy Wilkinson fe51e03019 Support IPv6 addresses in spring.redis.sentinel.nodes
Fixes gh-32762
2022-10-21 10:53:54 +01:00
Phillip Webb d8c4aec946 Merge branch '2.6.x' into 2.7.x 2022-10-20 17:04:37 -07:00
Phillip Webb 1a14f39f83 Polish 2022-10-20 17:04:29 -07:00
Phillip Webb 1c7bff7cc1 Merge branch '2.6.x' into 2.7.x
Closes gh-32826
2022-10-20 15:01:00 -07:00
Phillip Webb 463a614d27 Fix package tangle between SpringApplication and Environment types
Update `SpringApplication` so that it no longer directly decides the
type of `Environment` that should be created.

Closes gh-32825
2022-10-20 14:51:13 -07:00
Stephane Nicoll 7bd9754ce1 Merge branch '2.6.x' into 2.7.x
Closes gh-32820
2022-10-20 16:43:14 +02:00
James Seung Hyun Son 5e0a67ac66 Fix typos in logging.adoc
See gh-32812
2022-10-20 16:41:24 +02:00
Stephane Nicoll 13691f27bd Merge branch '2.6.x' into 2.7.x
Closes gh-32818
2022-10-20 16:37:57 +02:00
Stephane Nicoll 4d7cb7144e Upgrade copyright year of changed files
See gh-32644
2022-10-20 16:35:55 +02:00
Ada-Claire c5a1944267 Harmonize ConfigurationProperties code samples
Rename the SomeProperties class so that it is consistent with other
examples given within the Type-safe Configuration Properties. This
ensures that readers can intuitively draw the conclusion that the
MyProperties class is annotated with ConfigurationProperties.

See gh-32644
2022-10-20 16:35:18 +02:00
Phillip Webb d3750c4991 Merge branch '2.6.x' into 2.7.x 2022-10-19 22:01:13 -07:00
Phillip Webb c416c17fe8 Polish documentation title case 2022-10-19 21:53:21 -07:00
Andy Wilkinson 6f787c4b79 Upgrade to Infinispan 13.0.12.Final
Closes gh-32788
2022-10-19 11:44:54 +01:00
Andy Wilkinson 3aa835845e Upgrade to Glassfish JAXB 2.3.7
Closes gh-32787
2022-10-19 11:44:51 +01:00
Andy Wilkinson ba02a64743 Upgrade to Dependency Management Plugin 1.0.15.RELEASE
Closes gh-32786
2022-10-19 11:44:48 +01:00
Andy Wilkinson 65bdcdb2a5 Upgrade to Glassfish JAXB 2.3.7
Closes gh-32785
2022-10-19 10:44:06 +01:00
Andy Wilkinson 02760ffee4 Upgrade to Dependency Management Plugin 1.0.15.RELEASE
Closes gh-32784
2022-10-19 10:44:03 +01:00
Andy Wilkinson a19e394ebb Merge branch '2.6.x' into 2.7.x
Closes gh-32781
2022-10-19 10:00:48 +01:00
Henning Poettker 4ed072a06b Upgrade MySQL Connector/J and use new Maven identifiers
See gh-32747
2022-10-19 09:58:32 +01:00
Phillip Webb fcaac2b343 Merge branch '2.6.x' into 2.7.x
Closes gh-32777
2022-10-18 17:14:48 -07:00
Phillip Webb 2c7114fa17 Polish 'Use exclamation character for the document separator prefix'
See gh-32521
2022-10-18 17:08:21 -07:00
Guirong Hu 33e379c4a2 Use exclamation character for the document separator prefix
See gh-32521
2022-10-18 17:07:51 -07:00
Phillip Webb 8dec296dfd Merge branch '2.6.x' into 2.7.x
Closes gh-32775
2022-10-18 15:49:51 -07:00
Phillip Webb de111dba5c Polish 'Add DataSize serializer for configprops endpoint'
See gh-32645
2022-10-18 15:46:56 -07:00
Guirong Hu 3b25132e38 Add DataSize serializer for configprops endpoint
See gh-32645
2022-10-18 15:46:33 -07:00
Phillip Webb fbd416adc6 Merge branch '2.6.x' into 2.7.x
Closes gh-32773
2022-10-18 15:37:20 -07:00
Phillip Webb b02c702ad1 Polish 'Use more specific bean method return types in KafkaAutoConfiguration'
See gh-32770
2022-10-18 15:35:37 -07:00
yuanhao18 c498ad0320 Use more specific bean method return types in KafkaAutoConfiguration
Update `KafkaAutoConfiguration` so that more specific bean types are
returned.

See gh-32770
2022-10-18 15:33:58 -07:00
Andy Wilkinson 99f0a5e01d Upgrade to Spring Security 5.7.4
Closes gh-32597
2022-10-17 20:45:40 +01:00
Andy Wilkinson a92388cbee Upgrade to Spring Security 5.6.8
Closes gh-32590
2022-10-17 20:43:40 +01:00
Andy Wilkinson bdb4f24300 Upgrade to Spring Kafka 2.8.10
Closes gh-32596
2022-10-17 19:44:24 +01:00
Andy Wilkinson a16e3e6688 Upgrade to Spring Kafka 2.8.10
Closes gh-32589
2022-10-17 19:42:27 +01:00
Andy Wilkinson 3d5c864bc9 Merge branch '2.6.x' into 2.7.x
Closes gh-32758
2022-10-17 17:11:59 +01:00
Andy Wilkinson dade5ec3aa Test against Gradle 6.9.3
Closes gh-32757
2022-10-17 17:11:37 +01:00
Phillip Webb 0f4a978731 Merge branch '2.6.x' into 2.7.x 2022-10-15 14:19:06 -07:00
Phillip Webb 6641a98913 Improve the phrasing around property source ordering 2022-10-15 14:18:49 -07:00
Stephane Nicoll 040c78062e Upgrade to Spring Retry 1.3.4
Closes gh-32594
2022-10-14 10:28:30 +02:00
Stephane Nicoll c858c1e998 Upgrade to Spring Retry 1.3.4
Closes gh-32593
2022-10-14 10:23:47 +02:00
Andy Wilkinson 9fd3d78bae Upgrade to Jackson Bom 2.13.4.20221013
Closes gh-32724
2022-10-13 21:18:15 +01:00
Andy Wilkinson 936cb41c6e Upgrade to Jetty Reactive HTTPClient 1.1.13
Closes gh-32723
2022-10-13 20:10:11 +01:00
Andy Wilkinson 0411ebeeaf Upgrade to Jackson Bom 2.13.4.20221013
Closes gh-32722
2022-10-13 20:10:07 +01:00
Andy Wilkinson 654c3353d5 Upgrade to Netty 4.1.84.Final
Closes gh-32700
2022-10-13 15:44:57 +01:00
Andy Wilkinson 09d7bede29 Upgrade to Jetty Reactive HTTPClient 1.1.13
Closes gh-32699
2022-10-13 15:44:54 +01:00
Andy Wilkinson b9148ede2f Upgrade to Hazelcast 5.1.4
Closes gh-32698
2022-10-13 15:44:51 +01:00
Andy Wilkinson 7470342dda Upgrade to Byte Buddy 1.12.18
Closes gh-32697
2022-10-13 15:44:49 +01:00
Andy Wilkinson 4474af6265 Upgrade to Spring Data 2021.2.5
Closes gh-32595
2022-10-13 15:42:16 +01:00
Andy Wilkinson 567146954d Upgrade to Reactor 2020.0.24
Closes gh-32592
2022-10-13 15:41:36 +01:00
Andy Wilkinson eaf0523656 Upgrade to Spring Data 2021.1.9
Closes gh-32588
2022-10-13 14:32:37 +01:00
Andy Wilkinson 5329eac5e4 Upgrade to Reactor 2020.0.24
Closes gh-32587
2022-10-13 14:31:47 +01:00
Andy Wilkinson 3244a4a59b Upgrade to Netty 4.1.84.Final
Closes gh-32695
2022-10-13 14:30:51 +01:00
Andy Wilkinson c9b929bd89 Starting building against Spring Data 2021.2.5 snapshots
See gh-32595
2022-10-13 12:39:12 +01:00
Andy Wilkinson 78bf7b640c Start building against Spring Data 2021.1.9 snapshots
See gh-32588
2022-10-13 12:37:39 +01:00
Scott Frederick 6c1103cde0 Support PEM formatted elliptic-curve TLS keys
Apply the changes from e0c79ce598
to the `PrivateKeyParser` used for web server SSL configuration.

See gh-32646
2022-10-12 13:25:58 -05:00
Phillip Webb ed01a77a99 Merge branch '2.6.x' into 2.7.x
Closes gh-32681
2022-10-11 23:19:34 -07:00
Phillip Webb e0c79ce598 Support PEM formatted elliptic-curve TLS keys
Update `PrivateKeyParser` to support loading PEM formatted
elliptic-curve keys. We need to do a similar trick to the PKCS1 keys
and convert them to a `PKCS8EncodedKeySpec`.

Fixes gh-32646
2022-10-11 23:18:44 -07:00
Andy Wilkinson 1b604e30f7 Merge branch '2.6.x' into 2.7.x
Closes gh-32678
2022-10-11 19:15:33 +01:00
Andy Wilkinson 215eb96355 Improve error handling in SpringBootPlugin
Closes gh-32677
2022-10-11 19:15:23 +01:00
Stephane Nicoll 907396021f Upgrade to Lettuce 6.1.10.RELEASE
Closes gh-32669
2022-10-11 11:06:30 +02:00
Stephane Nicoll 5b6a5873a5 Upgrade to Micrometer 1.9.5
Closes gh-32591
2022-10-11 06:15:51 +02:00
Stephane Nicoll 8a231e52b3 Upgrade to Undertow 2.2.20.Final
Closes gh-32668
2022-10-11 06:15:36 +02:00
Stephane Nicoll 1207d55f34 Upgrade to Lettuce 6.1.10.RELEASE
Closes gh-32666
2022-10-11 06:15:31 +02:00
Stephane Nicoll 858a48d979 Upgrade to Hibernate 5.6.12.Final
Closes gh-32665
2022-10-11 06:15:29 +02:00
Stephane Nicoll 483d62fa40 Upgrade to Embedded Mongo 3.4.11
Closes gh-32664
2022-10-11 06:15:27 +02:00
Stephane Nicoll 7e0de51cd2 Upgrade to Ehcache3 3.10.2
Closes gh-32663
2022-10-11 06:15:24 +02:00
Stephane Nicoll f49d1704f2 Upgrade to Micrometer 1.8.11
Closes gh-32586
2022-10-11 06:13:04 +02:00
Stephane Nicoll ac9b869cfd Upgrade to Undertow 2.2.20.Final
Closes gh-32651
2022-10-10 09:33:24 +02:00
Stephane Nicoll 19c3078623 Upgrade to Hibernate 5.6.12.Final
Closes gh-32649
2022-10-10 09:33:19 +02:00
Stephane Nicoll 1efbfdb3d3 Upgrade to Ehcache3 3.9.10
Closes gh-32648
2022-10-10 09:33:16 +02:00
Stephane Nicoll 627725b10f Start building against Spring Security 5.7.4 snapshots
See gh-32597
2022-10-07 09:48:08 +02:00
Stephane Nicoll 1de704b864 Start building against Spring Kafka 2.9.2 snapshots
See gh-32596
2022-10-07 09:47:40 +02:00
Stephane Nicoll 4803f289fe Start building against Spring Data 2021.2.4 snapshots
See gh-32595
2022-10-07 09:47:12 +02:00
Stephane Nicoll 1db0e998a6 Start building against Spring Retry 1.3.4 snapshots
See gh-32594
2022-10-07 09:46:49 +02:00
Stephane Nicoll edd907eb9d Start building against Micrometer 1.9.5 snapshots
See gh-32591
2022-10-07 09:46:22 +02:00
Stephane Nicoll 593f2ca7fe Start building against Reactor 2020.0.24 snapshots
See gh-32592
2022-10-07 09:45:47 +02:00
Stephane Nicoll 86176e8f4b Start building against Spring Security 5.6.8 snapshots
See gh-32590
2022-10-07 09:06:37 +02:00
Stephane Nicoll 525b724adc Start building against Spring Kafka 2.8.10 snapshots
See gh-32589
2022-10-07 09:06:37 +02:00
Stephane Nicoll 2b2f23ef9c Start building against Spring Data 2021.1.8 snapshots
See gh-32588
2022-10-07 09:06:37 +02:00
Stephane Nicoll 9b002e1c05 Start building against Spring Retry 1.3.4 snapshots
See gh-32593
2022-10-07 09:06:37 +02:00
Stephane Nicoll 556543043e Start building against Micrometer 1.8.11 snapshots
See gh-32586
2022-10-07 09:04:34 +02:00
Stephane Nicoll 8d2af7ea93 Start building against Reactor 2020.0.24 snapshots
See gh-32587
2022-10-07 09:04:08 +02:00
Phillip Webb 0f4d98b1f4 Merge branch '2.6.x' into 2.7.x
Closes gh-32575
2022-10-03 17:56:10 -07:00
Phillip Webb e917bd0ed0 Only build OutputCapture strings when necessary
Update `OutputCapture` so that expensive build operations are only
performed when necessary. This update is especially important for Kotlin
users calling `"Expected String" in output` since this results in a call
to Kotlin's `CharSequence.contains` which calls the `length()` and
`charAt()` methods many times.

Closes gh-32033
2022-10-03 16:55:44 -07:00
Phillip Webb 0e98a577fe Merge branch '2.6.x' into 2.7.x 2022-09-30 21:18:09 -07:00
Phillip Webb 75f4d9e3fd Fix empty @DefaultValue annotation test failures on Java 17
See gh-32559
2022-09-30 21:16:48 -07:00
Phillip Webb 1eb0dd5e39 Merge branch '2.6.x' into 2.7.x
Closes gh-32563
2022-09-30 20:16:36 -07:00
Phillip Webb efc431bdc4 Support empty @DefaultValue annotations on aggregates and optional
Update `ValueObjectBinder` to allow an empty `@DefaultValue` to be
used on map, collection, arrays and optional types.

Closes gh-32559
2022-09-30 18:21:54 -07:00
Andy Wilkinson 3ef633b096 Merge branch '2.6.x' into 2.7.x
Closes gh-32543
2022-09-29 11:39:42 +01:00
Andy Wilkinson 84a25c7dcf Configure Log4j2 classpath overrides consistently
Closes gh-32537
2022-09-29 11:25:21 +01:00
Andy Wilkinson 9f5b7db553 Merge branch '2.6.x' into 2.7.x
Closes gh-32535
2022-09-29 10:04:19 +01:00
Andy Wilkinson be48f37a83 Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp
Closes gh-32533
2022-09-29 10:03:52 +01:00
Stephane Nicoll cb191dfec2 Merge branch '2.6.x' into 2.7.x
Closes gh-32515
2022-09-27 08:59:11 +02:00
heqiang 5db6cc1cba Remove redundant @ExtendWith(SpringExtension.class) for sample
See gh-32476
2022-09-27 08:49:46 +02:00
Stephane Nicoll eb4b0a3f3c Merge branch '2.6.x' into 2.7.x
Closes gh-32513
2022-09-27 08:41:20 +02:00
Stephane Nicoll 8f598f876b Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator"
See gh-32505
2022-09-27 08:34:22 +02:00
Mico Piira f51c4c3df0 Use non-blocking API in CouchbaseReactiveHealthIndicator
See gh-32505
2022-09-27 08:31:57 +02:00
Stephane Nicoll 33680e5acc Merge branch '2.6.x' into 2.7.x
Closes gh-32509
2022-09-27 08:28:15 +02:00
Stephane Nicoll 0457536d72 Polish "Avoid using JUnit 4 assertions"
See gh-32504
2022-09-27 08:24:03 +02:00
dreis2211 cee353fba6 Avoid using JUnit 4 assertions
See gh-32504
2022-09-27 08:11:47 +02:00
Andy Wilkinson 5124ae94ae Merge branch '2.6.x' into 2.7.x
Closes gh-32499
2022-09-26 13:15:11 +01:00
Andy Wilkinson cfac7f55a4 Correct annotations on BootBuildImage's file-based inputs
Closes gh-32495
2022-09-26 13:13:16 +01:00
Stephane Nicoll ca830240fa Upgrade to Spring Batch 4.3.7
Closes gh-32278
2022-09-22 09:35:29 +02:00
Stephane Nicoll 82763deb93 Upgrade to Spring Batch 4.3.7
Closes gh-32271
2022-09-22 09:26:07 +02:00
Brian Clozel 8f9323d66c Document "classpath:*" location for GraphQL Schemas
This commit mentions the `"classpath*:graphql/**` schema location in
case the application needs to find schemas across multiple classpath
roots, for example across multiple modules.

Closes gh-31772
2022-09-21 21:09:22 +02:00
Andy Wilkinson 3620959dca Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32459
2022-09-21 10:06:56 +01:00
Andy Wilkinson 9d30a0a5b6 Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32458
2022-09-21 10:04:03 +01:00
Stephane Nicoll 8bca178b83 Upgrade to Byte Buddy 1.12.17
Closes gh-32454
2022-09-21 08:24:27 +02:00
Stephane Nicoll d5debb1d3d Upgrade to Spring Integration 5.5.15
Closes gh-32453
2022-09-21 08:22:25 +02:00
Stephane Nicoll b3db0768c0 Upgrade to Spring GraphQL 1.0.2
Closes gh-32426
2022-09-21 08:21:56 +02:00
Stephane Nicoll 4e18da99a3 Upgrade to Spring Integration 5.5.15
Closes gh-32452
2022-09-21 08:18:15 +02:00
Phillip Webb 445dff0483 Upgrade to MariaDB 3.0.8
Closes gh-32445
2022-09-20 14:15:06 -07:00
Phillip Webb 0ff789415e Upgrade to Jetty 9.4.49.v20220914
Closes gh-32444
2022-09-20 14:15:03 -07:00
Phillip Webb f9b532d5aa Upgrade to Groovy 3.0.13
Closes gh-32443
2022-09-20 14:14:59 -07:00
Phillip Webb c7254cfe25 Upgrade to Jetty 9.4.49.v20220914
Closes gh-32441
2022-09-20 14:06:08 -07:00
Phillip Webb 634799f887 Upgrade to Groovy 3.0.13
Closes gh-32440
2022-09-20 14:06:06 -07:00
Stephane Nicoll 4e82a69a0b Start building against Spring GraphQL 1.0.2 snapshots
See gh-32426
2022-09-20 03:36:08 +02:00
Stephane Nicoll e616fb5d8b Upgrade to Spring Kafka 2.8.9
Closes gh-32277
2022-09-20 03:30:50 +02:00
Stephane Nicoll cddfa4b58c Upgrade to Spring AMQP 2.4.7
Closes gh-32276
2022-09-20 03:30:23 +02:00
Stephane Nicoll 6c37838f31 Upgrade to Spring Kafka 2.8.9
Closes gh-32270
2022-09-20 03:29:41 +02:00
Stephane Nicoll 033b6b5dbe Upgrade to Spring AMQP 2.4.7
Closes gh-32269
2022-09-20 03:29:16 +02:00
Stephane Nicoll 85d73a1f62 Upgrade to Spring Data 2021.2.3
Closes gh-32275
2022-09-19 17:57:17 +02:00
Stephane Nicoll d72e0b39fc Upgrade to Spring Data 2021.1.7
Closes gh-32268
2022-09-19 17:56:19 +02:00
Andy Wilkinson a800f7d77c Merge branch '2.6.x' into 2.7.x
Closes gh-32406
2022-09-16 17:03:13 +01:00
Andy Wilkinson 61e11cd361 Ensure that TCCL is clean when DataSource is accessed
Previously, when using Tomcat, its web app class loader was the thread
context class loader when H2ConsoleAutoConfiguration triggered
initialization of Hikari's pool. This was the case because it's done
in the bean method of a ServletRegistrationBean. Such Servlet-related
beans are intentionally created with Tomcat's web app classloader as
the TCCL. This arrangement results in the pool's threads using
Tomcat's web app class loader as their TCCL which is not desirable.
One consequence of this was that Tomcat could log a warning at
shutdown about the thread being left running when it will, in fact,
be stopped as part of the context being closed.

This commit updates H2ConsoleAutoConfiguration to set the TCCL to its
own ClassLoader while the DataSource information is being logged.

Closes gh-32382
2022-09-16 16:24:57 +01:00
Andy Wilkinson 7827e8166e Merge branch '2.6.x' into 2.7.x
Closes gh-32402
2022-09-16 11:38:07 +01:00
Andy Wilkinson ab26050fe7 Document support for Java 19
Closes gh-32259
2022-09-16 11:37:14 +01:00
Stephane Nicoll 756eaea766 Upgrade to Spring HATEOAS 1.5.2
Closes gh-32378
2022-09-16 07:41:04 +02:00
Stephane Nicoll 998396dd8a Upgrade to Spring HATEOAS 1.4.5
Closes gh-32400
2022-09-16 07:39:56 +02:00
Andy Wilkinson 52522b87f0 Merge branch '2.6.x' into 2.7.x
Closes gh-32393
2022-09-15 11:57:28 +01:00
Andy Wilkinson 77f428498f Compile against SnakeYAML 1.32 and test against older versions
Closes gh-32392
2022-09-15 11:55:44 +01:00
Stephane Nicoll 4aabe7caf5 Upgrade to Spring Framework 5.3.23
Closes gh-32274
2022-09-15 11:09:43 +02:00
Stephane Nicoll 78fb738117 Upgrade to Spring Framework 5.3.23
Closes gh-32267
2022-09-15 11:08:55 +02:00
Stephane Nicoll 9620fb5317 Start building against Spring HATEOAS 1.5.2 snapshots
See gh-32378
2022-09-14 22:16:03 +02:00
Stephane Nicoll 1839c8385e Upgrade to RSocket 1.1.3
Closes gh-32380
2022-09-14 22:15:40 +02:00
Stephane Nicoll 9b122924c8 Upgrade to RSocket 1.1.3
Closes gh-32379
2022-09-14 22:13:43 +02:00
Stephane Nicoll cdac50a1c9 Upgrade to UnboundID LDAPSDK 6.0.6
Closes gh-32329
2022-09-14 11:01:19 +02:00
Stephane Nicoll d4a88041dc Upgrade to R2DBC Bom Borca-SR2
Closes gh-32328
2022-09-14 11:01:19 +02:00
Stephane Nicoll 24ab4e88cd Upgrade to Netty 4.1.82.Final
Closes gh-32327
2022-09-14 10:32:46 +02:00
Stephane Nicoll 8621e63aef Upgrade to Kafka 3.1.2
Closes gh-32326
2022-09-14 10:32:44 +02:00
Stephane Nicoll 7e8c560e9b Upgrade to Johnzon 1.2.19
Closes gh-32325
2022-09-14 10:32:42 +02:00
Stephane Nicoll d525d36fb9 Upgrade to Janino 3.1.8
Closes gh-32324
2022-09-14 10:32:39 +02:00
Stephane Nicoll 7cff955030 Upgrade to Jackson Bom 2.13.4
Closes gh-32323
2022-09-14 10:32:37 +02:00
Stephane Nicoll 051331beb9 Upgrade to Infinispan 13.0.11.Final
Closes gh-32322
2022-09-14 10:32:34 +02:00
Stephane Nicoll c5b2bacfd3 Upgrade to Hibernate Validator 6.2.5.Final
Closes gh-32321
2022-09-14 10:32:32 +02:00
Stephane Nicoll 1c41032d66 Upgrade to Hibernate 5.6.11.Final
Closes gh-32320
2022-09-14 10:32:29 +02:00
Stephane Nicoll a00951d673 Upgrade to Embedded Mongo 3.4.9
Closes gh-32319
2022-09-14 10:32:27 +02:00
Stephane Nicoll 07985e34fb Upgrade to Elasticsearch 7.17.6
Closes gh-32318
2022-09-14 10:32:25 +02:00
Stephane Nicoll a111f66e76 Upgrade to Ehcache3 3.10.1
Closes gh-32317
2022-09-14 10:32:22 +02:00
Stephane Nicoll a32bf83f60 Upgrade to Dropwizard Metrics 4.2.12
Closes gh-32316
2022-09-14 10:32:20 +02:00
Stephane Nicoll c9067cd6a8 Upgrade to Couchbase Client 3.3.4
Closes gh-32315
2022-09-14 10:32:18 +02:00
Stephane Nicoll 89491c3aaa Upgrade to Byte Buddy 1.12.16
Closes gh-32314
2022-09-14 10:32:15 +02:00
Andy Wilkinson a533f4fa32 Polish 2022-09-14 09:20:13 +01:00
Stephane Nicoll c216e1e4a4 Upgrade to Netty 4.1.82.Final
Closes gh-32312
2022-09-14 09:31:10 +02:00
Stephane Nicoll a3465ced28 Upgrade to Kafka 3.0.2
Closes gh-32311
2022-09-14 09:31:08 +02:00
Stephane Nicoll 3d21fcb381 Upgrade to Johnzon 1.2.19
Closes gh-32310
2022-09-14 09:31:05 +02:00
Stephane Nicoll 4848f8db5b Upgrade to Janino 3.1.8
Closes gh-32309
2022-09-14 09:31:03 +02:00
Stephane Nicoll b4475e1387 Upgrade to Jackson Bom 2.13.4
Closes gh-32308
2022-09-14 09:31:01 +02:00
Stephane Nicoll 1775fc148c Upgrade to Hibernate Validator 6.2.5.Final
Closes gh-32307
2022-09-14 09:30:58 +02:00
Stephane Nicoll 7de6d72346 Upgrade to Hibernate 5.6.11.Final
Closes gh-32306
2022-09-14 09:30:56 +02:00
Stephane Nicoll 2fa4195326 Upgrade to Dropwizard Metrics 4.2.12
Closes gh-32305
2022-09-14 09:30:53 +02:00
Stephane Nicoll e68b346c05 Upgrade to Reactor 2020.0.23
Closes gh-32273
2022-09-14 08:19:16 +02:00
Stephane Nicoll dc4d850b16 Upgrade to Rector 2020.0.23
Closes gh-32266
2022-09-14 08:18:40 +02:00
Stephane Nicoll f23f11aa13 Start building against Spring AMQP 2.4.7 snapshots
See gh-32276
2022-09-13 17:48:05 +02:00
Stephane Nicoll 6201cc076d Upgrade to Micrometer 1.9.4
Closes gh-32272
2022-09-12 14:20:53 +02:00
Stephane Nicoll 72ad69d696 Upgrade to Micrometer 1.8.10
Closes gh-32265
2022-09-12 14:17:46 +02:00
Stephane Nicoll 04a668fd07 Merge branch '2.6.x' into 2.7.x
Closes gh-32291
2022-09-10 09:13:40 +02:00
Oliver B. Fischer 6e4e76597a Make the path of the config directory better understandable
Currently, the documentation relates to the subdirectory for external
configurations as `/config`. Read as UNIX path, the leading slash
could be read as reference to the root directory `/`.

This commit updates the documentation to use 'config/' instead.

See gh-32224
2022-09-10 09:09:43 +02:00
Stephane Nicoll fd808ba16e Start building against Spring Batch 4.3.7 snapshots
See gh-32278
2022-09-10 08:56:25 +02:00
Stephane Nicoll b1b45f19fa Start building against Spring Kafka 2.8.9 snapshots
See gh-32277
2022-09-10 08:56:25 +02:00
Stephane Nicoll dbdb5f40ee Start building against Spring Data 2021.2.3 snapshots
See gh-32275
2022-09-10 08:56:25 +02:00
Stephane Nicoll b5aeb21e0a Start building against Spring Framework 5.3.23 snapshots
See gh-32274
2022-09-10 08:56:24 +02:00
Stephane Nicoll 1c1006f755 Start building against Micrometer 1.9.4 snapshots
See gh-32272
2022-09-10 08:56:24 +02:00
Andy Wilkinson f17df7bf30 Merge branch '2.6.x' into 2.7.x
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson 23c2f73b3f Update tests to allow them to run on Java 19
Closes gh-32280
2022-09-09 16:46:14 +01:00
Andy Wilkinson 144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson 78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2022-09-09 15:13:43 +01:00
Stephane Nicoll 6d0a504283 Start building against Spring Batch 4.3.7 snapshots
See gh-32271
2022-09-09 08:30:41 +02:00
Stephane Nicoll bb6307a506 Start building against Spring Kafka 2.8.9 snapshots
See gh-32270
2022-09-09 08:30:17 +02:00
Stephane Nicoll 91fb8b8b68 Start building against Spring AMQP 2.4.7 snapshots
See gh-32269
2022-09-09 08:29:48 +02:00
Stephane Nicoll b4e97b73a6 Start building against Spring Data 2021.1.7 snapshots
See gh-32268
2022-09-09 08:29:26 +02:00
Stephane Nicoll 0c5d5c331a Start building against Spring Framework 5.3.23 snapshots
See gh-32267
2022-09-09 08:28:59 +02:00
Stephane Nicoll 126c3cf0d8 Start building against Rector 2020.0.23 snapshots
See gh-32266
2022-09-09 08:28:34 +02:00
Stephane Nicoll 33b3a5f8bf Start building against Micrometer 1.8.10 snapshots
See gh-32265
2022-09-09 08:28:09 +02:00
Phillip Webb e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb 85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
Andy Wilkinson 020e6dd3f1 Merge branch '2.6.x' into 2.7.x
Closes gh-32260
2022-09-08 15:28:08 +01:00
Andy Wilkinson 280ce6390a Add NINETEEN to JavaVersion enum
Closes gh-32226
2022-09-08 15:25:34 +01:00
Stephane Nicoll 2fb257ad22 Merge branch '2.6.x' into 2.7.x
Closes gh-32247
2022-09-07 09:33:17 +02:00
Stephane Nicoll 19c69ff743 Polish "Add support for detecting .yml Hazelcast config files"
See gh-32142
2022-09-07 09:32:53 +02:00
Neil Stevenson 5eaafdee9a Add support for detecting .yml Hazelcast config files
See gh-32142
2022-09-07 09:20:32 +02:00
Stephane Nicoll 960b034875 Polish "Make sure Hazelcast shutdown logs are available"
See gh-32184
2022-09-07 09:07:29 +02:00
Łukasz Dziedziul 24f3b2b1b7 Make sure Hazelcast shutdown logs are available
See gh-32184
2022-09-07 08:53:01 +02:00
Stephane Nicoll 9ef067d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32244
2022-09-07 08:45:19 +02:00
valentine-dev 89e19ddab9 Support lower-case input in PeriodStyle
See gh-32235
2022-09-07 08:40:16 +02:00
Stephane Nicoll df0674c949 Upgrade to Postgresql 42.3.7
Closes gh-32243
2022-09-07 07:18:50 +02:00
Stephane Nicoll 7688444704 Upgrade to Postgresql 42.3.7
Closes gh-32242
2022-09-07 07:17:20 +02:00
Andy Wilkinson 2003cfdd43 Merge branch '2.6.x' into 2.7.x
Closes gh-32231
2022-09-05 15:42:28 +01:00
Andy Wilkinson bc23e70024 Polish "Support lower-case input in DurationStyle"
See gh-32223
2022-09-05 14:53:50 +01:00
valentine-dev c579c9378b Support lower-case input in DurationStyle
See gh-32223
2022-09-05 14:53:29 +01:00
Brian Clozel cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Brian Clozel 724f9ebf71 Support SnakeYaml 1.31
This commit keeps the managed dependency for SnakeYaml at 1.29 but
enables forward compatibility for SnakeYaml 1.31.

Closes gh-32228
2022-09-05 14:22:24 +02:00
Andy Wilkinson d9265f0a92 Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter 2022-09-05 13:55:19 +02:00
Scott Frederick 7763a5df7d Polish auto-configuration documentation
Remove references to outdated information, emphasize use of the
`@AutoConfiguration` annotation and attributes, and edit for clarity.

Closes gh-32174
2022-09-01 15:35:59 -05:00
Andy Wilkinson a253d8d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32198
2022-08-31 14:41:47 +01:00
Andy Wilkinson 7d983be769 Clarify docs on disabling HTTP client request metrics
Closes gh-32136
2022-08-31 14:36:07 +01:00
Andy Wilkinson 13edfba1f5 Fix Kotlin example for empty @DefaultValue constructor binding
Closes gh-32177
2022-08-31 11:35:58 +01:00
Phillip Webb 13c0cf7e2a Refine Javadoc to use @AutoConfiguration
See gh-32166
2022-08-25 11:48:07 -07:00
Phillip Webb e31c295ee9 Merge branch '2.6.x' into 2.7.x 2022-08-24 18:13:03 -07:00
Phillip Webb adc4e05eff Polish 2022-08-24 18:12:57 -07:00
Phillip Webb 10ded39217 Merge branch '2.6.x' into 2.7.x
Closes gh-32167
2022-08-24 17:33:50 -07:00
Phillip Webb 24c2daa99d Improve javadoc regarding use on @Bean methods
Closes gh-32166
2022-08-24 17:33:08 -07:00
Scott Frederick 257e236b06 Fix image-building unit tests on Windows
See gh-32000
2022-08-24 13:14:39 -05:00
Stephane Nicoll 7a91fa90d5 Merge branch '2.6.x' into 2.7.x
Closes gh-32145
2022-08-23 07:25:45 +02:00
Stephane Nicoll 7f2d4fceec Polish "Allow Netty default leak detection to be overidden"
See gh-32144
2022-08-23 07:20:49 +02:00
Russell You 51f2e40c69 Allow Netty default leak detection to be overidden
See gh-32144
2022-08-23 07:12:24 +02:00
Stephane Nicoll a6350b5992 Merge branch '2.6.x' into 2.7.x
Closes gh-32128
2022-08-22 06:38:38 +02:00
Stephane Nicoll 6d80b601b6 Upgrade to Testcontainers 1.17.3
Closes gh-32127
2022-08-22 06:37:56 +02:00
Scott Frederick c16094e04b Disable SELinux label security policy when building images
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
2022-08-19 13:56:34 -05:00
Phillip Webb 60e1cc510c Merge branch '2.6.x' into 2.7.x
See gh-32085
2022-08-17 12:48:21 -07:00
Phillip Webb bd74344025 Revert "Don't close jar files early"
This reverts commit b42f056ddb.
2022-08-17 11:38:42 -07:00
Phillip Webb 674022d401 Revert "Don't close nested jars or wrapper when parent is closed"
This reverts commit 360eb027be.
2022-08-17 11:37:19 -07:00
Stephane Nicoll 3fcfcc4a3b Merge branch '2.6.x' into 2.7.x
Closes gh-32103
2022-08-17 13:33:24 +02:00
Stephane Nicoll 3b01325c6b Use asList consistently
Closes gh-32102
2022-08-17 13:32:36 +02:00
Stephane Nicoll ca63a6e9ad Merge branch '2.6.x' into 2.7.x
Closes gh-32099
2022-08-17 09:10:02 +02:00
Stephane Nicoll 191593cf15 Review Git contribution documentation
Closes gh-31904
2022-08-17 08:58:56 +02:00
Stephane Nicoll 1c6624db44 Merge branch '2.6.x' into 2.7.x
Closes gh-32097
2022-08-17 08:34:38 +02:00
Stephane Nicoll e94ddfa589 Polish "Explicit error message if source is not an archive"
See gh-31997
2022-08-17 08:33:54 +02:00
Nils Hartmann a0f273a041 Explicit error message if source is not an archive
This commit split the existing assertion to provide an explicit error
message if the source file is not an archive.

See gh-31997
2022-08-17 08:30:03 +02:00
Stephane Nicoll 1b12ea71ee Upgrade to Undertow 2.2.19.Final
Closes gh-32090
2022-08-16 09:56:15 +02:00
Stephane Nicoll 464c2ed83a Upgrade to Maven Javadoc Plugin 3.4.1
Closes gh-32089
2022-08-16 09:56:11 +02:00
Stephane Nicoll 2550763669 Upgrade to Undertow 2.2.19.Final
Closes gh-32087
2022-08-16 08:46:00 +02:00
Stephane Nicoll 542267e244 Upgrade to Spring Security 5.7.3
Closes gh-32040
2022-08-16 07:14:53 +02:00
Stephane Nicoll fd89ced078 Upgrade to Spring Security 5.6.7
Closes gh-32039
2022-08-16 07:14:15 +02:00
Phillip Webb ef7aac8c14 Merge branch '2.6.x' into 2.7.x
Closes gh-32085
2022-08-15 17:59:06 -07:00
Phillip Webb 360eb027be Don't close nested jars or wrapper when parent is closed
Update `JarFile` so that the `close()` method no longer closes nested
jars or the wrapper. Prior to this commit it was possible for a parent
jar file to be garbage collected and closed even though references still
existed to the nested jars. When this happened the nested jars would get
closed and any access to entries would result in `JarFile.ensureOpen()`
throwing an `IllegalStateException`. The user would often not see this
exception directly, but rather find `ClassNotFoundException` being
thrown.

Fixes gh-31853
2022-08-15 17:55:25 -07:00
Andy Wilkinson 9caad3d31b Merge branch '2.6.x' into 2.7.x
Closes gh-32059
2022-08-10 12:28:26 +01:00
Andy Wilkinson c9e69f555e Test our Gradle plugin against Gradle 7.5.1
Closes gh-32058
2022-08-10 12:27:47 +01:00
Andy Wilkinson 0069fc831e Upgrade to Dependency Management Plugin 1.0.13.RELEASE
Closes gh-32056
2022-08-10 12:15:51 +01:00