From 939e760e42cbc0e4e9a0e947c072f72687dbdd5b Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Wed, 3 Apr 2024 17:07:45 +0200
Subject: [PATCH] Update plugin samples

---
 applications/stream-applications-core/pom.xml | 10 ++++------
 .../.mvn/wrapper/maven-wrapper.properties     |  2 +-
 .../resources/unit/http-source-apps/pom.xml   | 19 +++++++++----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index b7ed5ba8..204dd7a6 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -17,12 +17,11 @@
 
     <properties>
         <stream-apps-core.version>5.0.0-SNAPSHOT</stream-apps-core.version>
-        <java-functions.version>5.0.0-M2</java-functions.version>
-        <apps.base-image>springcloud/baseimage:1.0.4</apps.base-image>
+        <java-functions.version>5.0.0-SNAPSHOT</java-functions.version>
 		<prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
-        <spring-cloud-dataflow-apps-generator-plugin.version>1.0.12</spring-cloud-dataflow-apps-generator-plugin.version>
-        <spring-cloud-dataflow-apps-docs-plugin.version>1.0.12</spring-cloud-dataflow-apps-docs-plugin.version>
-        <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.12</spring-cloud-dataflow-apps-metadata-plugin.version>
+        <spring-cloud-dataflow-apps-generator-plugin.version>1.0.13-SNAPSHOT</spring-cloud-dataflow-apps-generator-plugin.version>
+        <spring-cloud-dataflow-apps-docs-plugin.version>1.0.13-SNAPSHOT</spring-cloud-dataflow-apps-docs-plugin.version>
+        <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.13-SNAPSHOT</spring-cloud-dataflow-apps-metadata-plugin.version>
         <java-cfenv-boot.version>2.4.1</java-cfenv-boot.version>
     </properties>
 
@@ -139,7 +138,6 @@
                                 <bootVersion>${spring-boot.version}</bootVersion>
                                 <containerImage>
                                     <orgName>springcloudstream</orgName>
-                                    <baseImage>${apps.base-image}</baseImage>
                                     <enableMetadata>true</enableMetadata>
                                 </containerImage>
                                 <properties>
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/.mvn/wrapper/maven-wrapper.properties
index 06d5d2f8..3be38087 100755
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/.mvn/wrapper/maven-wrapper.properties
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
\ No newline at end of file
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
diff --git a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/test/resources/unit/http-source-apps/pom.xml b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/test/resources/unit/http-source-apps/pom.xml
index e8da6f4a..9911b0f1 100644
--- a/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/test/resources/unit/http-source-apps/pom.xml
+++ b/spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin/src/test/resources/unit/http-source-apps/pom.xml
@@ -11,17 +11,16 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<spring-boot.version>2.3.0.M1</spring-boot.version>
-		<stream-apps-core.version>3.0.0.BUILD-SNAPSHOT</stream-apps-core.version>
-		<java-cfenv-boot.version>2.1.1.RELEASE</java-cfenv-boot.version>
-		<app-metadata-maven-plugin-version>1.0.2.BUILD-SNAPSHOT</app-metadata-maven-plugin-version>
+		<spring-boot.version>3.3.0.M3</spring-boot.version>
+		<stream-apps-core.version>5.0.0-SNAPSHOT</stream-apps-core.version>
+		<java-cfenv-boot.version>2.4.1</java-cfenv-boot.version>
+		<app-metadata-maven-plugin-version>1.0.13-SNAPSHOT</app-metadata-maven-plugin-version>
 
 		<!-- Emulate the properties that otherwise should come from the stream-apps-parent parent -->
-		<java-functions.version>1.0.0.BUILD-SNAPSHOT</java-functions.version>
-		<spring-cloud-dependencies.version>Hoxton.RELEASE</spring-cloud-dependencies.version>
-		<spring-cloud-stream-dependencies.version>Horsham.SR2</spring-cloud-stream-dependencies.version>
-		<spring-cloud-function-dependencies.version>3.0.2.RELEASE</spring-cloud-function-dependencies.version>
-		<apps.base-image>springcloud/baseimage:1.0.4</apps.base-image>
+		<java-functions.version>5.0.0-SNAPSHOT</java-functions.version>
+		<spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
+		<spring-cloud-stream-dependencies.version>4.1.1</spring-cloud-stream-dependencies.version>
+		<spring-cloud-function-dependencies.version>4.1.1</spring-cloud-function-dependencies.version>
 	</properties>
 
 	<build>
@@ -45,7 +44,7 @@
 							<application>
 								<bootVersion>${spring-boot.version}</bootVersion>
 								<metadata>
-									<mavenPluginVersion>2.0.2.BUILD-SNAPSHOT</mavenPluginVersion>
+									<mavenPluginVersion>3.3.0-M1</mavenPluginVersion>
 								</metadata>
 								<containerImage>
 									<orgName>globalOrgName</orgName>