SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Apps Plugin] Fix Spring Boot plugin config (#611)

Browse Source 
The recent JIB removal broke the Spring Boot plugin config generation
due to a Mustache complication with nested sections. This fixes that
by ensuring that the `<image>` configuration is always present regardless
of what the user configures.
This commit is contained in:
Chris Bono
2025-01-19 18:11:49 -06:00
committed by GitHub
parent 561f6a819a
commit 495c76236e
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/SpringCloudStreamAppGeneratorMojo.java
View File

@@ -306,7 +306,7 @@ public class SpringCloudStreamAppGeneratorMojo extends AbstractMojo {
})
.collect(Collectors.toList());
app.setBootPluginConfiguration(this.application.getBootPluginConfiguration());
app.setBootPluginConfiguration(deriveBootPluginConfiguration());
// ----------------------------------------------------------------------------------------------------------
// Project Generator
@@ -325,6 +325,18 @@ public class SpringCloudStreamAppGeneratorMojo extends AbstractMojo {
}
}
private String deriveBootPluginConfiguration() {
String imageInfo = "<image><name>{{app.containerImage.orgName}}/${project.artifactId}:{{app.containerImage.tag}}</name></image>";
String bootPluginConfig = this.application.getBootPluginConfiguration();
if (!StringUtils.hasText(bootPluginConfig)) {
return "<![CDATA[%n%s%n]]>".formatted(imageInfo);
}
if (bootPluginConfig.contains("<image>") && bootPluginConfig.contains("</image>")) {
return bootPluginConfig;
}
return bootPluginConfig.replace("<![CDATA[", "<![CDATA[%n%s%n".formatted(imageInfo));
}
private boolean isSameArtifact(Dependency dep1, Dependency dep2) {
return dep1.getGroupId().equalsIgnoreCase(dep2.getGroupId())
&& dep1.getArtifactId().equalsIgnoreCase(dep2.getArtifactId());

24
spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/app-pom.xml
View File

@@ -135,21 +135,15 @@
{{this}}
{{/app-binder.maven.plugins}}
<!-- (end) additional plugins -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>{{app.containerImage.orgName}}/${project.artifactId}:{{app.containerImage.tag}}</name>
</image>
<!-- extra configuration -->
{{#app.bootPluginConfiguration}}
{{this}}
{{/app.bootPluginConfiguration}}
<!-- (end) extra configuration -->
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
{{#app.bootPluginConfiguration}}
<configuration>
{{this}}
</configuration>
{{/app.bootPluginConfiguration}}
</plugin>
{{#app.containerImage.enableMetadata}}
<!--

2
spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/test/java/org/springframework/cloud/dataflow/app/plugin/SpringCloudStreamAppGeneratorMojoTest.java
View File

@@ -160,7 +160,7 @@ public class SpringCloudStreamAppGeneratorMojoTest {
final Plugin plugin = bootPlugin.get();
final Xpp3Dom configuration = (Xpp3Dom) plugin.getConfiguration();
assertThat(configuration).isNotNull();
String configurationString = configuration.toString();
String configurationString = configuration.getValue();
assertThat(configurationString).contains("<requiresUnpack>");
assertThat(configurationString).contains("jython-standalone");
assertThat(configurationString).contains("</requiresUnpack>");