Commit fd18429f authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update dependencies & configs & helm chart

parent 9d88979f
Pipeline #24782 passed with stages
in 4 minutes and 1 second
......@@ -19,20 +19,18 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
repositories {
jcenter()
mavenCentral()
maven {
url "https://dl.bintray.com/memoriav/memobase"
url "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
}
}
ext {
kafkaV = '2.3.1'
kafkaV = '2.7.0'
log4jV = '2.11.2'
}
dependencies {
// https://mvnrepository.com/artifact/org.elasticsearch.client/elasticsearch-rest-high-level-client
//compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '7.1.0'
// Logging Framework
implementation "org.apache.logging.log4j:log4j-api:${log4jV}"
......@@ -44,9 +42,9 @@ dependencies {
implementation "org.apache.kafka:kafka-streams:${kafkaV}"
// JSON Parser
implementation 'com.beust:klaxon:5.2'
implementation 'com.beust:klaxon:5.5'
implementation 'org.memobase:memobase-service-utilities:2.0.15'
implementation 'org.memobase:memobase-service-utilities:3.0.1'
implementation 'org.apache.jena:apache-jena:3.14.0'
......
deploymentName: di-media-linker-prod
applicationId: di-media-linker-prod-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-media-linker-prod
outputTopicName: mb-di-media-metadata-prod
reportingTopicName: mb-di-reports-prod
env: prod
\ No newline at end of file
deploymentName: di-media-linker-stage
applicationId: di-media-linker-stage-app
kafkaConfigs: stage-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-media-linker-stage
outputTopicName: mb-di-media-metadata-stage
reportingTopicName: mb-di-reports-stage
env: stage
\ No newline at end of file
deploymentName: di-media-linker-test
applicationId: di-media-linker-test-app
kafkaConfigs: test-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-media-linker-test
outputTopicName: mb-di-media-metadata-test
reportingTopicName: mb-di-reports-test
env: test
\ No newline at end of file
deploymentName: ip-media-linker
applicationId: media-linker-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
sftpBasePath: /swissbib_index/mb_sftp
inputTopicName: import-process-media-linker
outputTopicName: import-process-media-metadata
reportingTopicName: import-process-reporting
\ No newline at end of file
......@@ -14,7 +14,7 @@ spec:
metadata:
labels:
app: {{ .Values.deploymentName }}
tier: import-process
environment: {{ .Values.env }}
spec:
restartPolicy: Always
containers:
......
......@@ -19,3 +19,5 @@ extensions: jpg,jpeg,png,mp3,mp4
inputTopicName: import-process-mapper
outputTopicName: import-process-media-linker
reportingTopicName: import-process-reporting
env: placeholder
\ No newline at end of file
......@@ -39,7 +39,7 @@ class Service(file: String = "app.yml") {
val stream = KafkaStreams(builder.build(), settings.kafkaStreamsSettings)
stream.use {
it.start()
while (stream.state().isRunning) {
while (stream.state().isRunningOrRebalancing) {
log.info("Service is running.")
Thread.sleep(10_000L)
}
......
import kotlin.test.assertNotNull
import kotlin.test.assertNull
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.Test
import org.memobase.RemoteResourceHandler
......
Markdown is supported
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