add actions, update dependencies

.github/workflows/build.yml

@@ -0,0 +1,29 @@
+name: Build Artifact
+
+on:
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Install thrift
+        uses: valitydev/action-setup-thrift@v0.0.1
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Maven
+        uses: actions/setup-java@v2
+        with:
+          java-version: '15'
+          distribution: 'adopt'
+      - name: Retrieve commit info
+        run: |
+          echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
+          echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
+        id: commit_info
+      - name: Build package
+        run: mvn --batch-mode -Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}" clean compile -f pom.xml

.github/workflows/deploy.yml

@@ -0,0 +1,31 @@
+name: Deploy Artifact
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'main'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Install thrift
+        uses: valitydev/action-setup-thrift@v0.0.1
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Retrieve commit info
+        run: |
+          echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
+          echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
+        id: commit_info
+      - name: Deploy package
+        uses: valitydev/action-deploy-jdk-package@v1.0.9
+        with:
+          server-username: ${{ secrets.OSSRH_USERNAME }}
+          server-password: ${{ secrets.OSSRH_TOKEN }}
+          deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          maven-args: '-Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}"'

Makefile

@@ -1,42 +0,0 @@
-THRIFT = $(or $(shell which thrift), $(error "`thrift' executable missing"))
-REBAR = $(shell which rebar3 2>/dev/null || which ./rebar3)
-SUBMODULES = build_utils
-SUBTARGETS = $(patsubst %,%/.git,$(SUBMODULES))
-
-UTILS_PATH := build_utils
-TEMPLATES_PATH := .
-
-# Name of the service
-SERVICE_NAME := fraudbusters-proto
-
-# Build image tag to be used
-BUILD_IMAGE_TAG := b04c5291d101132e53e578d96e1628d2e6dab0c0
-CALL_ANYWHERE := \
-	all submodules compile clean distclean
-
-CALL_W_CONTAINER := $(CALL_ANYWHERE)
-
-all: compile
-
--include $(UTILS_PATH)/make_lib/utils_container.mk
-
-.PHONY: $(CALL_W_CONTAINER)
-
-# CALL_ANYWHERE
-$(SUBTARGETS): %/.git: %
-	git submodule update --init $<
-	touch $@
-
-submodules: $(SUBTARGETS)
-
-compile:
-	$(REBAR) compile
-
-clean:
-	$(REBAR) clean
-
-distclean:
-	$(REBAR) clean -a
-	rm -rfv _build
-
-include $(UTILS_PATH)/make_lib/java_proto.mk

pom.xml

@@ -5,49 +5,42 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.rbkmoney</groupId>
+        <groupId>dev.vality</groupId>
-        <artifactId>parent</artifactId>
+        <artifactId>library-parent-pom</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>fraudbusters-proto</artifactId>
-    <version>SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>jar</packaging>
 
 
     <name>Fraudbusters</name>
     <description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
-    <url>https://github.com/rbkmoney/fraudbusters-proto.git</url>
+    <url>https://github.com/valitydev/fraudbusters-proto.git</url>
-
-    <developers>
-        <developer>
-            <organization>RBK.money</organization>
-            <organizationUrl>https://rbk.money</organizationUrl>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git://github.com/rbkmoney/fraudbusters-proto.git</connection>
-        <developerConnection>scm:git:ssh://github.com/rbkmoney/fraudbusters-proto.git</developerConnection>
-        <url>https://github.com/rbkmoney/fraudbusters-proto/tree/master</url>
-    </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>SNAPSHOT</revision>
     </properties>
 
     <dependencies>
-        <!--rbkmoney-->
+        <!--dev.vality-->
         <dependency>
-            <groupId>com.rbkmoney.woody</groupId>
+            <groupId>dev.vality.woody</groupId>
             <artifactId>woody-thrift</artifactId>
-            <version>1.1.22</version>
+            <version>1.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.rbkmoney</groupId>
+            <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
-            <version>1.500-da04d2c</version>
+            <version>1.538-5addc41</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
         </dependency>
     </dependencies>
 
@@ -77,7 +70,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -87,8 +80,8 @@
                         <configuration>
                             <relocations>
                                 <relocation>
-                                    <pattern>com.rbkmoney.damsel</pattern>
+                                    <pattern>dev.vality.damsel</pattern>
-                                    <shadedPattern>com.rbkmoney.damsel.v${commit.number}</shadedPattern>
+                                    <shadedPattern>dev.vality.damsel.v${commit.number}</shadedPattern>
                                 </relocation>
                             </relocations>
                             <shadedArtifactAttached>true</shadedArtifactAttached>

proto/fraudbusters.thrift

@@ -5,7 +5,7 @@ include 'domain.thrift'
  * Сервис поиска мошеннических операций.
  */
 
-namespace java com.rbkmoney.damsel.fraudbusters
+namespace java dev.vality.damsel.fraudbusters
 namespace erlang fraudbusters
 
 typedef string ID