d11c5d3bd2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30048
2022-03-03 11:27:18 +00:00
c2bf0d551b
Polish RestController examples
...
See gh-30027
2022-03-03 11:26:11 +00:00
79fe503616
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30044
2022-03-03 10:33:52 +00:00
71dd607623
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30043
2022-03-03 10:33:40 +00:00
34e436ef6e
Accommodate SocketException when reading from stopped TunnelClient
...
TunnelClientTests stopTriggersTunnelClose expects that stopping the
client will cause an attempt to read from a connected channel to
return -1. With Java 17 on Windows the connection has been reset and
a SocketException is thrown instead. This seems reasonable as
stopping the client closes the ServerSocketChannel to which the test
was connected.
This commit updates test to expect a SocketException or a return
value of -1.
Closes gh-30042
2022-03-03 10:30:54 +00:00
936998647e
Work around Gradle changing line endings during property expansion
...
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.
This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).
Closes gh-30039
[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +00:00
0ca64d3b64
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30038
2022-03-02 15:56:04 +00:00
35e5b4329e
Provide complete dependency management for Netty tcNative
...
Closes gh-30010
2022-03-02 15:55:15 +00:00
b89c29f29c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30037
2022-03-02 15:24:10 +00:00
ea729fc1c6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30036
2022-03-02 15:21:43 +00:00
4073cf8334
Only apply special handling of META-INF to jar files
...
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.
This commit reworks the changes so that they only apply to jar files.
Closes gh-30026
2022-03-02 15:19:09 +00:00
324c4310a4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30034
2022-03-02 12:21:29 +00:00
8a4a639734
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30033
2022-03-02 12:21:20 +00:00
140d24d567
Remove redundant ConditionalOnMissingFilterBean
...
See gh-29983
2022-03-02 11:40:44 +00:00
a33dd254c8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30032
2022-03-02 11:22:12 +00:00
1ac1782e21
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30031
2022-03-02 11:21:56 +00:00
35f9358eb2
Manage more of Kafka's modules
...
Closes gh-29023
2022-03-02 11:06:25 +00:00
07b87668a4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30023
2022-03-01 17:49:31 +00:00
3630952f7b
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30022
2022-03-01 17:49:14 +00:00
a265f150ac
Improve parsing of numeric default values
...
Previously, all integral numbers were parsed as integers. This
caused two problems:
1. Compilation would fail if the default value for a long wasn't a
valid integer.
2. The default value for a byte or short could be out of range,
resulting in the generation of invalid metadata and an error
that could have been caught at compile time not being caught
until runtime.
This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.
Fixes gh-30020
2022-03-01 17:38:19 +00:00
0072cc807c
Suppress deprecation warnings caused by micrometer backwards compatability
2022-03-01 14:00:27 +01:00
97c47123d5
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30019
2022-03-01 12:35:57 +00:00
c8b849e2f6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30018
2022-03-01 12:32:07 +00:00
355f80ab98
Add links to Spring Boot for Apache Geode and its documentation
...
Closes gh-29697
2022-03-01 12:13:58 +00:00
9c958669f4
Add io.micrometer:micrometer-binders as dependency to the test suite
2022-03-01 11:56:43 +01:00
7897a913a7
Start building against Micrometer 1.9.0-M4 snapshots
...
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.
See gh-30014
2022-03-01 09:20:07 +01:00
19b5431ba4
Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
...
See gh-29976
2022-02-28 11:16:04 +00:00
5a52b36ec7
Remove redundant ResourceLoaders from GraphQL auto-configuration
...
See gh-29976
2022-02-28 11:16:04 +00:00
73d0d5bccf
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30009
2022-02-28 11:15:24 +00:00
b379eea885
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30008
2022-02-28 11:15:02 +00:00
7bc336cdc6
Use an ephemeral port to avoid potential port clash
...
Closes gh-30007
2022-02-28 10:54:31 +00:00
e24f5b7efd
Revert "Upgrade to Embedded Mongo 3.4.1"
...
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
2022-02-24 11:00:00 -08:00
90c2bf192e
Upgrade to Liquibase 4.8.0
...
Closes gh-29987
2022-02-24 15:36:07 +01:00
1bb498b03c
Upgrade to Flyway 8.5.1
...
Closes gh-29986
2022-02-24 15:36:00 +01:00
525d5fd6e5
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29994
2022-02-24 15:12:36 +01:00
0941cfd5fe
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29993
2022-02-24 15:12:26 +01:00
b60b5feefe
Add explicit dependency on inject-api
...
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.
Closes gh-29990
2022-02-24 15:12:09 +01:00
664ecbdcc1
Polish "Add DataCouchbaseTest annotation"
...
See gh-29912
2022-02-24 12:05:36 +00:00
36e52758a7
Add DataCouchbaseTest annotation
...
See gh-29912
2022-02-24 11:45:09 +00:00
53292a1f94
Polish "Add DataElasticsearchTest annotation"
...
See gh-29911
2022-02-24 11:21:24 +00:00
e22f78bc6a
Add DataElasticsearchTest annotation
...
See gh-29911
2022-02-24 10:27:20 +00:00
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
1a3841f74e
Polish
2022-02-23 21:44:14 -08:00
9411fc264d
Merge branch '2.5.x' into 2.6.x
2022-02-23 21:44:08 -08:00
57009d5623
Polish
2022-02-23 21:43:42 -08:00
ee4e7bb923
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29982
2022-02-23 17:56:34 -06:00
59ffe28639
Ignore buildpack deprecation warnings in Paketo system tests
...
Fixes gh-29885
2022-02-23 17:56:21 -06:00
729c6993e1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29981
2022-02-23 15:29:36 -08:00
acd1ba0eca
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29980
2022-02-23 15:28:17 -08:00
67b13ee4c7
Document that placeholders in @DefaultValue annotations are not resolved
...
Closes gh-23164
2022-02-23 15:27:43 -08:00
0ecf43dbe2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29979
2022-02-23 15:10:30 -08:00
894860c177
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29978
2022-02-23 15:10:12 -08:00
cc95f734d7
Clarify relation of import path to resultant properties in configtree import data
...
Closes gh-29606
2022-02-23 15:09:42 -08:00
46b6dc29c1
Upgrade to Spring Batch 4.3.5
...
Closes gh-29652
2022-02-23 17:10:35 +01:00
8147aff76a
Upgrade to Spring Batch 4.3.5
...
Closes gh-29724
2022-02-23 17:04:59 +01:00
f864505ea7
Upgrade to Netty tcNative 2.0.50.Final
...
Closes gh-29974
2022-02-23 17:04:40 +01:00
479a4e693c
Upgrade to Spring Batch 4.3.5
...
Closes gh-29714
2022-02-23 16:58:39 +01:00
773b025208
Upgrade to Netty tcNative 2.0.50.Final
...
Closes gh-29973
2022-02-23 16:57:32 +01:00
d1ab3f5f78
Upgrade to Spring Session 2021.1.2
...
Closes gh-29725
2022-02-23 16:19:26 +01:00
776ccf77a7
Upgrade to Spring Session 2021.0.5
...
Closes gh-29715
2022-02-23 16:17:52 +01:00
fd36215d72
Omit empty values for AutoConfigureAfter and AutoConfigureBefore
...
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.
One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore
See gh-29907
2022-02-23 15:39:46 +01:00
7872f61bfc
Add @AutoConfiguration annotation support to the autoconfigure-processor
...
See gh-29907
2022-02-23 15:39:46 +01:00
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
9e9049ca7f
Add relative ordering to @AutoConfiguration
...
The relative ordering is implemented with @AliasFor annotations on the
@AutoConfiguration annotation. The production code already works without
changes, only the test code had to be modified. It now uses
AnnotationMetadata which already knows how to deal with @AliasFor
instead of using the reflection API directly.
See gh-29907
2022-02-23 15:39:41 +01:00
57cd34be88
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29971
2022-02-23 11:53:09 +00:00
a979925e63
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29970
2022-02-23 11:52:57 +00:00
7aca75c58c
Preserve ObjectName property order when name is unchanged
...
Closes gh-29953
2022-02-23 11:30:21 +00:00
1ae46dee6d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29967
2022-02-23 08:59:33 +00:00
4f8a18fa0a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29966
2022-02-23 08:59:16 +00:00
9c9e04b8e4
Use mainClass rather than deprecated main in BootRun examples
...
Closes gh-29965
2022-02-23 08:59:04 +00:00
da404e12fc
Upgrade to Spring Integration 5.5.9
...
Closes gh-29964
2022-02-23 08:36:44 +01:00
60637b7aaa
Upgrade to Spring Kafka 2.8.3
...
Closes gh-29759
2022-02-23 08:35:56 +01:00
9e3891a0fe
Upgrade to Spring Integration 5.5.9
...
Closes gh-29963
2022-02-23 08:29:23 +01:00
c8b7a17545
Upgrade to Spring Kafka 2.8.3
...
Closes gh-29722
2022-02-23 08:27:24 +01:00
ee7426a555
Upgrade to Spring Integration 5.5.9
...
Closes gh-29962
2022-02-23 08:21:14 +01:00
3f2d01628d
Upgrade to Spring Kafka 2.7.11
...
Closes gh-29712
2022-02-23 08:19:08 +01:00
64b8610c2e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29960
2022-02-22 15:51:35 -08:00
880db30c67
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29959
2022-02-22 15:49:18 -08:00
a70fa80571
Rectify incorrect sanitizing regex example provided in how-to docs
...
Closes gh-29951
2022-02-22 15:44:50 -08:00
c1fec6967e
Support constructor injection for FailureAnalyzers
...
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.
Closes gh-29811
2022-02-22 14:24:59 -06:00
2d9177dd9d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29955
2022-02-22 20:11:47 +00:00
3614c8d1f8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29954
2022-02-22 20:08:31 +00:00
1e8d29f7aa
Configure Kotlin compilation JVM target by convention
...
Closes gh-29952
2022-02-22 18:11:51 +00:00
288533ba4a
Upgrade to WebJars Locator Core 0.50
...
Closes gh-29948
2022-02-22 14:56:51 +01:00
9cec66bef8
Upgrade to UnboundID LDAPSDK 6.0.3
...
Closes gh-29947
2022-02-22 14:56:50 +01:00
2406e48b5c
Upgrade to MSSQL JDBC 10.2.0.jre8
...
Closes gh-29946
2022-02-22 14:56:50 +01:00
1816f46c19
Upgrade to MariaDB 3.0.3
...
Closes gh-29945
2022-02-22 14:56:50 +01:00
dda3bae02a
Upgrade to Embedded Mongo 3.4.1
...
Closes gh-29944
2022-02-22 14:56:50 +01:00
6bdbfbab9a
Upgrade to AppEngine SDK 1.9.95
...
Closes gh-29943
2022-02-22 14:23:39 +01:00
d6105c7122
Upgrade to Postgresql 42.3.3
...
Closes gh-29941
2022-02-22 08:47:38 +01:00
6e0f664bbe
Upgrade to Netty tcNative 2.0.49.Final
...
Closes gh-29940
2022-02-22 08:47:35 +01:00
2617eeb1fd
Upgrade to Jetty Reactive HTTPClient 1.1.11
...
Closes gh-29939
2022-02-22 08:47:32 +01:00
8daa8e2307
Upgrade to AppEngine SDK 1.9.95
...
Closes gh-29938
2022-02-22 08:47:30 +01:00
2bd58f8f9b
Upgrade to ActiveMQ 5.16.4
...
Closes gh-29937
2022-02-22 08:47:27 +01:00
49337f30da
Upgrade to Netty tcNative 2.0.49.Final
...
Closes gh-29936
2022-02-22 08:43:16 +01:00
d4db26dcc1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29935
2022-02-22 08:30:47 +01:00
db26aff792
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29934
2022-02-22 08:30:38 +01:00
7b48c51689
Clarify that any property of the environment can be used in a banner
...
See gh-29931
2022-02-22 08:30:07 +01:00
da96eeab21
Remove redundant requestMappingHandlerMapping override
...
The bean no longer needs to be primary so the override is not needed
any more.
Closes gh-29682
2022-02-21 18:59:29 +00:00
Andy Wilkinson
wonwoo
izeye
Moritz Halbritter
dugenkui03
Madhura Bhave
Stephane Nicoll
Eddú Meléndez
Phillip Webb
Scott Frederick
UbaidurRehman1