From b79533fbb7d5fcfcbea63b003f0b5b77fb218000 Mon Sep 17 00:00:00 2001
From: Max Brauer <mbrauer@vmware.com>
Date: Wed, 17 Dec 2025 11:02:54 +0100
Subject: [PATCH] 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 <mbrauer@vmware.com>
---
 spring-cloud-dataflow-apps-plugin/pom.xml                 | 8 ++++----
 .../spring-cloud-dataflow-apps-docs-plugin/pom.xml        | 2 +-
 .../spring-cloud-dataflow-apps-generator-plugin/pom.xml   | 2 +-
 .../spring-cloud-dataflow-apps-metadata-plugin/pom.xml    | 2 +-
 .../dataflow/app/plugin/MetadataAggregationMojo.java      | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-dataflow-apps-plugin/pom.xml b/spring-cloud-dataflow-apps-plugin/pom.xml
index b4c9dcb18..a911c5baf 100644
--- a/spring-cloud-dataflow-apps-plugin/pom.xml
+++ b/spring-cloud-dataflow-apps-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>spring-cloud-dataflow-apps-plugin-parent</name>
 	<description>Spring Cloud Dataflow Apps Plugin Parent</description>
 	<packaging>pom</packaging>
@@ -37,9 +37,9 @@
 		<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
 		<commons.io.version>2.16.1</commons.io.version>
 		<commons-text.version>1.12.0</commons-text.version>
-		<spring-boot.version>3.4.10</spring-boot.version>
-		<spring.version>6.2.11</spring.version>
-		<spring-cloud.version>2024.0.2</spring-cloud.version>
+		<spring-boot.version>3.5.8</spring-boot.version>
+		<spring.version>6.2.14</spring.version>
+		<spring-cloud.version>2025.0.0</spring-cloud.version>
 	</properties>
   	<modules>
 		<module>spring-cloud-dataflow-apps-generator-plugin</module>
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml
index 7495814d9..d3144049e 100644
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-dataflow-apps-docs-plugin</artifactId>
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/pom.xml b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/pom.xml
index caf775f0e..358667a2a 100644
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/pom.xml
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
   <dependencies>
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/pom.xml b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/pom.xml
index 0e1172872..e05e3f2a4 100644
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/pom.xml
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<dependencies>
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java
index 75a931017..9e4e4117c 100644
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java
@@ -114,6 +114,8 @@ public class MetadataAggregationMojo extends AbstractMojo {
 	static {
 		KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.data.jdbc.JdbcDatabaseDialect");
 		KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.HttpClientProperties$Factory");
+		KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.AbstractHttpRequestFactoryProperties$Factory");
+		KNOWN_PROBLEMATIC_ENUMS.add("org.springframework.boot.autoconfigure.http.client.reactive.AbstractClientHttpConnectorProperties$Connector");
 	}
 
 	@Parameter(defaultValue = "${project}")