From a1362d54557dfd432cebcf97b2db20bf77d98ae4 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Thu, 15 Oct 2020 15:58:57 -0400
Subject: [PATCH] Version cleanup.

Removing spring-cloud-dependencies from apps.
---
 .../source/cdc-debezium-source/pom.xml        |  8 ++++--
 applications/source/rabbit-source/pom.xml     |  8 ++----
 applications/stream-applications-core/pom.xml |  7 -----
 stream-applications-build/pom.xml             | 28 ++++++++-----------
 4 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/applications/source/cdc-debezium-source/pom.xml b/applications/source/cdc-debezium-source/pom.xml
index d4be4133..2b791441 100644
--- a/applications/source/cdc-debezium-source/pom.xml
+++ b/applications/source/cdc-debezium-source/pom.xml
@@ -15,6 +15,10 @@
         <relativePath/>
     </parent>
 
+    <properties>
+        <json-unit.version>1.25.1</json-unit.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>
@@ -51,14 +55,12 @@
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit</artifactId>
-            <version>1.25.1</version>
+            <version>${json-unit.version}</version>
             <scope>test</scope>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka</artifactId>
-            <!-- 3.0.8.BUILD-SNAPSHOT or newer is required because of an issue with the KafkaNullConverter -->
-			<version>3.0.8.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/applications/source/rabbit-source/pom.xml b/applications/source/rabbit-source/pom.xml
index 57b1ba17..fcf4fcb5 100644
--- a/applications/source/rabbit-source/pom.xml
+++ b/applications/source/rabbit-source/pom.xml
@@ -14,9 +14,7 @@
         <version>3.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <properties>
-        <test-containers-version>1.14.2</test-containers-version>
-    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -41,13 +39,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${test-containers-version}</version>
+            <version>${test-containers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>rabbitmq</artifactId>
-            <version>${test-containers-version}</version>
+            <version>${test-containers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index ad8f00a1..a1f81f45 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -18,7 +18,6 @@
     <properties>
         <revision>3.0.0-SNAPSHOT</revision>
         <apps.base-image>springcloud/baseimage:1.0.0</apps.base-image>
-        <java.version>1.8</java.version>
 		<mockserver.version>5.10</mockserver.version>
         <stream-apps-core.version>${revision}</stream-apps-core.version>
         <java-functions.version>1.0.0-SNAPSHOT</java-functions.version>
@@ -28,7 +27,6 @@
         <spring-cloud-dataflow-apps-docs-plugin.version>1.0.0-SNAPSHOT</spring-cloud-dataflow-apps-docs-plugin.version>
         <java-cfenv-boot.version>2.1.2.RELEASE</java-cfenv-boot.version>
         <prometheus-rsocket.version>1.2.1</prometheus-rsocket.version>
-        <spring-cloud-dependencies.version>Hoxton.SR7</spring-cloud-dependencies.version>
     </properties>
 
     <modules>
@@ -169,11 +167,6 @@
                                             <artifactId>spring-cloud-function-dependencies</artifactId>
                                             <version>${spring-cloud-function.version}</version>
                                         </dependency>
-                                        <dependency>
-                                            <groupId>org.springframework.cloud</groupId>
-                                            <artifactId>spring-cloud-dependencies</artifactId>
-                                            <version>${spring-cloud-dependencies.version}</version>
-                                        </dependency>
                                     </dependencyManagement>
                                     <dependencies>
                                         <dependency>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 9d341770..24394068 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -42,20 +42,13 @@
         <spring-cloud-function.version>3.0.9.RELEASE</spring-cloud-function.version>
         <spring-integration-dependencies.version>5.3.3.BUILD-SNAPSHOT</spring-integration-dependencies.version>
         <test-containers.version>1.15.0-rc2</test-containers.version>
+        <maven-flatten-plugin.version>1.2.5</maven-flatten-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
     <dependencyManagement>
-
         <dependencies>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
+            <!-- Adding SI bom here is temporary to address some issues. It should come from Boot dependencies -->
             <dependency>
                 <groupId>org.springframework.integration</groupId>
                 <artifactId>spring-integration-bom</artifactId>
@@ -63,7 +56,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-function-dependencies</artifactId>
@@ -71,18 +63,22 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
-
     </dependencyManagement>
 
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.2.5</version>
+                <version>${maven-flatten-plugin.version}</version>
                 <configuration>
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>resolveCiFriendliesOnly</flattenMode>
@@ -139,7 +135,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <includes>
                         <include>**/*Tests.java</include>