IS-1400: bump deps (#7)

This commit is contained in:
Anatoly Cherkasov 2021-01-13 14:18:15 +03:00 committed by GitHub
parent 3e1e88eaca
commit bb1812495f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 76 deletions

1
.gitignore vendored
View File

@ -77,4 +77,5 @@ fabric.properties
hs_err_pid*
env.list
/src/test/resources/tmp/
/src/test/java/com/.DS_Store
/tmp/

2
Jenkinsfile vendored
View File

@ -8,6 +8,6 @@ build('mg-event-sink-listener-spring-boot-starter', 'docker-host') {
javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLibOutsideImage.groovy")
}
def buildImageTag = "a72d939ee965b89432cd5b502b3a369aad74093f"
def buildImageTag = "fcf116dd775cc2e91bffb6a36835754e3f2d5321"
javaLibPipeline(buildImageTag)
}

105
pom.xml
View File

@ -2,11 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.rbkmoney</groupId>
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>parent</artifactId>
<version>1.0.5</version>
<relativePath/>
</parent>
<artifactId>mg-event-sink-listener-spring-boot-starter</artifactId>
<version>0.0.5-SNAPSHOT</version>
<version>0.0.6-SNAPSHOT</version>
<packaging>jar</packaging>
<description></description>
@ -14,17 +20,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version>
<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
<dockerfile.registry>dr2.rbkmoney.com</dockerfile.registry>
<spring-boot.version>2.1.0.RELEASE</spring-boot.version>
<spring-boot.version>2.3.7.RELEASE</spring-boot.version>
<kafka.common.lib.version>0.0.9</kafka.common.lib.version>
<damsel-utils.version>2.1.3</damsel-utils.version>
<machinegun-proto.version>1.12-ebae56f</machinegun-proto.version>
<geck.version>0.6.7</geck.version>
<woody.thrift.version>1.1.15</woody.thrift.version>
<shared.resources.version>0.3.6</shared.resources.version>
<damsel.version>1.302-70373bd</damsel.version>
<dockerfile.build.tag>a72d939ee965b89432cd5b502b3a369aad74093f</dockerfile.build.tag>
<woody.thrift.version>[1.1.21,)</woody.thrift.version>
<shared.resources.version>0.3.8</shared.resources.version>
<damsel.version>1.466-060478e</damsel.version>
<jackson.version>2.12.0</jackson.version>
<dockerfile.build.tag>c0612d6052ac049496b72a23a04acb142035f249</dockerfile.build.tag>
</properties>
<dependencies>
@ -35,12 +40,6 @@
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@ -72,11 +71,6 @@
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.rbkmoney</groupId>
<artifactId>kafka-common-lib</artifactId>
<version>${kafka.common.lib.version}</version>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
@ -85,17 +79,17 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-streams</artifactId>
<version>2.3.0</version>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>2.3.0</version>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.2.2.RELEASE</version>
<version>2.3.7.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.apache.kafka</groupId>
@ -137,27 +131,33 @@
<dependency>
<groupId>com.rbkmoney.geck</groupId>
<artifactId>filter</artifactId>
<version>0.6.4</version>
<version>0.6.11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<!--test-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<version>2.3.7.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
<version>1.10.2</version>
<version>1.15.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-streams-test-utils</artifactId>
<version>2.1.0</version>
<scope>test</scope>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>16.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@ -166,33 +166,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<downloadUrl>http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/groups/public</downloadUrl>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>releases</id>
<name>RBKmoney releases repository</name>
<url>http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/repositories/releases</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<uniqueVersion>true</uniqueVersion>
<id>snapshots</id>
<name>RBKmoney snapshots repository</name>
<url>http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/repositories/snapshots</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
@ -208,23 +182,6 @@
</execution>
</executions>
</plugin>
<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>

View File

@ -162,7 +162,7 @@ public class MgEventSinkFlowGenerator {
.setToken("477bba133c182267fe5f086924abdc5db71f77bfc27f01f2843f2cdc69d89f05")
.setPaymentSystem(BankCardPaymentSystem.mastercard)
.setBin(BIN)
.setMaskedPan("4242")
.setLastDigits("3333")
.setIssuerCountry(Residence.RUS)
);
return paymentTool;