From 10394c162d03f00b3c3f941c2eec9af15dcf3c40 Mon Sep 17 00:00:00 2001
From: Baikov Dmitrii <44803026+D-Baykov@users.noreply.github.com>
Date: Wed, 26 Jan 2022 02:50:42 -0800
Subject: [PATCH] TD-45: to dev.vality (#5)
---
.github/workflows/build.yml | 10 +++++
.github/workflows/deploy.yml | 16 ++++++++
.gitmodules | 4 --
CODEOWNERS | 1 -
Jenkinsfile | 40 -------------------
build_utils | 1 -
.../components/security-schemes/Bearer.yaml | 2 +-
openapi/openapi.yaml | 10 ++---
package-lock.json | 4 +-
package.json | 2 +-
pom.xml | 10 ++---
renovate.json | 18 +++++++++
12 files changed, 58 insertions(+), 60 deletions(-)
create mode 100644 .github/workflows/build.yml
create mode 100644 .github/workflows/deploy.yml
delete mode 100644 .gitmodules
delete mode 100644 CODEOWNERS
delete mode 100644 Jenkinsfile
delete mode 160000 build_utils
create mode 100644 renovate.json
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..7381159
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,10 @@
+name: Maven Build Artifact
+
+on:
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v1
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..df9c2f4
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,16 @@
+name: Maven Deploy Artifact
+
+on:
+ push:
+ branches:
+ - 'master'
+ - 'main'
+
+jobs:
+ deploy:
+ uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v1
+ secrets:
+ 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 }}
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ca5a761..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "build_utils"]
- path = build_utils
- url = git@github.com:rbkmoney/build_utils.git
- branch = master
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index 8a63afa..0000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @rbkmoney/java-team
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 8fbf6bf..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,40 +0,0 @@
-#!groovy
-// -*- mode: groovy -*-
-
-build('swag-fraudbusters-management', '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")
- gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
- }
-
- pipeDefault() {
- runStage('init') {
- withGithubSshCredentials {
- sh 'make wc_init'
- }
- }
-
- runStage('build') {
- sh 'make wc_build'
- }
-
- // Java
- runStage('Build client & server') {
- withCredentials([[$class: 'FileBinding', credentialsId: 'java-maven-settings.xml', variable: 'SETTINGS_XML']]) {
- if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic/')) {
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.deploy_client'
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.deploy_server'
- } else {
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.compile_client'
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.compile_server'
- }
- }
- }
- }
-}
diff --git a/build_utils b/build_utils
deleted file mode 160000
index a7655bc..0000000
--- a/build_utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a7655bc60c877a65cdfe3d9b668021d970d88a76
diff --git a/openapi/components/security-schemes/Bearer.yaml b/openapi/components/security-schemes/Bearer.yaml
index 7c0da02..ad61daf 100644
--- a/openapi/components/security-schemes/Bearer.yaml
+++ b/openapi/components/security-schemes/Bearer.yaml
@@ -11,4 +11,4 @@ description: >
Запросы к данному API авторизуются сессионным токеном доступа,
который вы получаете в результате аутентификации в личном кабинете
- по адресу https://dashboard.rbk.money/.
+ по адресу https://dashboard.vality.dev/.
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index 14d3427..268785f 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1,14 +1,14 @@
openapi: 3.0.3
info:
version: 1.0.0
- title: RBKmoney Fraudbusters Management API
+ title: Vality Fraudbusters Management API
description:
$ref: './docs/api.md'
- termsOfService: 'https://rbk.money/'
+ termsOfService: 'https://vality.dev/'
contact:
- name: RBKmoney Support Team
- email: support@rbk.money
- url: 'https://developer.rbk.money'
+ name: Vality Support Team
+ email: support@vality.dev
+ url: 'https://developer.vality.dev'
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/package-lock.json b/package-lock.json
index 27d97c6..0ff49c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "rbkmoney-fraudbusters-management-api",
+ "name": "vality-fraudbusters-management-api",
"version": "1.0.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
- "name": "rbkmoney-fraudbusters-management-api",
+ "name": "vality-fraudbusters-management-api",
"version": "1.0.0",
"dependencies": {
"@redocly/openapi-cli": "^1.0.0-beta.9",
diff --git a/package.json b/package.json
index e4c7226..4e6a41d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "rbkmoney-fraudbusters-management-api",
+ "name": "vality-fraudbusters-management-api",
"version": "1.0.0",
"dependencies": {
"@redocly/openapi-cli": "^1.0.0-beta.53",
diff --git a/pom.xml b/pom.xml
index 3743797..0cba2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
4.0.0
- com.rbkmoney
- parent
- 1.0.0
+ dev.vality
+ library-parent-pom
+ 1.0.2
swag-fraudbusters-management
- 1.0.1-SNAPSHOT
+ 1.0.0-SNAPSHOT
jar
Messages
@@ -19,7 +19,7 @@
- com.rbkmoney.swag.fraudbusters.management
+ dev.vality.swag.fraudbusters.management
UTF-8
1.0.0
11
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..a125a31
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,18 @@
+{
+ "extends": [
+ "config:base"
+ ],
+ "packageRules": [
+ {
+ "matchPackagePatterns": [
+ "*"
+ ],
+ "matchUpdateTypes": [
+ "minor",
+ "patch"
+ ],
+ "groupName": "all non-major dependencies",
+ "groupSlug": "all-minor-patch"
+ }
+ ]
+}