TD-45: to dev.vality (#2)

This commit is contained in:
Baikov Dmitrii 2022-01-27 10:11:41 -08:00 committed by GitHub
parent 6423229be6
commit c8f63b455f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 80 additions and 90 deletions

10
.github/workflows/build.yml vendored Normal file
View File

@ -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

16
.github/workflows/deploy.yml vendored Normal file
View File

@ -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 }}

4
.gitmodules vendored
View File

@ -1,4 +0,0 @@
[submodule "build_utils"]
path = build_utils
url = git@github.com:rbkmoney/build_utils.git
branch = master

13
Jenkinsfile vendored
View File

@ -1,13 +0,0 @@
#!groovy
build('adapter-bank-spring-boot-starter', 'docker-host') {
checkoutRepo()
loadBuildUtils()
def javaLibPipeline
runStage('load JavaLib pipeline') {
javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLib.groovy")
}
def buildImageTag = "fcf116dd775cc2e91bffb6a36835754e3f2d5321"
javaLibPipeline(buildImageTag)
}

View File

@ -1,4 +1,2 @@
# adapter-bank-spring-boot-starter-test
[![Build Status](http://ci.rbkmoney.com/buildStatus/icon?job=rbkmoney_private/adapter-bank-spring-boot-starter-test/master)](http://ci.rbkmoney.com/job/rbkmoney_private/job/adapter-bank-spring-boot-starter-test/job/master/)

@ -1 +0,0 @@
Subproject commit e89b885839df8013df804d48ff24dff10c9c451e

74
pom.xml
View File

@ -4,34 +4,35 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.rbkmoney</groupId>
<groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId>
<version>1.0.6</version>
<version>1.0.2</version>
<relativePath/>
</parent>
<artifactId>adapter-bank-spring-boot-starter-test</artifactId>
<version>0.0.4</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>Adapter bank spring boot starter test</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<java.version>15</java.version>
<adapter-client-lib.version>2.1.27</adapter-client-lib.version>
<adapter-thrift-lib.version>1.0.5</adapter-thrift-lib.version>
<adapter-common-lib.version>0.0.26</adapter-common-lib.version>
<adapter-client-lib.version>1.0.1</adapter-client-lib.version>
<adapter-thrift-lib.version>1.0.0</adapter-thrift-lib.version>
<adapter-common-lib.version>1.0.0</adapter-common-lib.version>
<damsel.version>1.439-b18f037</damsel.version>
<damsel.version>1.544-dcd92dd</damsel.version>
<spring-boot.version>2.3.8.RELEASE</spring-boot.version>
<woody.version>[1.1.21,)</woody.version>
<lombok.version>1.18.4</lombok.version>
<slf4j.version>1.7.30</slf4j.version>
<spring-boot.version>2.6.3</spring-boot.version>
<woody.version>1.0.4</woody.version>
<lombok.version>1.18.22</lombok.version>
<slf4j.version>1.7.35</slf4j.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<error-mapping-java.version>1.0.6</error-mapping-java.version>
<error-mapping-java.version>1.0.0</error-mapping-java.version>
<junit.version>4.12</junit.version>
</properties>
@ -81,27 +82,27 @@
<scope>provided</scope>
</dependency>
<!--rbk-->
<!--dev.vality-->
<dependency>
<groupId>com.rbkmoney</groupId>
<groupId>dev.vality</groupId>
<artifactId>error-mapping-java</artifactId>
<version>${error-mapping-java.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.rbkmoney.woody</groupId>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>${woody.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.rbkmoney</groupId>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>${damsel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.rbkmoney.adapter-thrift-lib</groupId>
<groupId>dev.vality.adapter-thrift-lib</groupId>
<artifactId>damsel-utils</artifactId>
<version>${adapter-thrift-lib.version}</version>
<scope>provided</scope>
@ -115,39 +116,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<configuration>
<destFile>${sonar.jacoco.reportPath}</destFile>
<append>true</append>
</configuration>
<executions>
<execution>
<id>agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

18
renovate.json Normal file
View File

@ -0,0 +1,18 @@
{
"extends": [
"config:base"
],
"packageRules": [
{
"matchPackagePatterns": [
"*"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch"
}
]
}

View File

@ -1,4 +1,4 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test;
package dev.vality.adapter.bank.spring.boot.starter.test;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View File

@ -1,9 +1,9 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test;
package dev.vality.adapter.bank.spring.boot.starter.test;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.constants.Path;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.constants.Postfix;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.utils.SaveIntegrationFileUtils;
import com.rbkmoney.damsel.proxy_provider.*;
import dev.vality.adapter.bank.spring.boot.starter.test.constants.Path;
import dev.vality.adapter.bank.spring.boot.starter.test.constants.Postfix;
import dev.vality.adapter.bank.spring.boot.starter.test.utils.SaveIntegrationFileUtils;
import dev.vality.damsel.proxy_provider.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.thrift.TBase;

View File

@ -1,9 +1,9 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test;
package dev.vality.adapter.bank.spring.boot.starter.test;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.constants.Path;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.constants.Postfix;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.utils.SaveIntegrationFileUtils;
import com.rbkmoney.damsel.proxy_provider.*;
import dev.vality.adapter.bank.spring.boot.starter.test.constants.Path;
import dev.vality.adapter.bank.spring.boot.starter.test.constants.Postfix;
import dev.vality.adapter.bank.spring.boot.starter.test.utils.SaveIntegrationFileUtils;
import dev.vality.damsel.proxy_provider.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.thrift.TBase;

View File

@ -1,4 +1,4 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test.constants;
package dev.vality.adapter.bank.spring.boot.starter.test.constants;
public class Path {

View File

@ -1,4 +1,4 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test.constants;
package dev.vality.adapter.bank.spring.boot.starter.test.constants;
public class Postfix {

View File

@ -1,8 +1,8 @@
package com.rbkmoney.adapter.bank.spring.boot.starter.test.utils;
package dev.vality.adapter.bank.spring.boot.starter.test.utils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.rbkmoney.adapter.bank.spring.boot.starter.test.GenerationDataMethod;
import dev.vality.adapter.bank.spring.boot.starter.test.GenerationDataMethod;
import lombok.extern.slf4j.Slf4j;
import java.io.File;

View File

@ -6,5 +6,5 @@
<root level="warn">
<appender-ref ref="CONSOLE"/>
</root>
<logger name="com.rbkmoney.woody" level="ALL"/>
<logger name="dev.vality.woody" level="ALL"/>
</configuration>