update kafka topic names & version

build.sbt

@@ -16,15 +16,15 @@ lazy val root = (project in file("."))
     test in assembly := {},
     mainClass in assembly := Some("ch.memobase.App"),
     assemblyMergeStrategy in assembly := {
-      case "log4j.properties" => MergeStrategy.first
-      case "module-info.class" => MergeStrategy.discard
-      case "log4j2.xml" => MergeStrategy.first
+      case "log4j.properties"                           => MergeStrategy.first
+      case other if other.contains("module-info.class") => MergeStrategy.discard
+      case "log4j2.xml"                                 => MergeStrategy.first
       case x =>
         val oldStrategy = (assemblyMergeStrategy in assembly).value
         oldStrategy(x)
     },
     resolvers ++= Seq(
-      "Memobase Utils" at "https://dl.bintray.com/memoriav/memobase"
+      "Memobase Libraries" at "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
     ),
     libraryDependencies ++= Seq(
       iiifApis,
@@ -34,7 +34,11 @@ lazy val root = (project in file("."))
       log4jCore,
       log4jScala,
       log4jSlf4j,
-      memobaseServiceUtils,
+      memobaseServiceUtils excludeAll (
+        ExclusionRule(organization = "org.slf4j", name = "slf4j-api"),
+        ExclusionRule(organization = "org.slf4j", name = "slf4j-log4j12"),
+        ExclusionRule(organization = "org.slf4j", name = "jcl-over-slf4j"),
+      ),
       upickle,
       kafkaStreamsTestUtils % Test,
       scalatic % Test,

helm-charts/values-prod.yaml

@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
 k8sLimitsMemory: "256Mi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
-# TODO: To be changed
-inputTopicName: fedora-output-json-records
-# TODO: To be changed
-outputTopicName: iiif-manifests-v2
-# TODO: To be changed
-reportingTopicName: import-process-reporting
+inputTopicName: mb-di-processed-records-prod
+outputTopicName: mb-di-iiif-manifests-v2-prod
+reportingTopicName: mb-di-reporting-prod
 applicationId: prod-iiif-manifest-creator
 groupId: prod-iiif-manifest-creator
\ No newline at end of file

helm-charts/values-stage.yaml

@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
 k8sLimitsMemory: "256Mi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
-# TODO: To be changed
-inputTopicName: fedora-output-json-records
-# TODO: To be changed
-outputTopicName: iiif-manifests-v2
-# TODO: To be changed
-reportingTopicName: import-process-reporting
+inputTopicName: mb-di-processed-records-stage
+outputTopicName: mb-di-iiif-manifests-v2-stage
+reportingTopicName: mb-di-reporting-stage
 applicationId: stage-iiif-manifest-creator
 groupId: stage-iiif-manifest-creator
\ No newline at end of file

helm-charts/values-test.yaml

@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
 k8sLimitsMemory: "256Mi"
 
 kafkaConfigs: test-kafka-bootstrap-servers
-# TODO: To be changed
-inputTopicName: fedora-output-json-records
-# TODO: To be changed
-outputTopicName: iiif-manifests-v2
-# TODO: To be changed
-reportingTopicName: import-process-reporting
+inputTopicName: mb-di-processed-records-prod
+outputTopicName: mb-di-iiif-manifests-v2-prod
+reportingTopicName: mb-di-reporting-prod
 applicationId: test-iiif-manifest-creator
 groupId: test-iiif-manifest-creator
\ No newline at end of file

project/Dependencies.scala

@@ -34,7 +34,7 @@ object Dependencies {
   lazy val log4jScala = "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0"
   lazy val log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4jV
   lazy val memobaseServiceUtils =
-    "org.memobase" % "memobase-service-utilities" % "1.4.1"
+    "org.memobase" % "memobase-service-utilities" % "3.0.1"
   lazy val scalatic = "org.scalactic" %% "scalactic" % scalatestV
   lazy val scalaTest = "org.scalatest" %% "scalatest" % scalatestV
   lazy val upickle = "com.lihaoyi" %% "upickle" % "0.9.5"

src/main/scala/ch/memobase/App.scala

@@ -22,7 +22,7 @@ import java.time.Duration
 
 import org.apache.kafka.streams.KafkaStreams
 import org.apache.logging.log4j.scala.Logging
-import org.memobase.settings.SettingsLoader
+import ch.memobase.settings.SettingsLoader
 
 import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}