From 756de4ba5dc9fb44d489acb3a9a829d9ae0276fd Mon Sep 17 00:00:00 2001 From: Baikov Dmitrii <44803026+D-Baykov@users.noreply.github.com> Date: Thu, 27 Jan 2022 23:35:20 -0800 Subject: [PATCH] TD-45: Bump libs (#14) Co-authored-by: dmitriibaikov --- .github/workflows/build.yml | 13 +----- .github/workflows/deploy.yml | 20 +++----- .gitmodules | 4 -- CODEOWNERS | 2 +- Jenkinsfile | 14 ------ pom.xml | 91 ++++++++++++++++++------------------ 6 files changed, 56 insertions(+), 88 deletions(-) delete mode 100644 .gitmodules delete mode 100644 Jenkinsfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c469f7b..7381159 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Artifact +name: Maven Build Artifact on: pull_request: @@ -7,13 +7,4 @@ on: jobs: build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Set up Maven Central Repository - uses: actions/setup-java@v2 - with: - java-version: '15' - distribution: 'adopt' - - name: Build package - run: mvn --batch-mode clean compile \ No newline at end of file + 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 index 130ace0..df9c2f4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy package +name: Maven Deploy Artifact on: push: @@ -8,15 +8,9 @@ on: jobs: deploy: - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - uses: actions/checkout@v2 - - - name: Deploy package - uses: valitydev/action-deploy-jdk-package@v1.0.13 - 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 }} + 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 index b12e43d..d48cf0f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @rbkmoney/java-leads \ No newline at end of file +* @valitydev/java-leads \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ac026cf..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,14 +0,0 @@ -#!groovy -build('java-service-dependencies', 'docker-host') { - checkoutRepo() - loadBuildUtils() - - def javaLibPipeline - runStage('load JavaLib pipeline') { - javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLib.groovy") - } - - - def buildImageTag = "442c2c274c1d8e484e5213089906a4271641d95e" - javaLibPipeline(buildImageTag) -} diff --git a/pom.xml b/pom.xml index 2ace59b..63090a1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 dev.vality java-service-dependencies - 1.0.4 + 1.0.5 pom Vality parent Vality library parent pom @@ -39,29 +39,30 @@ ossrh https://s01.oss.sonatype.org/ 1.2.5 - 0.0.5 + 1.0.0 + 0.0.1 1.0.4 1.18.22 1.6.0 1.544-dcd92dd 0.2.0 - 1.0.6 + 1.0.0 2.1.23 - 1.0.6 - 1.0.8 - 0.0.19 - 1.0.12 - 0.0.4 - 3.0.0 - 0.0.30 - 1.0.4 - 0.6.12 + 1.0.0 + 1.0.0 + 0.0.1 + 1.0.0 + 0.0.1 + 1.0.1 + 1.0.0 + 0.0.1 + 0.0.1 1.268-45c8524 - 0.0.5 - 0.1.9 - 0.0.5-SNAPSHOT + 0.0.1 + 0.0.1 + 0.0.1 1.1.3 - 1.4.0 + 0.0.1 2.1.21 4.0.0 @@ -69,12 +70,12 @@ - com.rbkmoney + dev.vality custom-metrics-spring-boot-starter - ${custom-metrics.version} + ${custom-metrics-spring-boot-starter.version} - com.rbkmoney + dev.vality custom-actuator-endpoints ${custom-actuator.version} @@ -104,112 +105,112 @@ ${mamsel.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib cds-client-storage ${adapter-client.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib hellgate-adapter-client ${adapter-client.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib fistful-client-withdrawal ${adapter-client.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib fistful-client ${adapter-client.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib bender-client ${adapter-client.version} - com.rbkmoney.adapter-client-lib + dev.vality.adapter-client-lib cds-client-identity-document-storage ${adapter-client.version} - com.rbkmoney.adapter-thrift-lib + dev.vality.adapter-thrift-lib damsel-utils ${damsel-utils.version} - com.rbkmoney.adapter-thrift-lib + dev.vality.adapter-thrift-lib cds-utils ${cds-utils.version} - com.rbkmoney + dev.vality adapter-common-lib ${adapter-common-lib.version} - com.rbkmoney + dev.vality error-mapping-java ${error-mapping-java.version} - com.rbkmoney + dev.vality adapter-bank-spring-boot-starter ${adapter-starter.version} - com.rbkmoney + dev.vality adapter-bank-payout-spring-boot-starter ${adapter-payout-starter.version} - com.rbkmoney + dev.vality adapter-bank-spring-boot-starter-test ${adapter-starter-test.version} - com.rbkmoney.logback + dev.vality.logback nop-rolling ${nop-rolling.version} - com.rbkmoney.geck + dev.vality.geck serializer ${geck.verion} - com.rbkmoney.geck + dev.vality.geck common ${geck.verion} - com.rbkmoney.geck + dev.vality.geck filter ${geck.verion} - com.rbkmoney.geck + dev.vality.geck migrator ${geck.verion} - com.rbkmoney + dev.vality + vality-http-client + ${vality-http-client.version} + + + dev.vality db-common-lib ${db-common-lib.version} - com.rbkmoney + dev.vality kafka-common-lib ${kafka-common-lib.version} - com.rbkmoney.rbk.http.client - rbk-http-client - ${rbk-http-client.version} - - - com.rbkmoney + dev.vality shared-resources ${shared-resources.version}