From 18e4a0cbb7e9db856b878ff4cf48292fd439b921 Mon Sep 17 00:00:00 2001 From: Baikov Dmitrii <44803026+D-Baykov@users.noreply.github.com> Date: Thu, 27 Jan 2022 06:02:54 -0800 Subject: [PATCH] TD-45: to dev.vality (#2) --- .github/workflows/build.yml | 10 ++++++++++ .github/workflows/deploy.yml | 16 +++++++++++++++ .gitmodules | 4 ---- Jenkinsfile | 13 ------------ build_utils | 1 - pom.xml | 20 +++++++++---------- renovate.json | 18 +++++++++++++++++ .../vality}/dao/DaoException.java | 2 +- .../vality}/dao/GenericDao.java | 2 +- .../vality}/dao/impl/AbstractGenericDao.java | 6 +++--- .../vality}/mapper/RecordRowMapper.java | 4 ++-- .../dao/impl/AbstractGenericDaoTest.java | 4 ++-- 12 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/deploy.yml delete mode 100644 .gitmodules delete mode 100644 Jenkinsfile delete mode 160000 build_utils create mode 100644 renovate.json rename src/main/java/{com/rbkmoney => dev/vality}/dao/DaoException.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/dao/GenericDao.java (99%) rename src/main/java/{com/rbkmoney => dev/vality}/dao/impl/AbstractGenericDao.java (99%) rename src/main/java/{com/rbkmoney => dev/vality}/mapper/RecordRowMapper.java (95%) rename test/java/{com/rbkmoney => dev/vality}/dao/impl/AbstractGenericDaoTest.java (98%) 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/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 067a2ae..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,13 +0,0 @@ -#!groovy -build('db-common-lib', 'docker-host') { - checkoutRepo() - loadBuildUtils() - - def javaLibPipeline - runStage('load JavaLib pipeline') { - javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLib.groovy") - } - - def buildImageTag = "917afcdd0c0a07bf4155d597bbba72e962e1a34a" - javaLibPipeline(buildImageTag) -} 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/pom.xml b/pom.xml index f8e7330..b5929d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,20 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.rbkmoney + dev.vality library-parent-pom - 1.0.4 + 1.0.2 4.0.0 jar db-common-lib - 0.0.5 + 0.0.1 db-common-lib Abstract dao and row mappers - https://github.com/rbkmoney/db-common-lib + https://github.com/valitydev/db-common-lib @@ -29,9 +29,9 @@ Vitaly Banin - v.banin@rbkmoney.com - RBK.money - https://rbk.money + v.banin@vality.dev + Vality + https://vality.dev @@ -40,7 +40,7 @@ 1.8 1.8 3.13.2 - 0.6.11 + 0.0.1 @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-jdbc - 2.5.3 + 2.6.0 provided @@ -67,7 +67,7 @@ provided - com.rbkmoney.geck + dev.vality.geck common ${geck.common.version} provided 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" + } + ] +} diff --git a/src/main/java/com/rbkmoney/dao/DaoException.java b/src/main/java/dev/vality/dao/DaoException.java similarity index 95% rename from src/main/java/com/rbkmoney/dao/DaoException.java rename to src/main/java/dev/vality/dao/DaoException.java index 19c1012..e4c95b4 100644 --- a/src/main/java/com/rbkmoney/dao/DaoException.java +++ b/src/main/java/dev/vality/dao/DaoException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.dao; +package dev.vality.dao; public class DaoException extends RuntimeException { diff --git a/src/main/java/com/rbkmoney/dao/GenericDao.java b/src/main/java/dev/vality/dao/GenericDao.java similarity index 99% rename from src/main/java/com/rbkmoney/dao/GenericDao.java rename to src/main/java/dev/vality/dao/GenericDao.java index 4975351..78a2583 100644 --- a/src/main/java/com/rbkmoney/dao/GenericDao.java +++ b/src/main/java/dev/vality/dao/GenericDao.java @@ -1,4 +1,4 @@ -package com.rbkmoney.dao; +package dev.vality.dao; import org.jooq.Query; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/rbkmoney/dao/impl/AbstractGenericDao.java b/src/main/java/dev/vality/dao/impl/AbstractGenericDao.java similarity index 99% rename from src/main/java/com/rbkmoney/dao/impl/AbstractGenericDao.java rename to src/main/java/dev/vality/dao/impl/AbstractGenericDao.java index 0e44edc..f093f9e 100644 --- a/src/main/java/com/rbkmoney/dao/impl/AbstractGenericDao.java +++ b/src/main/java/dev/vality/dao/impl/AbstractGenericDao.java @@ -1,7 +1,7 @@ -package com.rbkmoney.dao.impl; +package dev.vality.dao.impl; -import com.rbkmoney.dao.DaoException; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.DaoException; +import dev.vality.dao.GenericDao; import org.jooq.*; import org.jooq.conf.ParamType; import org.jooq.impl.DSL; diff --git a/src/main/java/com/rbkmoney/mapper/RecordRowMapper.java b/src/main/java/dev/vality/mapper/RecordRowMapper.java similarity index 95% rename from src/main/java/com/rbkmoney/mapper/RecordRowMapper.java rename to src/main/java/dev/vality/mapper/RecordRowMapper.java index c63f55b..b1d28e2 100644 --- a/src/main/java/com/rbkmoney/mapper/RecordRowMapper.java +++ b/src/main/java/dev/vality/mapper/RecordRowMapper.java @@ -1,6 +1,6 @@ -package com.rbkmoney.mapper; +package dev.vality.mapper; -import com.rbkmoney.geck.common.util.TypeUtil; +import dev.vality.geck.common.util.TypeUtil; import org.jooq.Field; import org.jooq.Table; import org.jooq.TableRecord; diff --git a/test/java/com/rbkmoney/dao/impl/AbstractGenericDaoTest.java b/test/java/dev/vality/dao/impl/AbstractGenericDaoTest.java similarity index 98% rename from test/java/com/rbkmoney/dao/impl/AbstractGenericDaoTest.java rename to test/java/dev/vality/dao/impl/AbstractGenericDaoTest.java index 962fb87..9a717b9 100644 --- a/test/java/com/rbkmoney/dao/impl/AbstractGenericDaoTest.java +++ b/test/java/dev/vality/dao/impl/AbstractGenericDaoTest.java @@ -1,6 +1,6 @@ -package com.rbkmoney.dao.impl; +package dev.vality.dao.impl; -import com.rbkmoney.dao.DaoException; +import dev.vality.dao.DaoException; import org.jooq.DataType; import org.jooq.Param; import org.jooq.Query;