Hard coded parent version as variable substitution is not supported

feast-dev · Dec 31, 2019 · 24ff54d · 24ff54d
1 parent ac26889
commit 24ff54d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 19 deletions.
diff --git a/.prow/scripts/test-end-to-end-batch.sh b/.prow/scripts/test-end-to-end-batch.sh
@@ -3,8 +3,6 @@
 set -e
 set -o pipefail
 
-export REVISION=dev
-
 if ! cat /etc/*release | grep -q stretch; then
     echo ${BASH_SOURCE} only supports Debian stretch. 
     echo Please change your operating system to use this script.
@@ -92,7 +90,7 @@ Building jars for Feast
     --output-dir /root/
 
 # Build jars for Feast
-mvn --quiet --batch-mode --define skipTests=true --define revision=$REVISION clean package
+mvn --quiet --batch-mode --define skipTests=true clean package
 
 echo "
 ============================================================
@@ -144,7 +142,7 @@ management:
         enabled: false
 EOF
 
-nohup java -jar core/target/feast-core-$REVISION.jar \
+nohup java -jar core/target/feast-core-*-SNAPSHOT.jar \
   --spring.config.location=file:///tmp/core.application.yml \
   &> /var/log/feast-core.log &
 sleep 35
@@ -198,7 +196,7 @@ spring:
     web-environment: false
 EOF
 
-nohup java -jar serving/target/feast-serving-$REVISION.jar \
+nohup java -jar serving/target/feast-serving-*-SNAPSHOT.jar \
   --spring.config.location=file:///tmp/serving.warehouse.application.yml \
   &> /var/log/feast-serving-warehouse.log &
 sleep 15

diff --git a/.prow/scripts/test-end-to-end.sh b/.prow/scripts/test-end-to-end.sh
@@ -3,8 +3,6 @@
 set -e
 set -o pipefail
 
-export REVISION=dev
-
 if ! cat /etc/*release | grep -q stretch; then
     echo ${BASH_SOURCE} only supports Debian stretch. 
     echo Please change your operating system to use this script.
@@ -79,7 +77,7 @@ Building jars for Feast
     --output-dir /root/
 
 # Build jars for Feast
-mvn --quiet --batch-mode --define skipTests=true --define revision=$REVISION clean package
+mvn --quiet --batch-mode --define skipTests=true clean package
 
 ls -lh core/target/*jar
 ls -lh serving/target/*jar
@@ -135,7 +133,7 @@ management:
         enabled: false
 EOF
 
-nohup java -jar core/target/feast-core-$REVISION.jar \
+nohup java -jar core/target/feast-core-*-SNAPSHOT.jar \
   --spring.config.location=file:///tmp/core.application.yml \
   &> /var/log/feast-core.log &
 sleep 35
@@ -189,7 +187,7 @@ spring:
 
 EOF
 
-nohup java -jar serving/target/feast-serving-$REVISION.jar \
+nohup java -jar serving/target/feast-serving-*-SNAPSHOT.jar \
   --spring.config.location=file:///tmp/serving.online.application.yml \
   &> /var/log/feast-serving-online.log &
 sleep 15

diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ build-cli:
 	$(MAKE) -C cli build-all
 
 build-java:
-	mvn clean verify -Drevision=$(VERSION)
+	mvn clean verify
 
 build-docker:
 	docker build -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .

diff --git a/core/pom.xml b/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>dev.feast</groupId>
         <artifactId>feast-parent</artifactId>
-        <version>${revision}</version>
+        <version>0.3.6-SNAPSHOT</version>
     </parent>
 
     <name>Feast Core</name>

diff --git a/infra/docker/core/Dockerfile b/infra/docker/core/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /build
 # the existing .m2 directory to $FEAST_REPO_ROOT/.m2
 #
 ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false"
-RUN mvn --also-make --projects core,ingestion -Drevision=$REVISION \
+RUN mvn --also-make --projects core,ingestion \
   -DskipTests=true --batch-mode package
 #
 # Unpack the jar and copy the files into production Docker image

diff --git a/infra/docker/serving/Dockerfile b/infra/docker/serving/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /build
 # the existing .m2 directory to $FEAST_REPO_ROOT/.m2
 #
 ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false"
-RUN mvn --also-make --projects serving -Drevision=$REVISION \
+RUN mvn --also-make --projects serving \
   -DskipTests=true --batch-mode package
 
 # ============================================================

diff --git a/ingestion/pom.xml b/ingestion/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
   </parent>
 
   <name>Feast Ingestion</name>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -35,7 +35,6 @@
     </modules>
 
     <properties>
-        <revision>0.3.2-SNAPSHOT</revision>
         <github.url>https://github.com/gojek/feast</github.url>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/serving/pom.xml b/serving/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>feast-serving</artifactId>