Commit 1a2d4c21 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update gradle & dependencies

Update java
Remove unnecessary logging
parent 1573816f
Pipeline #51222 failed with stages
in 1 minute and 44 seconds
...@@ -7,7 +7,7 @@ stages: ...@@ -7,7 +7,7 @@ stages:
include: include:
- project: 'memoriav/memobase-2020/utilities/ci-templates' - project: 'memoriav/memobase-2020/utilities/ci-templates'
file: 'gradle-test/gradle-test.yml' file: 'gradle-test-7.4/gradle-test-7.4.yml'
- project: 'memoriav/memobase-2020/utilities/ci-templates' - project: 'memoriav/memobase-2020/utilities/ci-templates'
file: 'docker-image/docker-image.yml' file: 'docker-image/docker-image.yml'
- project: 'memoriav/memobase-2020/utilities/ci-templates' - project: 'memoriav/memobase-2020/utilities/ci-templates'
......
FROM gradle:6.3-jdk8 FROM gradle:7.4.2-jdk17-alpine
ADD . / ADD . /
WORKDIR / WORKDIR /
RUN gradle --no-daemon --no-scan --no-build-cache distTar RUN gradle --no-daemon --no-scan --no-build-cache distTar
RUN cd /build/distributions && tar xf app.tar RUN cd /build/distributions && tar xf app.tar
FROM openjdk:8-jre FROM openjdk:17-slim
COPY --from=0 /build/distributions/app /app COPY --from=0 /build/distributions/app /app
CMD /app/bin/xml-data-transform CMD /app/bin/xml-data-transform
plugins { plugins {
id 'application' id 'application'
id 'distribution' id 'distribution'
id 'org.jetbrains.kotlin.jvm' version '1.3.71' id 'org.jetbrains.kotlin.jvm' version '1.6.21'
id "com.gitlab.morality.grit" version "2.0.2" id "com.gitlab.morality.grit" version "2.0.2"
id 'org.jlleitschuh.gradle.ktlint' version '9.2.1' id 'org.jlleitschuh.gradle.ktlint' version '9.2.1'
} }
...@@ -26,8 +26,8 @@ repositories { ...@@ -26,8 +26,8 @@ repositories {
} }
ext { ext {
kafkaV = '2.7.0' kafkaV = '2.7.2'
log4jV = '2.17.0' log4jV = '2.17.2'
} }
dependencies { dependencies {
...@@ -44,23 +44,25 @@ dependencies { ...@@ -44,23 +44,25 @@ dependencies {
implementation 'com.hierynomus:sshj:0.27.0' implementation 'com.hierynomus:sshj:0.27.0'
// https://mvnrepository.com/artifact/net.sf.saxon/Saxon-HE // https://mvnrepository.com/artifact/net.sf.saxon/Saxon-HE
compile group: 'net.sf.saxon', name: 'Saxon-HE', version: '9.9.1-7' implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '9.9.1-7'
// used by saxon library // used by saxon library
// https://mvnrepository.com/artifact/com.ibm.icu/icu4j // https://mvnrepository.com/artifact/com.ibm.icu/icu4j
compile group: 'com.ibm.icu', name: 'icu4j', version: '67.1' implementation group: 'com.ibm.icu', name: 'icu4j', version: '67.1'
implementation 'com.beust:klaxon:5.5' implementation 'com.beust:klaxon:5.5'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.71" implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.6.21"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.71" implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.21"
testCompile("org.junit.jupiter:junit-jupiter:5.4.2") testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
testImplementation 'org.assertj:assertj-core:3.15.0' testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation group: 'org.apache.kafka', name: 'kafka-streams-test-utils', version: kafkaV
}
// https://mvnrepository.com/artifact/org.apache.kafka/kafka-streams-test-utils configurations.all {
testCompile group: 'org.apache.kafka', name: 'kafka-streams-test-utils', version: kafkaV exclude module: 'slf4j-log4j12'
} }
compileKotlin { compileKotlin {
......
#Tue May 19 16:49:13 CEST 2020 #Tue May 19 16:49:13 CEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=GRADLE_USER_HOME distributionPath=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
......
...@@ -47,7 +47,6 @@ class Service(file: String = "app.yml") { ...@@ -47,7 +47,6 @@ class Service(file: String = "app.yml") {
stream.use { stream.use {
it.start() it.start()
while (stream.state().isRunningOrRebalancing) { while (stream.state().isRunningOrRebalancing) {
log.info("Service is running.")
Thread.sleep(10_000L) Thread.sleep(10_000L)
} }
throw Exception("Stream stopped running!") throw Exception("Stream stopped running!")
......
...@@ -27,5 +27,8 @@ ...@@ -27,5 +27,8 @@
<Root level="info"> <Root level="info">
<AppenderRef ref="STDOUT"/> <AppenderRef ref="STDOUT"/>
</Root> </Root>
<Logger name="org.apache.kafka" level="warn">
<AppenderRef ref="STDOUT"/>
</Logger>
</Loggers> </Loggers>
</Configuration> </Configuration>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment