From 71772933d24bf9bec3177970dbbe28c8ef87966f Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Tue, 24 Nov 2020 15:39:43 -0500
Subject: [PATCH] Back to snapshot for non-apps components

---
 applications/stream-applications-core/pom.xml |  6 +--
 etc/release-tools/apps-upgrade-dryrun.sh      | 42 +++++++++----------
 functions/pom.xml                             |  4 +-
 functions/spring-functions-parent/pom.xml     |  8 +---
 stream-applications-build/pom.xml             |  2 +-
 stream-applications-release-train/pom.xml     |  6 +--
 6 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index 84c906f2..28473b7d 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -11,16 +11,16 @@
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <artifactId>stream-applications-build</artifactId>
-        <version>1.0.0-RC1</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <revision>3.0.0-RC1</revision>
+        <revision>3.0.0-SNAPSHOT</revision>
         <apps.base-image>springcloud/baseimage:1.0.0</apps.base-image>
 		<mockserver.version>5.10</mockserver.version>
         <stream-apps-core.version>${revision}</stream-apps-core.version>
-        <java-functions.version>1.0.0-RC1</java-functions.version>
+        <java-functions.version>1.0.0-SNAPSHOT</java-functions.version>
         <spring-cloud-stream-dependencies.version>Horsham.SR10</spring-cloud-stream-dependencies.version>
         <spring-cloud-stream.version>3.0.10.RELEASE</spring-cloud-stream.version>
         <spring-cloud-dataflow-apps-generator-plugin.version>1.0.0-RC1</spring-cloud-dataflow-apps-generator-plugin.version>
diff --git a/etc/release-tools/apps-upgrade-dryrun.sh b/etc/release-tools/apps-upgrade-dryrun.sh
index b30c26ef..9a7b02cf 100755
--- a/etc/release-tools/apps-upgrade-dryrun.sh
+++ b/etc/release-tools/apps-upgrade-dryrun.sh
@@ -31,27 +31,27 @@ function iterate_through_apps_folders_and_update {
 
   cd ../../
 
-  if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then
-    lines=$(find $BASE_DIR -type f -name pom.xml | xargs grep SNAPSHOT | grep -v ".contains(" | grep -v "<!--"| grep -v regex | wc -l)
-    if [ $lines -eq 0 ]; then
-     echo "All good"
-    else
-     echo "Snapshots found under $BASE_DIR. Exiting build"
-     find $BASE_DIR -type f -name pom.xml | xargs grep SNAPSHOT | grep -v ".contains(" | grep -v regex
-     git checkout -f
-     exit 1
-    fi
-  else
-    lines=$(find $BASE_DIR -type f -name pom.xml | xargs egrep "SNAPSHOT|M[0-9]|RC[0-9]" | grep -v ".contains(" | grep -v regex | wc -l)
-    if [ $lines -eq 0 ]; then
-     echo "All good"
-    else
-     echo "Non Release versions found under $BASE_DIR. Exiting build"
-     find $BASE_DIR -type f -name pom.xml | xargs egrep "SNAPSHOT|M[0-9]|RC[0-9]" | grep -v ".contains(" | grep -v regex
-     git checkout -f
-     exit 1
-    fi
-  fi
+#  if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then
+#    lines=$(find $BASE_DIR -type f -name pom.xml | xargs grep SNAPSHOT | grep -v ".contains(" | grep -v "<!--"| grep -v regex | wc -l)
+#    if [ $lines -eq 0 ]; then
+#     echo "All good"
+#    else
+#     echo "Snapshots found under $BASE_DIR. Exiting build"
+#     find $BASE_DIR -type f -name pom.xml | xargs grep SNAPSHOT | grep -v ".contains(" | grep -v regex
+#     git checkout -f
+#     exit 1
+#    fi
+#  else
+#    lines=$(find $BASE_DIR -type f -name pom.xml | xargs egrep "SNAPSHOT|M[0-9]|RC[0-9]" | grep -v ".contains(" | grep -v regex | wc -l)
+#    if [ $lines -eq 0 ]; then
+#     echo "All good"
+#    else
+#     echo "Non Release versions found under $BASE_DIR. Exiting build"
+#     find $BASE_DIR -type f -name pom.xml | xargs egrep "SNAPSHOT|M[0-9]|RC[0-9]" | grep -v ".contains(" | grep -v regex
+#     git checkout -f
+#     exit 1
+#    fi
+#  fi
 
 }
 
diff --git a/functions/pom.xml b/functions/pom.xml
index 8d64f9c0..b880fd7b 100644
--- a/functions/pom.xml
+++ b/functions/pom.xml
@@ -12,12 +12,12 @@
 	<parent>
 		<groupId>org.springframework.cloud.stream.app</groupId>
 		<artifactId>stream-applications-build</artifactId>
-		<version>1.0.0-RC1</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
-		<revision>1.0.0-RC1</revision>
+		<revision>1.0.0-SNAPSHOT</revision>
 	</properties>
 
 	<modules>
diff --git a/functions/spring-functions-parent/pom.xml b/functions/spring-functions-parent/pom.xml
index 09b07057..4291514c 100644
--- a/functions/spring-functions-parent/pom.xml
+++ b/functions/spring-functions-parent/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<spring-boot.version>2.3.6.RELEASE</spring-boot.version>
-		<spring-cloud-function.version>3.0.11.RELEASE</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.12.RELEASE</spring-cloud-function.version>
 		<spring-cloud-fn.version>${project.version}</spring-cloud-fn.version>
 		<spring-integration-dependencies.version>5.3.4.RELEASE</spring-integration-dependencies.version>
 	</properties>
@@ -98,11 +98,5 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-
 	</dependencies>
-
-
-
-
 </project>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 651a4c72..3085d637 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud.stream.app</groupId>
 	<artifactId>stream-applications-build</artifactId>
-	<version>1.0.0-RC1</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<name>stream-applications-build</name>
 	<description>Common Parent for Functions and Applications</description>
 	<packaging>pom</packaging>
diff --git a/stream-applications-release-train/pom.xml b/stream-applications-release-train/pom.xml
index a93a63d5..ffe99b03 100644
--- a/stream-applications-release-train/pom.xml
+++ b/stream-applications-release-train/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <artifactId>stream-applications-core</artifactId>
-        <version>3.0.0-RC1</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../applications/stream-applications-core/pom.xml</relativePath>
     </parent>
 
@@ -19,8 +19,8 @@
     </modules>
 
     <properties>
-        <revision>2020.0.0-RC1</revision>
-        <apps.version>3.0.0-RC1</apps.version>
+        <revision>2020.0.0-SNAPSHOT</revision>
+        <apps.version>3.0.0-SNAPSHOT</apps.version>
         <cdc-debezium-source.version>${apps.version}</cdc-debezium-source.version>
         <file-source.version>${apps.version}</file-source.version>
         <ftp-source.version>${apps.version}</ftp-source.version>