-
Notifications
You must be signed in to change notification settings - Fork 40.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
06604ef
commit 660dbb9
Showing
6 changed files
with
47 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 0 additions & 54 deletions
54
...ols/spring-boot-maven-plugin/src/intTest/projects/aot-development-only-exclusions/pom.xml
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
...st/projects/aot-development-only-exclusions/src/main/java/org/test/SampleApplication.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters