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

Update dependecies

Update helm chart & configs
parent cd9adb3f
Pipeline #24760 passed with stages
in 3 minutes and 43 seconds
......@@ -2,12 +2,11 @@ plugins {
id 'application'
id 'distribution'
id 'org.jetbrains.kotlin.jvm' version '1.3.71'
id 'com.palantir.git-version' version '0.11.0'
id 'com.gitlab.morality.grit' version '2.0.2'
id 'org.jlleitschuh.gradle.ktlint' version '9.2.1'
}
group 'org.memobase'
version = gitVersion()
mainClassName = 'org.memobase.App'
jar {
......@@ -20,24 +19,22 @@ 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 {
implementation 'org.memobase:memobase-service-utilities:2.0.15'
implementation 'org.memobase:memobase-service-utilities:3.0.1'
// Logging Framework
implementation "org.apache.logging.log4j:log4j-api:${log4jV}"
implementation "org.apache.logging.log4j:log4j-core:${log4jV}"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jV}"
// Kafka Imports
//implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV
......@@ -52,7 +49,7 @@ dependencies {
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.+'
// JSON Parser
implementation 'com.beust:klaxon:5.2'
implementation 'com.beust:klaxon:5.5'
// CSV Reader
implementation("com.github.doyaaaaaken:kotlin-csv-jvm:0.7.3")
......
deploymentName: dp-sync
inputTopic: drupal-json-api-input
outputTopic: drupal-sync-output
kafkaConfigs: prod-kafka-bootstrap-servers
\ No newline at end of file
deploymentName: gi-drupal-syncer-prod
kafkaConfigs: prod-kafka-bootstrap-servers
inputTopic: mb-gi-drupal-export-prod
outputTopic: mb-gi-rdf-objects-prod
reportingTopic: mb-di-reporting-prod
metadataLanguageLabels: prod-metadata-language-labels-csv
cantonLabels: prod-canton-labels-csv
municipalityLabels: prod-municipality-labels-csv
env: prod
\ No newline at end of file
deploymentName: gi-drupal-syncer-stage
kafkaConfigs: prod-kafka-bootstrap-servers
inputTopic: mb-gi-drupal-export-stage
outputTopic: mb-gi-rdf-objects-stage
reportingTopic: mb-di-reporting-stage
metadataLanguageLabels: stage-metadata-language-labels-csv
cantonLabels: stage-canton-labels-csv
municipalityLabels: stage-municipality-labels-csv
env: stage
\ No newline at end of file
deploymentName: gi-drupal-syncer-test
kafkaConfigs: test-kafka-bootstrap-servers
inputTopic: mb-gi-drupal-export-test
outputTopic: mb-gi-rdf-objects-test
reportingTopic: mb-di-reporting-test
metadataLanguageLabels: test-metadata-language-labels-csv
cantonLabels: test-canton-labels-csv
municipalityLabels: test-municipality-labels-csv
env: test
\ No newline at end of file
......@@ -10,4 +10,4 @@ data:
PATH_MUNICIPALITY_LABELS: "{{ .Values.pathMunicipalityLabels }}"
TOPIC_IN: "{{ .Values.inputTopic }}"
TOPIC_OUT: "{{ .Values.outputTopic }}"
TOPIC_PROCESS: "{{ .Values.deploymentName }}-reporting"
\ No newline at end of file
TOPIC_PROCESS: {{ .Values.reportingTopic }}
\ No newline at end of file
......@@ -9,6 +9,7 @@ spec:
selector:
matchLabels:
app: "{{ .Values.deploymentName }}-deployment"
environment: {{ .Values.env }}
replicas: 1
template:
metadata:
......
......@@ -3,14 +3,17 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/drupal-sync-service"
tag: "latest"
deploymentName: drupal-sync
inputTopic: drupal-json-api-input
outputTopic: drupal-sync-output
kafkaConfigs: prod-kafka-bootstrap-servers
deploymentName: placeholder
inputTopic: placeholder
outputTopic: placeholder
reportingTopic: placeholder
kafkaConfigs: placeholder
metadataLanguageLabels: metadata-language-labels-csv
metadataLanguageLabels: placeholder
pathLanguageSource: /configs/languages/labels.csv
cantonLabels: canton-labels-csv
cantonLabels: placeholder
pathCantonLabels: /configs/cantons/labels.csv
municipalityLabels: municipality-labels-csv
pathMunicipalityLabels: /configs/municipalities/labels.csv
\ No newline at end of file
municipalityLabels: placeholder
pathMunicipalityLabels: /configs/municipalities/labels.csv
env: placeholder
\ No newline at end of file
......@@ -41,7 +41,7 @@ class Service(file: String = "app.yml") {
fun run() {
stream.use {
it.start()
while (stream.state().isRunning) {
while (stream.state().isRunningOrRebalancing) {
log.info("Service is running.")
Thread.sleep(10_000L)
}
......
......@@ -27,8 +27,8 @@ mbrs:testComplete a rico:RecordSet ;
rdau:P60099 "Französisch"@it , "Französisch"@fr , "Französisch"@de ;
rdau:P60451 mbcb:mrv ;
rdau:P60451 [ a rico:CorporateBody ;
schema:sameAs "http://memobase.ch/de/stock/detail/Tanzarchiv-121" ;
rico:title "Projektname (DE)"@de ;
schema:sameAs "https://project.org/fr" ;
rico:title "Projekt Titel (FR)"@fr ;
rico:type "memoriavProject"
] ;
rdau:P60451 [ a rico:CorporateBody ;
......@@ -37,8 +37,8 @@ mbrs:testComplete a rico:RecordSet ;
rico:type "memoriavProject"
] ;
rdau:P60451 [ a rico:CorporateBody ;
schema:sameAs "https://project.org/fr" ;
rico:title "Projekt Titel (FR)"@fr ;
schema:sameAs "http://memobase.ch/de/stock/detail/Tanzarchiv-121" ;
rico:title "Projektname (DE)"@de ;
rico:type "memoriavProject"
] ;
rdau:P60496 "<p>Zugang Memobase (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de , "<p>Zugang Memobase (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Zugang Memobase (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it ;
......@@ -68,6 +68,10 @@ mbrs:testComplete a rico:RecordSet ;
] ;
rico:heldBy "https://memobase.ch/institution/completeInstitution" ;
rico:history "<p>Kontext (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de , "<p>Kontext (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Kontext (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "testComplete" ;
rico:type "main"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "ORIGINAL_ID" ;
rico:type "original"
......@@ -76,10 +80,6 @@ mbrs:testComplete a rico:RecordSet ;
rico:identifier "OLD_MEMOBASE_ID" ;
rico:type "oldMemobase"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "testComplete" ;
rico:type "main"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "Original-Signatur des Bestandes" ;
rico:type "callNumber"
......@@ -91,15 +91,9 @@ mbrs:testComplete a rico:RecordSet ;
rico:isRecordResourceAssociatedWithRecordResource
mbrs:testComplete ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:RecordSet ;
schema:sameAs "https://example.org" ;
rico:title "Verwandte Bestände (FR)"@fr ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:RecordSet ;
schema:sameAs "https://example.org" ;
rico:title "Verwandter Bestand Extern (DE)"@de ;
[ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Dokument (IT)"@it ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
......@@ -111,7 +105,13 @@ mbrs:testComplete a rico:RecordSet ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Dokument (IT)"@it ;
rico:title "Dokumente (FR)"@fr ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:RecordSet ;
schema:sameAs "https://example.org" ;
rico:title "Verwandter Bestand Extern (DE)"@de ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
......@@ -121,19 +121,19 @@ mbrs:testComplete a rico:RecordSet ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Dokumente (FR)"@fr ;
[ a rico:RecordSet ;
schema:sameAs "https://example.org" ;
rico:title "Verwandte Bestände (FR)"@fr ;
rico:type "related"
] ;
rico:isSubjectOf [ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Publikation (IT)"@it ;
rico:title "Publikation (FR)"@fr ;
rico:type "publication"
] ;
rico:isSubjectOf [ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Publikation (FR)"@fr ;
rico:title "Publikation (IT)"@it ;
rico:type "publication"
] ;
rico:isSubjectOf [ a rico:Record ;
......@@ -141,7 +141,7 @@ mbrs:testComplete a rico:RecordSet ;
rico:title "Publikation (DE)"@de ;
rico:type "publication"
] ;
rico:modificationDate "2021-03-04T11:14:19.847"^^xsd:dateTime ;
rico:modificationDate "2021-04-15T12:00:55.505"^^xsd:dateTime ;
rico:publicationDate "2020-09-04"^^xsd:date ;
rico:recordResourceExtent "<p>Umfang (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Umfang (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Umfang (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de ;
rico:recordResourceOrInstantiationIsTargetOfRecordResourceHoldingRelation
......@@ -150,7 +150,7 @@ mbrs:testComplete a rico:RecordSet ;
"https://memobase.ch/institution/completeInstitution" ;
rico:recordResourceHoldingRelationHasTarget
mbrs:testComplete ;
rico:type "original"
rico:type "access"
] ;
rico:recordResourceOrInstantiationIsTargetOfRecordResourceHoldingRelation
[ a rico:RecordResourceHoldingRelation ;
......@@ -158,7 +158,7 @@ mbrs:testComplete a rico:RecordSet ;
"https://memobase.ch/institution/completeInstitution" ;
rico:recordResourceHoldingRelationHasTarget
mbrs:testComplete ;
rico:type "master"
rico:type "original"
] ;
rico:recordResourceOrInstantiationIsTargetOfRecordResourceHoldingRelation
[ a rico:RecordResourceHoldingRelation ;
......@@ -166,7 +166,7 @@ mbrs:testComplete a rico:RecordSet ;
"https://memobase.ch/institution/completeInstitution" ;
rico:recordResourceHoldingRelationHasTarget
mbrs:testComplete ;
rico:type "access"
rico:type "master"
] ;
rico:scopeAndContent "<p>Inhalt (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Inhalt (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Inhalt (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de ;
rico:title "Complete Record Set (DE)"@de , "Complete Record Set (IT)"@it , "Complete Record Set (FR)"@fr .
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