Phillip Webb
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
Phillip Webb
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
Phillip Webb
1a3841f74e
Polish
2022-02-23 21:44:14 -08:00
Phillip Webb
9411fc264d
Merge branch '2.5.x' into 2.6.x
2022-02-23 21:44:08 -08:00
Phillip Webb
57009d5623
Polish
2022-02-23 21:43:42 -08:00
Scott Frederick
df549190b5
Merge branch '2.7.x'
2022-02-23 17:56:55 -06:00
Scott Frederick
ee4e7bb923
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29982
2022-02-23 17:56:34 -06:00
Scott Frederick
59ffe28639
Ignore buildpack deprecation warnings in Paketo system tests
...
Fixes gh-29885
2022-02-23 17:56:21 -06:00
Madhura Bhave
a7c7a8ef2f
Merge branch '2.7.x' into main
2022-02-23 15:30:51 -08:00
Madhura Bhave
729c6993e1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29981
2022-02-23 15:29:36 -08:00
Madhura Bhave
acd1ba0eca
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29980
2022-02-23 15:28:17 -08:00
Madhura Bhave
67b13ee4c7
Document that placeholders in @DefaultValue annotations are not resolved
...
Closes gh-23164
2022-02-23 15:27:43 -08:00
Madhura Bhave
f9d33ec1e2
Merge branch '2.7.x' into main
2022-02-23 15:10:48 -08:00
Madhura Bhave
0ecf43dbe2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29979
2022-02-23 15:10:30 -08:00
Madhura Bhave
894860c177
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29978
2022-02-23 15:10:12 -08:00
Madhura Bhave
cc95f734d7
Clarify relation of import path to resultant properties in configtree import data
...
Closes gh-29606
2022-02-23 15:09:42 -08:00
Stephane Nicoll
7f71f71963
Merge branch '2.7.x'
2022-02-23 17:11:01 +01:00
Stephane Nicoll
d43c4e9641
Merge branch '2.6.x' into 2.7.x
2022-02-23 17:10:49 +01:00
Stephane Nicoll
46b6dc29c1
Upgrade to Spring Batch 4.3.5
...
Closes gh-29652
2022-02-23 17:10:35 +01:00
Stephane Nicoll
4e4e3f1f49
Merge branch '2.5.x' into 2.6.x
2022-02-23 17:06:45 +01:00
Stephane Nicoll
8147aff76a
Upgrade to Spring Batch 4.3.5
...
Closes gh-29724
2022-02-23 17:04:59 +01:00
Stephane Nicoll
f864505ea7
Upgrade to Netty tcNative 2.0.50.Final
...
Closes gh-29974
2022-02-23 17:04:40 +01:00
Stephane Nicoll
479a4e693c
Upgrade to Spring Batch 4.3.5
...
Closes gh-29714
2022-02-23 16:58:39 +01:00
Stephane Nicoll
773b025208
Upgrade to Netty tcNative 2.0.50.Final
...
Closes gh-29973
2022-02-23 16:57:32 +01:00
Stephane Nicoll
79336e4152
Merge branch '2.7.x'
2022-02-23 16:20:42 +01:00
Stephane Nicoll
8483735303
Merge branch '2.6.x' into 2.7.x
2022-02-23 16:20:31 +01:00
Stephane Nicoll
e3b0cdd435
Merge branch '2.5.x' into 2.6.x
2022-02-23 16:19:51 +01:00
Stephane Nicoll
d1ab3f5f78
Upgrade to Spring Session 2021.1.2
...
Closes gh-29725
2022-02-23 16:19:26 +01:00
Stephane Nicoll
776ccf77a7
Upgrade to Spring Session 2021.0.5
...
Closes gh-29715
2022-02-23 16:17:52 +01:00
Moritz Halbritter
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
Moritz Halbritter
b68cd2ea78
Merge branch 'mh/29907' into 2.7.x
...
Closes gh-29907
2022-02-23 15:44:59 +01:00
Moritz Halbritter
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
Moritz Halbritter
7872f61bfc
Add @AutoConfiguration annotation support to the autoconfigure-processor
...
See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
Moritz Halbritter
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
Andy Wilkinson
d427fa4b5d
Merge branch '2.7.x'
2022-02-23 11:53:31 +00:00
Andy Wilkinson
57cd34be88
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29971
2022-02-23 11:53:09 +00:00
Andy Wilkinson
a979925e63
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29970
2022-02-23 11:52:57 +00:00
Andy Wilkinson
7aca75c58c
Preserve ObjectName property order when name is unchanged
...
Closes gh-29953
2022-02-23 11:30:21 +00:00
Andy Wilkinson
6051a10d4a
Merge branch '2.7.x'
2022-02-23 09:01:26 +00:00
Andy Wilkinson
1ae46dee6d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29967
2022-02-23 08:59:33 +00:00
Andy Wilkinson
4f8a18fa0a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29966
2022-02-23 08:59:16 +00:00
Andy Wilkinson
9c9e04b8e4
Use mainClass rather than deprecated main in BootRun examples
...
Closes gh-29965
2022-02-23 08:59:04 +00:00
Stephane Nicoll
e9a9934b6b
Merge branch '2.7.x'
2022-02-23 08:37:14 +01:00
Stephane Nicoll
b42f21c5a6
Merge branch '2.6.x' into 2.7.x
2022-02-23 08:37:05 +01:00
Stephane Nicoll
da404e12fc
Upgrade to Spring Integration 5.5.9
...
Closes gh-29964
2022-02-23 08:36:44 +01:00
Stephane Nicoll
60637b7aaa
Upgrade to Spring Kafka 2.8.3
...
Closes gh-29759
2022-02-23 08:35:56 +01:00
Stephane Nicoll
fc964e5bce
Merge branch '2.5.x' into 2.6.x
2022-02-23 08:35:07 +01:00
Stephane Nicoll
9e3891a0fe
Upgrade to Spring Integration 5.5.9
...
Closes gh-29963
2022-02-23 08:29:23 +01:00
