Update service depenency to 2.0.0

build.gradle

@@ -35,7 +35,7 @@ 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'
 
-    implementation 'org.memobase:memobase-service-utilities:1.12.3'
+    implementation 'org.memobase:memobase-service-utilities:2.0.0'
 
     // Logging Framework
     implementation "org.apache.logging.log4j:log4j-api:${log4jV}"

src/main/kotlin/KafkaTopology.kt

@@ -18,6 +18,7 @@
 
 package org.memobase
 
+import ch.memobase.settings.SettingsLoader
 import org.apache.jena.rdf.model.Model
 import org.apache.kafka.streams.StreamsBuilder
 import org.apache.kafka.streams.Topology
@@ -25,7 +26,6 @@ import org.apache.logging.log4j.LogManager
 import org.memobase.model.Input
 import org.memobase.model.Institution
 import org.memobase.model.RecordSet
-import org.memobase.settings.SettingsLoader
 
 class KafkaTopology(private val settings: SettingsLoader) {
     private val log = LogManager.getLogger("DrupalSyncProcessor")

src/main/kotlin/RdfTransformer.kt

@@ -18,6 +18,13 @@
 
 package org.memobase
 
+import ch.memobase.rdf.MB
+import ch.memobase.rdf.NS
+import ch.memobase.rdf.RDA
+import ch.memobase.rdf.RDF
+import ch.memobase.rdf.RICO
+import ch.memobase.rdf.SCHEMA
+import ch.memobase.rdf.WD
 import java.util.Properties
 import org.apache.jena.rdf.model.Literal
 import org.apache.jena.rdf.model.Model
@@ -28,13 +35,6 @@ import org.apache.logging.log4j.LogManager
 import org.memobase.model.Address
 import org.memobase.model.Institution
 import org.memobase.model.RecordSet
-import org.memobase.rdf.NS
-import org.memobase.rdf.RDA
-import org.memobase.rdf.RDF
-import org.memobase.rdf.RICO
-import org.memobase.rdf.SCHEMA
-import org.memobase.rdf.WD
-import rdf.MB
 
 class RdfTransformer(properties: Properties) {
     private val log = LogManager.getLogger("RdfTransformer")

src/main/kotlin/Service.kt

@@ -18,9 +18,9 @@
 
 package org.memobase
 
+import ch.memobase.settings.SettingsLoader
 import org.apache.kafka.streams.KafkaStreams
 import org.apache.logging.log4j.LogManager
-import org.memobase.settings.SettingsLoader
 
 class Service(file: String = "app.yml") {
     private val log = LogManager.getLogger("DrupalSyncService")

src/main/kotlin/Util.kt

@@ -17,6 +17,7 @@
  */
 package org.memobase
 
+import ch.memobase.rdf.NS
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
@@ -28,7 +29,6 @@ import org.apache.jena.riot.RDFFormat
 import org.apache.kafka.streams.KeyValue
 import org.apache.logging.log4j.LogManager
 import org.memobase.model.IdLabels
-import org.memobase.rdf.NS
 
 object Util {
     const val languageSourceFilePathPropertyName = "path.languages"