Use Nexus staging plugin for deployment (feast-dev#394)

khorshuheng · feast-ci-bot · commit 3d44ad747942 · 2020-01-03T22:56:31.000+08:00
* Use Nexus staging pluging for deployment

* Fix Javadoc error

* Hard coded parent version as variable substitution is not supported
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
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>feast</groupId>
+        <groupId>dev.feast</groupId>
         <artifactId>feast-parent</artifactId>
-        <version>${revision}</version>
+        <version>0.3.6-SNAPSHOT</version>
     </parent>
 
     <name>Feast Core</name>
@@ -48,7 +48,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>feast</groupId>
+            <groupId>dev.feast</groupId>
             <artifactId>feast-ingestion</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git 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
@@ -143,7 +143,7 @@ public GetFeatureSetResponse getFeatureSet(GetFeatureSetRequest request) {
    * possible if a project name is not set explicitly
    *
    * <p>The version field can be one of - '*' - This will match all versions - 'latest' - This will
-   * match the latest feature set version - '<number>' - This will match a specific feature set
+   * match the latest feature set version - '&lt;number&gt;' - 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
@@ -49,8 +49,9 @@ public class PackageUtil {
    * handled by default in Apache Beam.
    *
    * <pre>
-   * @code
+   * <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!/");
+   * </code>
    * 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/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
@@ -21,9 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>feast</groupId>
+    <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
@@ -22,9 +22,9 @@
     <description>Feature Store for Machine Learning</description>
     <url>${github.url}</url>
 
-    <groupId>feast</groupId>
+    <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>
@@ -83,15 +82,10 @@
     </issueManagement>
 
     <distributionManagement>
-        <!-- TODO: use a profile like local -->
         <snapshotRepository>
-            <id>feast-snapshot</id>
-            <url>file:///tmp/snapshot</url>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
-        <repository>
-            <id>feast</id>
-            <url>file:///tmp/snapshot</url>
-        </repository>
     </distributionManagement>
 
     <dependencyManagement>
@@ -280,6 +274,43 @@
         </extensions>
 
         <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml
@@ -6,12 +6,12 @@
 
   <name>Feast SDK for Java</name>
   <description>SDK for registering, storing, and retrieving features</description>
-  <artifactId>feast-client</artifactId>
+  <artifactId>feast-sdk</artifactId>
 
   <parent>
-    <groupId>feast</groupId>
+    <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git 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.
    *
-   * <p>See {@link #getOnlineFeatures(List, List, str)}
+   * <p>See {@link #getOnlineFeatures(List, List, String)}
    *
    * @param features list of string feature references to retrieve, feature reference follows this
    *     format [project]/[name]:[version]
diff --git a/serving/pom.xml b/serving/pom.xml
@@ -21,9 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>feast</groupId>
+    <groupId>dev.feast</groupId>
     <artifactId>feast-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.3.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>feast-serving</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public FeastResourceCollector feastResourceCollector(`
`66`	`66`	`/**`
`67`	`67`	`* Register custom Prometheus collector that exports metrics about JVM resource usage.`
`68`	`68`	`*`
`69`		`- * @return @{link {@link JVMResourceCollector}}`
	`69`	`+ * @return {@link JVMResourceCollector}`
`70`	`70`	`*/`
`71`	`71`	`@Bean`
`72`	`72`	`public JVMResourceCollector jvmResourceCollector() {`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public GetFeatureSetResponse getFeatureSet(GetFeatureSetRequest request) {`
`143`	`143`	`* possible if a project name is not set explicitly`
`144`	`144`	`*`
`145`	`145`	`* <p>The version field can be one of - '*' - This will match all versions - 'latest' - This will`
`146`		`- * match the latest feature set version - '<number>' - This will match a specific feature set`
	`146`	`+ * match the latest feature set version - '<number>' - This will match a specific feature set`
`147`	`147`	`* version. This property can only be set if both the feature set name and project name are`
`148`	`148`	`* explicitly set.`
`149`	`149`	`*`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ WORKDIR /build`
`12`	`12`	`# the existing .m2 directory to $FEAST_REPO_ROOT/.m2`
`13`	`13`	`#`
`14`	`14`	`ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false"`
`15`		`-RUN mvn --also-make --projects core,ingestion -Drevision=$REVISION \`
	`15`	`+RUN mvn --also-make --projects core,ingestion \`
`16`	`16`	`-DskipTests=true --batch-mode package`
`17`	`17`	`#`
`18`	`18`	`# Unpack the jar and copy the files into production Docker image`