diff --git a/.gitignore b/.gitignore index f475b5d..a860c7e 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,5 @@ fabric.properties hs_err_pid* env.list /src/test/resources/tmp/ +/src/test/java/com/.DS_Store /tmp/ diff --git a/Jenkinsfile b/Jenkinsfile index 52a9f76..83d0668 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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) } diff --git a/pom.xml b/pom.xml index 9f3522b..f5909c3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,17 @@ - 4.0.0 - com.rbkmoney + + + com.rbkmoney + parent + 1.0.5 + + + mg-event-sink-listener-spring-boot-starter - 0.0.5-SNAPSHOT + 0.0.6-SNAPSHOT jar @@ -14,17 +20,16 @@ UTF-8 8 - ${project.basedir}/target/jacoco.exec dr2.rbkmoney.com - 2.1.0.RELEASE + 2.3.7.RELEASE 0.0.9 - 2.1.3 1.12-ebae56f 0.6.7 - 1.1.15 - 0.3.6 - 1.302-70373bd - a72d939ee965b89432cd5b502b3a369aad74093f + [1.1.21,) + 0.3.8 + 1.466-060478e + 2.12.0 + c0612d6052ac049496b72a23a04acb142035f249 @@ -35,12 +40,6 @@ 4.0.1 provided - - org.slf4j - slf4j-api - 1.7.25 - provided - org.projectlombok lombok @@ -72,11 +71,6 @@ ${spring-boot.version} provided - - com.rbkmoney - kafka-common-lib - ${kafka.common.lib.version} - org.rocksdb rocksdbjni @@ -85,17 +79,17 @@ org.apache.kafka kafka-streams - 2.3.0 + 2.7.0 org.apache.kafka kafka-clients - 2.3.0 + 2.7.0 org.springframework.kafka spring-kafka - 2.2.2.RELEASE + 2.3.7.RELEASE org.apache.kafka @@ -137,27 +131,33 @@ com.rbkmoney.geck filter - 0.6.4 + 0.6.11 + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} org.springframework.boot spring-boot-starter-test - ${spring-boot.version} + 2.3.7.RELEASE test org.testcontainers kafka - 1.10.2 + 1.15.1 test - org.apache.kafka - kafka-streams-test-utils - 2.1.0 - test + org.jetbrains + annotations + 16.0.3 + compile commons-io @@ -166,33 +166,7 @@ test - - http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/groups/public - - false - releases - RBKmoney releases repository - http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/repositories/releases - default - - - true - snapshots - RBKmoney snapshots repository - http://java-nexus.msk1.rbkmoney.net:8081/nexus/content/repositories/snapshots - default - - - - - - org.slf4j - slf4j-api - 1.7.25 - - - @@ -208,23 +182,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.8.2 - - ${sonar.jacoco.reportPath} - true - - - - agent - - prepare-agent - - - - diff --git a/src/test/java/com/rbkmoney/MgEventSinkFlowGenerator.java b/src/test/java/com/rbkmoney/MgEventSinkFlowGenerator.java index bdae7ae..c72ec0c 100644 --- a/src/test/java/com/rbkmoney/MgEventSinkFlowGenerator.java +++ b/src/test/java/com/rbkmoney/MgEventSinkFlowGenerator.java @@ -162,7 +162,7 @@ public class MgEventSinkFlowGenerator { .setToken("477bba133c182267fe5f086924abdc5db71f77bfc27f01f2843f2cdc69d89f05") .setPaymentSystem(BankCardPaymentSystem.mastercard) .setBin(BIN) - .setMaskedPan("4242") + .setLastDigits("3333") .setIssuerCountry(Residence.RUS) ); return paymentTool;