Publish renamed java packages to maven central (via Sonatype) (#2225)

* new artifact names Signed-off-by: pyalex <moskalenko.alexey@gmail.com> * clean up dependencies Signed-off-by: pyalex <moskalenko.alexey@gmail.com> * better names & cleaner structure Signed-off-by: pyalex <moskalenko.alexey@gmail.com> * return assertion import Signed-off-by: pyalex <moskalenko.alexey@gmail.com> * bump version Signed-off-by: pyalex <moskalenko.alexey@gmail.com>
feast-dev · Jan 20, 2022 · 428c145 · 428c145
1 parent f5912c8
commit 428c145
Show file tree

Hide file tree

Showing 29 changed files with 172 additions and 745 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -144,5 +144,39 @@ jobs:
           python3 setup.py sdist bdist_wheel
           python3 -m twine upload --verbose dist/*
 
-    # TODO(adchia): publish java sdk once maven repo is updated
-    # See https://github.com/feast-dev/feast-java/blob/master/.github/workflows/release.yml#L104
+  publish-java-sdk:
+    container: maven:3.6-jdk-11
+    runs-on: ubuntu-latest
+    needs: get-version
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+          java-package: jdk
+          architecture: x64
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+          architecture: 'x64'
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-it-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-it-maven-
+      - name: Publish java sdk
+        env:
+          VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
+          GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          MAVEN_SETTINGS: ${{ secrets.MAVEN_SETTINGS }}
+        run: |
+          echo -n "$GPG_PUBLIC_KEY" > /root/public-key
+          echo -n "$GPG_PRIVATE_KEY" > /root/private-key
+          mkdir -p /root/.m2/
+          echo -n "$MAVEN_SETTINGS" > /root/.m2/settings.xml
+          infra/scripts/publish-java-sdk.sh --revision ${VERSION_WITHOUT_PREFIX} --gpg-key-import-dir /root
diff --git a/infra/scripts/publish-java-sdk.sh b/infra/scripts/publish-java-sdk.sh
@@ -69,4 +69,4 @@ gpg --import --batch --yes $GPG_KEY_IMPORT_DIR/private-key
 echo "============================================================"
 echo "Deploying Java SDK with revision: $REVISION"
 echo "============================================================"
-mvn -f java/pom.xml --projects datatypes/java,sdk/java -Drevision=$REVISION --batch-mode clean deploy
+mvn -f java/pom.xml --projects .,datatypes/java,sdk/java -Drevision=$REVISION --batch-mode clean deploy
diff --git a/java/common/pom.xml b/java/common/pom.xml
@@ -33,13 +33,14 @@
     <dependencies>
         <dependency>
             <groupId>dev.feast</groupId>
-            <artifactId>datatypes-java</artifactId>
+            <artifactId>feast-datatypes</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>      
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
+            <version>${protobuf.version}</version>
         </dependency>
 
         <dependency>
@@ -52,75 +53,34 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.auto.value</groupId>
             <artifactId>auto-value-annotations</artifactId>
+            <version>${auto.value.version}</version>
         </dependency>
 
         <!-- JSON -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
             <artifactId>gson-fire</artifactId>
+            <version>${gson.fire.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.devh</groupId>
-            <artifactId>grpc-server-spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.1.5.Final</version>
-        </dependency>
-
-        <!-- Security -->
-	    <dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-config</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-resource-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
+            <version>2.10.1</version>
         </dependency>
 
         <!-- Logging -->
@@ -134,7 +94,6 @@
             <version>0.3.1</version>
         </dependency>
 
-        <!-- Bean Validation API support -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -156,35 +115,20 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
             <scope>test</scope>
+            <version>${hamcrest.version}</version>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -206,6 +150,13 @@
                     <argLine>-Xms2048m -Xmx2048m -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <configuration>
+                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/java/common/src/main/java/feast/common/logging/AuditLogger.java b/java/common/src/main/java/feast/common/logging/AuditLogger.java
@@ -32,26 +32,23 @@
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 import org.slf4j.event.Level;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.info.BuildProperties;
-import org.springframework.stereotype.Component;
 
 @Slf4j
-@Component
 public class AuditLogger {
   private static final String FLUENTD_DESTINATION = "fluentd";
   private static final Marker AUDIT_MARKER = MarkerFactory.getMarker("AUDIT_MARK");
   private static FluentLogger fluentLogger;
   private static AuditLogProperties properties;
-  private static BuildProperties buildProperties;
+  private static String artifact;
+  private static String version;
 
-  @Autowired
-  public AuditLogger(LoggingProperties loggingProperties, BuildProperties buildProperties) {
+  public AuditLogger(LoggingProperties loggingProperties, String artifact, String version) {
     // Spring runs this constructor when creating the AuditLogger bean,
     // which allows us to populate the AuditLogger class with dependencies.
     // This allows us to use the dependencies in the AuditLogger's static methods
     AuditLogger.properties = loggingProperties.getAudit();
-    AuditLogger.buildProperties = buildProperties;
+    AuditLogger.artifact = artifact;
+    AuditLogger.version = version;
     if (AuditLogger.properties.getMessageLogging() != null
         && AuditLogger.properties.getMessageLogging().isEnabled()) {
       AuditLogger.fluentLogger =
@@ -69,12 +66,7 @@ public AuditLogger(LoggingProperties loggingProperties, BuildProperties buildPro
    * @param entryBuilder with all fields set except instance.
    */
   public static void logMessage(Level level, MessageAuditLogEntry.Builder entryBuilder) {
-    log(
-        level,
-        entryBuilder
-            .setComponent(buildProperties.getArtifact())
-            .setVersion(buildProperties.getVersion())
-            .build());
+    log(level, entryBuilder.setComponent(artifact).setVersion(version).build());
   }
 
   /**
@@ -90,10 +82,7 @@ public static void logAction(
     log(
         level,
         ActionAuditLogEntry.of(
-            buildProperties.getArtifact(),
-            buildProperties.getArtifact(),
-            LogResource.of(resourceType, resourceId),
-            action));
+            artifact, version, LogResource.of(resourceType, resourceId), action));
   }
 
   /**
@@ -109,10 +98,7 @@ public static void logTransition(
     log(
         level,
         TransitionAuditLogEntry.of(
-            buildProperties.getArtifact(),
-            buildProperties.getArtifact(),
-            LogResource.of(resourceType, resourceId),
-            status));
+            artifact, version, LogResource.of(resourceType, resourceId), status));
   }
 
   /**

diff --git a/java/common/src/main/java/feast/common/logging/interceptors/GrpcMessageInterceptor.java b/java/common/src/main/java/feast/common/logging/interceptors/GrpcMessageInterceptor.java
@@ -30,18 +30,13 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import org.slf4j.event.Level;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
 
 /**
  * GrpcMessageInterceptor intercepts a GRPC calls to log handling of GRPC messages to the Audit Log.
  * Intercepts the incoming and outgoing messages logs them to the audit log, together with method
  * name and assumed authenticated identity (if authentication is enabled). NOTE:
  * GrpcMessageInterceptor assumes that all service calls are unary (ie single request/response).
  */
-@Component
 public class GrpcMessageInterceptor implements ServerInterceptor {
   private LoggingProperties loggingProperties;
 
@@ -50,7 +45,6 @@ public class GrpcMessageInterceptor implements ServerInterceptor {
    *
    * @param loggingProperties properties used to configure logging interceptor.
    */
-  @Autowired
   public GrpcMessageInterceptor(LoggingProperties loggingProperties) {
     this.loggingProperties = loggingProperties;
   }
@@ -80,9 +74,7 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(
     entryBuilder.setMethod(fullMethodName.substring(fullMethodName.indexOf("/") + 1));
 
     // Attempt Extract current authenticated identity.
-    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-    String identity = (authentication != null) ? getIdentity(authentication) : "";
-    entryBuilder.setIdentity(identity);
+    entryBuilder.setIdentity("");
 
     // Register forwarding call to intercept outgoing response and log to audit log
     call =
@@ -115,13 +107,4 @@ public void onMessage(ReqT message) {
       }
     };
   }
-
-  /**
-   * Extract current authenticated identity from given {@link Authentication}. Extracts subject
-   * claim if specified in AuthorizationProperties, otherwise returns authentication subject.
-   */
-  private String getIdentity(Authentication authentication) {
-    // use subject claim as identity if set in security authorization properties
-    return authentication.getName();
-  }
 }
diff --git a/java/datatypes/java/README.md → java/datatypes/README.md b/java/datatypes/java/README.md → java/datatypes/README.md
diff --git a/java/datatypes/java/src/main/proto/feast b/java/datatypes/java/src/main/proto/feast
diff --git a/java/datatypes/java/pom.xml → java/datatypes/pom.xml b/java/datatypes/java/pom.xml → java/datatypes/pom.xml
@@ -30,13 +30,13 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
-    <artifactId>datatypes-java</artifactId>
+    <artifactId>feast-datatypes</artifactId>
 
     <parent>
         <groupId>dev.feast</groupId>
         <artifactId>feast-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <build>
@@ -75,6 +75,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <configuration>
+                    <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -83,29 +90,34 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
+            <version>${protobuf.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-core</artifactId>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-services</artifactId>
+            <version>${grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
+            <version>${grpc.version}</version>
         </dependency>
-
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>

diff --git a/java/datatypes/src/main/proto/feast b/java/datatypes/src/main/proto/feast
@@ -0,0 +1 @@
+../../../../../protos/feast