valitydev/newway
14
0
Fork 0
mirror of https://github.com/valitydev/newway.git synced 2024-11-06 09:25:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #195 from rbkmoney/ft/newway/java-15-migration

Browse Source 
Java 15 migration
This commit is contained in:
Pospolita Nikita 2021-06-17 18:24:28 +03:00 committed by GitHub
commit e6aa1fe218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

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

2
build_utils

@ -1 +1 @@
Subproject commit fc6ac0f6810b77a670036f7468575c37e5f9a829
Subproject commit a7655bc60c877a65cdfe3d9b668021d970d88a76

5
pom.xml
View File

@ -5,7 +5,7 @@
<description>SQL-views of business objects</description>
<artifactId>newway</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>newway</name>
@ -13,12 +13,11 @@
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>service-parent-pom</artifactId>
<version>1.2.2</version>
<version>2.0.2</version>
</parent>
<properties>
<project.maintainer>Inal Arsanukaev &lt;i.arsanukaev@rbkmoney.com&gt;</project.maintainer>
<dockerfile.base.service.tag>c0612d6052ac049496b72a23a04acb142035f249</dockerfile.base.service.tag>
<dockerfile.registry>${env.REGISTRY}</dockerfile.registry>
<server.port>8022</server.port>
<management.port>8023</management.port>

1
src/main/java/com/rbkmoney/newway/config/KafkaConfig.java
View File

@ -181,7 +181,6 @@ public class KafkaConfig {
ConcurrentKafkaListenerContainerFactory<String, T> factory) {
factory.setConsumerFactory(consumerFactory);
factory.setBatchListener(true);
factory.getContainerProperties().setAckOnError(false);
factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL);
factory.setBatchErrorHandler(kafkaErrorHandler());
factory.setConcurrency(threadsNumber);