diff --git a/Jenkinsfile b/Jenkinsfile
index 498503a..2114360 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,12 +5,11 @@ build('newway', 'java-maven') {
def javaServicePipeline
runStage('load JavaService pipeline') {
- javaServicePipeline = load("build_utils/jenkins_lib/pipeJavaService.groovy")
+ javaServicePipeline = load("build_utils/jenkins_lib/pipeJavaServiceInsideDocker.groovy")
}
def serviceName = env.REPO_NAME
def mvnArgs = '-DjvmArgs="-Xmx256m"'
- def useJava11 = true
- javaServicePipeline(serviceName, useJava11, mvnArgs)
+ javaServicePipeline(serviceName, mvnArgs)
}
diff --git a/build_utils b/build_utils
index fc6ac0f..a7655bc 160000
--- a/build_utils
+++ b/build_utils
@@ -1 +1 @@
-Subproject commit fc6ac0f6810b77a670036f7468575c37e5f9a829
+Subproject commit a7655bc60c877a65cdfe3d9b668021d970d88a76
diff --git a/pom.xml b/pom.xml
index f997f3f..1eba90e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
SQL-views of business objects
newway
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
jar
newway
@@ -13,12 +13,11 @@
com.rbkmoney
service-parent-pom
- 1.2.2
+ 2.0.2
Inal Arsanukaev <i.arsanukaev@rbkmoney.com>
- c0612d6052ac049496b72a23a04acb142035f249
${env.REGISTRY}
8022
8023
diff --git a/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java b/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java
index e129732..9a091e2 100644
--- a/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java
+++ b/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java
@@ -181,7 +181,6 @@ public class KafkaConfig {
ConcurrentKafkaListenerContainerFactory factory) {
factory.setConsumerFactory(consumerFactory);
factory.setBatchListener(true);
- factory.getContainerProperties().setAckOnError(false);
factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL);
factory.setBatchErrorHandler(kafkaErrorHandler());
factory.setConcurrency(threadsNumber);