Skip to content

Commit b79533f

Browse files
committed
feat(plugin): support Spring Boot 3.5.x
In particular, this allows for the presence of the new `ignored` field in metadata objects. Spring Boot 3.5.x added an `ignored` field to configuration metadata. This caused the plugin's JsonMarshaller to fail. By upgrading to Spring Boot 3.5.8 (as well as Spring Framework 6.2.14 / Spring Cloud 2025.0.0) the plugin supports the new metadata format. Adds new KNOWN_PROBLEMATIC_ENUMS to resolve ClassNotFoundException errors during enum introspection in the metadata aggregation plugin. Signed-off-by: Max Brauer <[email protected]>
1 parent 921e140 commit b79533f

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

spring-cloud-dataflow-apps-plugin/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.cloud</groupId>
55
<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
6-
<version>1.1.2-SNAPSHOT</version>
6+
<version>1.2.0-SNAPSHOT</version>
77
<name>spring-cloud-dataflow-apps-plugin-parent</name>
88
<description>Spring Cloud Dataflow Apps Plugin Parent</description>
99
<packaging>pom</packaging>
@@ -37,9 +37,9 @@
3737
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
3838
<commons.io.version>2.16.1</commons.io.version>
3939
<commons-text.version>1.12.0</commons-text.version>
40-
<spring-boot.version>3.4.10</spring-boot.version>
41-
<spring.version>6.2.11</spring.version>
42-
<spring-cloud.version>2024.0.2</spring-cloud.version>
40+
<spring-boot.version>3.5.8</spring-boot.version>
41+
<spring.version>6.2.14</spring.version>
42+
<spring-cloud.version>2025.0.0</spring-cloud.version>
4343
</properties>
4444
<modules>
4545
<module>spring-cloud-dataflow-apps-generator-plugin</module>

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
8-
<version>1.1.2-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
<relativePath>..</relativePath>
1010
</parent>
1111
<artifactId>spring-cloud-dataflow-apps-docs-plugin</artifactId>

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.springframework.cloud</groupId>
1111
<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
12-
<version>1.1.2-SNAPSHOT</version>
12+
<version>1.2.0-SNAPSHOT</version>
1313
<relativePath>..</relativePath>
1414
</parent>
1515
<dependencies>

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
10-
<version>1.1.2-SNAPSHOT</version>
10+
<version>1.2.0-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313
<dependencies>

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ public class MetadataAggregationMojo extends AbstractMojo {
114114
static {
115115
KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.data.jdbc.JdbcDatabaseDialect");
116116
KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.HttpClientProperties$Factory");
117+
KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.AbstractHttpRequestFactoryProperties$Factory");
118+
KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.reactive.AbstractClientHttpConnectorProperties$Connector");
117119
}
118120

119121
@Parameter(defaultValue = "${project}")

0 commit comments

Comments
 (0)