Back to snapshot for non-apps components

This commit is contained in:
Soby Chacko
2020-11-24 15:39:43 -05:00
parent 45630ef399
commit 71772933d2
6 changed files with 31 additions and 37 deletions

View File

@@ -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>

View File

@@ -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
}

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>