Andy Wilkinson
660dbb9afd
Fix Maven-built native images with Docker Compose dependency
...
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.
This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.
Fixes gh-35676
2023-06-21 11:44:30 +01:00
Andy Wilkinson
06604ef5ed
Merge branch '3.0.x' into 3.1.x
2023-06-21 11:07:00 +01:00
Andy Wilkinson
35ee52275e
Upgrade to Spring Integration 6.0.6
...
Closes gh-35740
2023-06-21 11:06:49 +01:00
Andy Wilkinson
5384872cbd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36003
2023-06-21 11:02:47 +01:00
Andy Wilkinson
2fd5319eda
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36002
2023-06-21 11:02:34 +01:00
Andy Wilkinson
0fb4c9a095
Prohibit upgrades to RSocket 1.1.4
...
Closes gh-35798
2023-06-21 10:55:48 +01:00
Andy Wilkinson
5cda56cc68
Upgrade to Spring Integration 6.1.1
...
Closes gh-35859
2023-06-21 10:51:42 +01:00
Andy Wilkinson
853caf9a59
Do not exclude DevTools from Maven AOT processing classpath
...
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.
Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.
Fixes gh-35853
2023-06-21 10:36:38 +01:00
Stephane Nicoll
9a2b9cb066
Merge branch '3.0.x' into 3.1.x
2023-06-20 17:46:14 +02:00
Stephane Nicoll
0c46af9452
Merge branch '2.7.x' into 3.0.x
2023-06-20 17:46:03 +02:00
Stephane Nicoll
75ca6030a8
Upgrade to Spring Session 3.1.1
...
Closes gh-35755
2023-06-20 17:29:28 +02:00
Stephane Nicoll
424e8e6924
Upgrade to Spring Security 6.1.1
...
Closes gh-35754
2023-06-20 17:29:28 +02:00
Stephane Nicoll
da6cbfd5fe
Upgrade to Spring Kafka 3.0.8
...
Closes gh-36000
2023-06-20 17:29:27 +02:00
Stephane Nicoll
81f1961e27
Upgrade to Spring GraphQL 1.2.1
...
Closes gh-35752
2023-06-20 17:29:22 +02:00
Stephane Nicoll
a2b7fc8661
Upgrade to Spring Authorization Server 1.1.1
...
Closes gh-35749
2023-06-20 17:29:21 +02:00
Stephane Nicoll
8d351ffb1f
Upgrade to Spring AMQP 3.0.5
...
Closes gh-35748
2023-06-20 17:29:21 +02:00
Stephane Nicoll
0c32ce4214
Upgrade to REST Assured 5.3.1
...
Closes gh-35999
2023-06-20 17:29:20 +02:00
Stephane Nicoll
a7f8b82905
Upgrade to Netty 4.1.94.Final
...
Closes gh-35998
2023-06-20 17:29:15 +02:00
Stephane Nicoll
b85184e358
Upgrade to Native Build Tools Plugin 0.9.23
...
Closes gh-35997
2023-06-20 17:29:09 +02:00
Stephane Nicoll
264c01c8db
Upgrade to Infinispan 14.0.11.Final
...
Closes gh-35996
2023-06-20 17:29:04 +02:00
Stephane Nicoll
2815e83096
Upgrade to HttpCore5 5.2.2
...
Closes gh-35995
2023-06-20 17:28:58 +02:00
Stephane Nicoll
21046c0611
Upgrade to Hibernate 6.2.5.Final
...
Closes gh-35994
2023-06-20 17:28:53 +02:00
Stephane Nicoll
4c06dc49b3
Upgrade to Spring Session 3.0.2
...
Closes gh-35744
2023-06-20 16:59:47 +02:00
Stephane Nicoll
cf955671d8
Upgrade to Spring Security 6.0.4
...
Closes gh-35743
2023-06-20 16:59:46 +02:00
Stephane Nicoll
6066fb53ed
Upgrade to Spring Kafka 3.0.8
...
Closes gh-35993
2023-06-20 16:59:46 +02:00
Stephane Nicoll
0b582651b3
Upgrade to Spring GraphQL 1.1.5
...
Closes gh-35775
2023-06-20 16:59:41 +02:00
Stephane Nicoll
1940d876c3
Upgrade to Spring AMQP 3.0.5
...
Closes gh-35737
2023-06-20 16:59:40 +02:00
Stephane Nicoll
a7d71a3921
Upgrade to Netty 4.1.94.Final
...
Closes gh-35992
2023-06-20 16:59:40 +02:00
Stephane Nicoll
b65ea1212a
Upgrade to Native Build Tools Plugin 0.9.23
...
Closes gh-35991
2023-06-20 16:59:34 +02:00
Stephane Nicoll
3e3428af95
Upgrade to Infinispan 14.0.11.Final
...
Closes gh-35990
2023-06-20 16:59:29 +02:00
Stephane Nicoll
e7f6faf6ae
Upgrade to Hazelcast 5.1.7
...
Closes gh-35989
2023-06-20 16:59:23 +02:00
Stephane Nicoll
cb5330fd11
Upgrade to Spring Session Bom 2021.2.2
...
Closes gh-35731
2023-06-20 16:57:04 +02:00
Stephane Nicoll
b0af370038
Upgrade to Spring Security 5.7.9
...
Closes gh-35730
2023-06-20 16:57:03 +02:00
Stephane Nicoll
f206f1807f
Upgrade to Netty 4.1.94.Final
...
Closes gh-35988
2023-06-20 16:57:03 +02:00
Stephane Nicoll
0dd93de05d
Upgrade to Hazelcast 5.1.7
...
Closes gh-35987
2023-06-20 16:56:56 +02:00
Moritz Halbritter
cbbbecce37
Merge branch '3.0.x' into 3.1.x
2023-06-19 21:04:09 +02:00
Moritz Halbritter
975e2d110c
Polish CompositePropagationFactory
...
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Stephane Nicoll
21c3e411db
Merge branch '3.0.x' into 3.1.x
2023-06-17 17:17:45 +02:00
Stephane Nicoll
0a23e724ee
Merge branch '2.7.x' into 3.0.x
2023-06-17 17:17:31 +02:00
Stephane Nicoll
30d5a988a9
Upgrade to Spring Retry 2.0.2
...
Closes gh-35753
2023-06-17 17:17:16 +02:00
Stephane Nicoll
139873733d
Upgrade to Spring Data Bom 2023.0.1
...
Closes gh-35750
2023-06-17 17:17:16 +02:00
Stephane Nicoll
607c155d4c
Upgrade to Spring Retry 2.0.2
...
Closes gh-35742
2023-06-17 17:14:33 +02:00
Stephane Nicoll
3194edefbd
Upgrade to Spring LDAP 3.0.4
...
Closes gh-35741
2023-06-17 17:14:32 +02:00
Stephane Nicoll
381857b3d3
Upgrade to Spring Data Bom 2022.0.7
...
Closes gh-35738
2023-06-17 17:14:32 +02:00
Stephane Nicoll
33341f241d
Upgrade to Spring Data Bom 2021.2.13
...
Closes gh-35728
2023-06-17 17:03:11 +02:00
Stephane Nicoll
b4b6477899
Upgrade to Spring AMQP 2.4.13
...
Closes gh-35727
2023-06-17 17:03:10 +02:00
Phillip Webb
3d6c6a6611
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35934
2023-06-16 16:15:04 -07:00
Phillip Webb
af846da69b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb
efa072204a
Don't migrate properties that cause a circular reference
...
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.
Fixes gh-35919
2023-06-16 16:14:41 -07:00
Phillip Webb
2f39ebfe89
Polish
2023-06-16 15:23:12 -07:00