From ee9511e483f3d5ee5461c41a7e0fa50d657bc584 Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Thu, 26 Dec 2019 22:16:48 +0800 Subject: [PATCH 1/3] Use Nexus staging pluging for deployment --- core/pom.xml | 4 ++-- ingestion/pom.xml | 2 +- pom.xml | 48 +++++++++++++++++++++++++++++++++++++++-------- sdk/java/pom.xml | 4 ++-- serving/pom.xml | 2 +- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index f6e4909260a..954c7c00185 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - feast + dev.feast feast-parent ${revision} @@ -48,7 +48,7 @@ - feast + dev.feast feast-ingestion ${project.version} diff --git a/ingestion/pom.xml b/ingestion/pom.xml index eb892335180..4908b546985 100644 --- a/ingestion/pom.xml +++ b/ingestion/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - feast + dev.feast feast-parent ${revision} diff --git a/pom.xml b/pom.xml index edf2a0244e9..892534aa8ea 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ Feature Store for Machine Learning ${github.url} - feast + dev.feast feast-parent ${revision} pom @@ -83,15 +83,10 @@ - - feast-snapshot - file:///tmp/snapshot + ossrh + https://oss.sonatype.org/content/repositories/snapshots - - feast - file:///tmp/snapshot - @@ -280,6 +275,43 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + false + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + com.diffplug.spotless spotless-maven-plugin diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml index 2c8b1d837a3..2970dae3ee2 100644 --- a/sdk/java/pom.xml +++ b/sdk/java/pom.xml @@ -6,10 +6,10 @@ Feast SDK for Java SDK for registering, storing, and retrieving features - feast-client + feast-sdk - feast + dev.feast feast-parent ${revision} ../.. diff --git a/serving/pom.xml b/serving/pom.xml index ab9efaff26e..dc3391df62f 100644 --- a/serving/pom.xml +++ b/serving/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - feast + dev.feast feast-parent ${revision} From ac26889a864a81010ebf6d554b42bf2615ba91b8 Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Fri, 27 Dec 2019 21:37:31 +0800 Subject: [PATCH 2/3] Fix Javadoc error --- core/src/main/java/feast/core/config/MonitoringConfig.java | 2 +- core/src/main/java/feast/core/service/SpecService.java | 2 +- core/src/main/java/feast/core/util/PackageUtil.java | 3 ++- sdk/java/src/main/java/com/gojek/feast/FeastClient.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/feast/core/config/MonitoringConfig.java b/core/src/main/java/feast/core/config/MonitoringConfig.java index fd20bed1ee8..53c9562c47c 100644 --- a/core/src/main/java/feast/core/config/MonitoringConfig.java +++ b/core/src/main/java/feast/core/config/MonitoringConfig.java @@ -66,7 +66,7 @@ public FeastResourceCollector feastResourceCollector( /** * Register custom Prometheus collector that exports metrics about JVM resource usage. * - * @return @{link {@link JVMResourceCollector}} + * @return {@link JVMResourceCollector} */ @Bean public JVMResourceCollector jvmResourceCollector() { diff --git a/core/src/main/java/feast/core/service/SpecService.java b/core/src/main/java/feast/core/service/SpecService.java index 2d977fcd3f5..1d6ce16de54 100644 --- a/core/src/main/java/feast/core/service/SpecService.java +++ b/core/src/main/java/feast/core/service/SpecService.java @@ -143,7 +143,7 @@ public GetFeatureSetResponse getFeatureSet(GetFeatureSetRequest request) { * possible if a project name is not set explicitly * *

The version field can be one of - '*' - This will match all versions - 'latest' - This will - * match the latest feature set version - '' - This will match a specific feature set + * match the latest feature set version - '<number>' - This will match a specific feature set * version. This property can only be set if both the feature set name and project name are * explicitly set. * diff --git a/core/src/main/java/feast/core/util/PackageUtil.java b/core/src/main/java/feast/core/util/PackageUtil.java index ef27332ac0f..20b2310644b 100644 --- a/core/src/main/java/feast/core/util/PackageUtil.java +++ b/core/src/main/java/feast/core/util/PackageUtil.java @@ -49,8 +49,9 @@ public class PackageUtil { * handled by default in Apache Beam. * * 

-   * @code
+   * 
    * URL url = new URL("jar:file:/tmp/springexample/target/spring-example-1.0-SNAPSHOT.jar!/BOOT-INF/lib/beam-sdks-java-core-2.16.0.jar!/");
+   * 
    * String resolvedPath = resolveSpringBootPackageClasspath(url);
    * // resolvedPath should point to "/tmp/springexample/target/spring-example-1.0-SNAPSHOT/BOOT-INF/lib/beam-sdks-java-core-2.16.0.jar"
    * // Note that spring-example-1.0-SNAPSHOT.jar is extracted in the process.
diff --git a/sdk/java/src/main/java/com/gojek/feast/FeastClient.java b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java
index 01157306d58..8014231836e 100644
--- a/sdk/java/src/main/java/com/gojek/feast/FeastClient.java
+++ b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java
@@ -59,7 +59,7 @@ public GetFeastServingInfoResponse getFeastServingInfo() {
   /**
    * Get online features from Feast.
    *
-   * 
See {@link #getOnlineFeatures(List, List, str)}
+   * 
See {@link #getOnlineFeatures(List, List, String)}
    *
    * @param features list of string feature references to retrieve, feature reference follows this
    *     format [project]/[name]:[version]

From 24ff54dba502af300e054a30378523febaf0d771 Mon Sep 17 00:00:00 2001
From: Shu Heng 
Date: Tue, 31 Dec 2019 13:13:19 +0800
Subject: [PATCH 3/3] Hard coded parent version as variable substitution is not
 supported

---
 .prow/scripts/test-end-to-end-batch.sh | 8 +++-----
 .prow/scripts/test-end-to-end.sh       | 8 +++-----
 Makefile                               | 2 +-
 core/pom.xml                           | 2 +-
 infra/docker/core/Dockerfile           | 2 +-
 infra/docker/serving/Dockerfile        | 2 +-
 ingestion/pom.xml                      | 2 +-
 pom.xml                                | 3 +--
 sdk/java/pom.xml                       | 2 +-
 serving/pom.xml                        | 2 +-
 10 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.prow/scripts/test-end-to-end-batch.sh b/.prow/scripts/test-end-to-end-batch.sh
index ee7885b009b..5ff947f20f5 100755
--- 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
index c7ff461ec31..cc65968ca22 100755
--- 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
index b7eb0edbade..9f0742b2e6c 100644
--- 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
index 954c7c00185..c0d889e2832 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
     
         dev.feast
         feast-parent
-        ${revision}
+        0.3.6-SNAPSHOT
     
 
     Feast Core
diff --git a/infra/docker/core/Dockerfile b/infra/docker/core/Dockerfile
index c4cfe34b71b..91ef030dc90 100644
--- 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
index 3517183d782..5605c8846de 100644
--- 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
index 4908b546985..fce645c51b3 100644
--- a/ingestion/pom.xml
+++ b/ingestion/pom.xml
@@ -23,7 +23,7 @@
   
     dev.feast
     feast-parent
-    ${revision}
+    0.3.6-SNAPSHOT
   
 
   Feast Ingestion
diff --git a/pom.xml b/pom.xml
index 892534aa8ea..882e24ab8ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
     dev.feast
     feast-parent
-    ${revision}
+    0.3.6-SNAPSHOT
     pom
 
     
@@ -35,7 +35,6 @@
     
 
     
-        0.3.2-SNAPSHOT
         https://github.com/gojek/feast
 
         UTF-8
diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml
index 2970dae3ee2..b3543446e2e 100644
--- a/sdk/java/pom.xml
+++ b/sdk/java/pom.xml
@@ -11,7 +11,7 @@
   
     dev.feast
     feast-parent
-    ${revision}
+    0.3.6-SNAPSHOT
     ../..
   
 
diff --git a/serving/pom.xml b/serving/pom.xml
index dc3391df62f..4a28eb739e8 100644
--- a/serving/pom.xml
+++ b/serving/pom.xml
@@ -23,7 +23,7 @@
   
     dev.feast
     feast-parent
-    ${revision}
+    0.3.6-SNAPSHOT
   
 
   feast-serving