diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..1d20556
--- /dev/null
+++ b/.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
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..b4e16f1
--- /dev/null
+++ b/.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 }}"'
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6b71114..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "build_utils"]
- path = build_utils
- url = git@github.com:rbkmoney/build_utils
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 2bbe649..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#!groovy
-// -*- mode: groovy -*-
-
-build('bouncer-proto', 'docker-host') {
- checkoutRepo()
- loadBuildUtils()
-
- def pipeDefault
- def gitUtils
- runStage('load pipeline') {
- env.JENKINS_LIB = "build_utils/jenkins_lib"
- pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
- pipeJavaProto = load("${env.JENKINS_LIB}/pipeJavaProto.groovy")
- gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
- }
-
- pipeDefault() {
- runStage('compile') {
- withGithubPrivkey {
- sh "make wc_compile"
- }
- }
-
- env.skipSonar = 'true'
- pipeJavaProto()
- }
-}
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a1b130c..0000000
--- a/Makefile
+++ /dev/null
@@ -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 := bouncer-proto
-
-# Build image tag to be used
-BUILD_IMAGE_TAG := 917afcdd0c0a07bf4155d597bbba72e962e1a34a
-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: submodules
- $(REBAR) compile
-
-clean:
- $(REBAR) clean
-
-distclean:
- $(REBAR) clean -a
- rm -rfv _build
-
-include $(UTILS_PATH)/make_lib/java_proto.mk
diff --git a/README.md b/README.md
index 2e0275e..e1380b2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
# bouncer-proto
-[![Build Status](http://ci.rbkmoney.com/buildStatus/icon?job=rbkmoney_private/bouncer-proto/master)](http://ci.rbkmoney.com/job/rbkmoney_private/job/bouncer-proto/job/master/)
-
Thrift protocol for relatively generic decision making services.
diff --git a/build_utils b/build_utils
deleted file mode 160000
index 34f432a..0000000
--- a/build_utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 34f432a1e8e0adedbba23ecd29c1eb2412a8d416
diff --git a/pom.xml b/pom.xml
index a1ce0a6..c483302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,44 +5,41 @@
4.0.0
- com.rbkmoney
- parent
- 1.0.5
+ dev.vality
+ library-parent-pom
+ 1.0.0
- com.rbkmoney
bouncer-proto
- 1.0.0
+ ${revision}
jar
Bouncer
Generates jar artifact containing compiled thrift classes based on generated thrift IDL files
- https://github.com/rbkmoney/bouncer-proto.git
-
-
-
- RBK.money
- https://rbk.money
-
-
-
-
- scm:git:git://github.com/rbkmoney/bouncer-proto.git
- scm:git:ssh://github.com/rbkmoney/bouncer-proto.git
- https://github.com/rbkmoney/bouncer-proto/tree/master
-
+ https://github.com/valitydev/bouncer-proto.git
UTF-8
+ SNAPSHOT
- com.rbkmoney.woody
+ dev.vality.woody
woody-thrift
- [1.1.21,)
+ 1.0.0
provided
+
+ javax.annotation
+ javax.annotation-api
+ 1.3.2
+
+
+ dev.vality
+ fistful-proto
+ 1.129-8c9aa31
+
@@ -84,7 +81,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.0.0
+ 3.2.4
package
@@ -94,8 +91,8 @@
- com.rbkmoney.bouncer
- com.rbkmoney.bouncer.v${commit.number}
+ dev.vality.bouncer
+ dev.vality.bouncer.v${commit.number}
true
diff --git a/proto/base.thrift b/proto/base.thrift
index 8787da6..dc4c2dc 100644
--- a/proto/base.thrift
+++ b/proto/base.thrift
@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.bouncer.base
+namespace java dev.vality.bouncer.base
namespace erlang bouncer_base
typedef i32 Version
diff --git a/proto/context.thrift b/proto/context.thrift
index da8a54b..fe36658 100644
--- a/proto/context.thrift
+++ b/proto/context.thrift
@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.bouncer.ctx
+namespace java dev.vality.bouncer.ctx
namespace erlang bctx
enum ContextFragmentType {
diff --git a/proto/context_v1.thrift b/proto/context_v1.thrift
index 92dc31c..74cdb9d 100644
--- a/proto/context_v1.thrift
+++ b/proto/context_v1.thrift
@@ -2,7 +2,7 @@
* Модель контекстов для принятия решений контроля доступа.
*/
-namespace java com.rbkmoney.bouncer.context.v1
+namespace java dev.vality.bouncer.context.v1
namespace erlang bctx_v1
include "base.thrift"
@@ -144,7 +144,7 @@ struct Requester {
/**
* Контекст, получаемый из сервисов, реализующих один из интерфейсов протокола
- * https://github.com/rbkmoney/damsel/tree/master/proto/payment_processing.thrift
+ * https://github.com/valitydev/damsel/tree/master/proto/payment_processing.thrift
* (например данные о платёжных сущностях invoicing в hellgate)
* и содержащий _проверенную_ информацию
*/
@@ -181,7 +181,7 @@ struct Customer {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [вебхуков]
- * (https://github.com/rbkmoney/damsel/tree/master/proto/webhooker.thrift)
+ * (https://github.com/valitydev/damsel/tree/master/proto/webhooker.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextWebhooks {
@@ -201,7 +201,6 @@ struct WebhookFilter {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [отчётов]
- * (https://github.com/rbkmoney/reporter_proto/tree/master/proto/reports.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextReports {
@@ -217,7 +216,7 @@ struct Report {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [выплат]
- * (https://github.com/rbkmoney/damsel/tree/master/proto/payout_processing.thrift)
+ * (https://github.com/valitydev/damsel/tree/master/proto/payout_processing.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextPayouts {
@@ -233,7 +232,7 @@ struct Payout {
/** wallet
* Контекст, получаемый из сервисов, реализующих один из интерфейсов протокола
- * (https://github.com/rbkmoney/fistful-proto)
+ * (https://github.com/valitydev/fistful-proto)
* (например wallet в fistful-server)
* и содержащий _проверенную_ информацию
@@ -279,7 +278,7 @@ type = "Destination" {
/** wallet_webhooks
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [вебхуков]
- * (https://github.com/rbkmoney/fistful-proto/blob/master/proto/webhooker.thrift)
+ * (https://github.com/valitydev/fistful-proto/blob/master/proto/webhooker.thrift)
* и содержащий _проверенную_ информацию.
Информация о возможных объектах и полях к ним относящихся:
@@ -294,7 +293,7 @@ type = "WalletWebhook" {
/** wallet_reports
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [отчётов]
- * (https://github.com/rbkmoney/fistful-reporter-proto)
+ * (https://github.com/valitydev/fistful-reporter-proto)
* (например wallet в fistful-server)
* и содержащий _проверенную_ информацию
diff --git a/proto/decisions.thrift b/proto/decisions.thrift
index eb8daf2..4c398e0 100644
--- a/proto/decisions.thrift
+++ b/proto/decisions.thrift
@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.bouncer.decisions
+namespace java dev.vality.bouncer.decisions
namespace erlang bdcs
include "context.thrift"
diff --git a/proto/restriction.thrift b/proto/restriction.thrift
index d430de8..04a9775 100644
--- a/proto/restriction.thrift
+++ b/proto/restriction.thrift
@@ -1,4 +1,4 @@
-namespace java com.rbkmoney.bouncer.rstn
+namespace java dev.vality.bouncer.rstn
namespace erlang brstn
include "base.thrift"
diff --git a/rebar.config b/rebar.config
index 65d07f7..172783c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -49,7 +49,7 @@
{plugins, [
{rebar3_thrift_compiler,
- {git, "https://github.com/rbkmoney/rebar3_thrift_compiler.git", {branch, "master"}}}
+ {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
]}.
{provider_hooks, [