Unverified Commit 6f9530bf authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

update kafka topic names & version

parent 4de1a67c
Pipeline #24758 passed with stages
in 6 minutes and 53 seconds
...@@ -16,15 +16,15 @@ lazy val root = (project in file(".")) ...@@ -16,15 +16,15 @@ lazy val root = (project in file("."))
test in assembly := {}, test in assembly := {},
mainClass in assembly := Some("ch.memobase.App"), mainClass in assembly := Some("ch.memobase.App"),
assemblyMergeStrategy in assembly := { assemblyMergeStrategy in assembly := {
case "log4j.properties" => MergeStrategy.first case "log4j.properties" => MergeStrategy.first
case "module-info.class" => MergeStrategy.discard case other if other.contains("module-info.class") => MergeStrategy.discard
case "log4j2.xml" => MergeStrategy.first case "log4j2.xml" => MergeStrategy.first
case x => case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x) oldStrategy(x)
}, },
resolvers ++= Seq( 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( libraryDependencies ++= Seq(
iiifApis, iiifApis,
...@@ -34,7 +34,11 @@ lazy val root = (project in file(".")) ...@@ -34,7 +34,11 @@ lazy val root = (project in file("."))
log4jCore, log4jCore,
log4jScala, log4jScala,
log4jSlf4j, 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, upickle,
kafkaStreamsTestUtils % Test, kafkaStreamsTestUtils % Test,
scalatic % Test, scalatic % Test,
......
...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4" ...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
k8sLimitsMemory: "256Mi" k8sLimitsMemory: "256Mi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
# TODO: To be changed inputTopicName: mb-di-processed-records-prod
inputTopicName: fedora-output-json-records outputTopicName: mb-di-iiif-manifests-v2-prod
# TODO: To be changed reportingTopicName: mb-di-reporting-prod
outputTopicName: iiif-manifests-v2
# TODO: To be changed
reportingTopicName: import-process-reporting
applicationId: prod-iiif-manifest-creator applicationId: prod-iiif-manifest-creator
groupId: prod-iiif-manifest-creator groupId: prod-iiif-manifest-creator
\ No newline at end of file
...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4" ...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
k8sLimitsMemory: "256Mi" k8sLimitsMemory: "256Mi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
# TODO: To be changed inputTopicName: mb-di-processed-records-stage
inputTopicName: fedora-output-json-records outputTopicName: mb-di-iiif-manifests-v2-stage
# TODO: To be changed reportingTopicName: mb-di-reporting-stage
outputTopicName: iiif-manifests-v2
# TODO: To be changed
reportingTopicName: import-process-reporting
applicationId: stage-iiif-manifest-creator applicationId: stage-iiif-manifest-creator
groupId: stage-iiif-manifest-creator groupId: stage-iiif-manifest-creator
\ No newline at end of file
...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4" ...@@ -14,11 +14,8 @@ k8sLimitsCpu: "0.4"
k8sLimitsMemory: "256Mi" k8sLimitsMemory: "256Mi"
kafkaConfigs: test-kafka-bootstrap-servers kafkaConfigs: test-kafka-bootstrap-servers
# TODO: To be changed inputTopicName: mb-di-processed-records-prod
inputTopicName: fedora-output-json-records outputTopicName: mb-di-iiif-manifests-v2-prod
# TODO: To be changed reportingTopicName: mb-di-reporting-prod
outputTopicName: iiif-manifests-v2
# TODO: To be changed
reportingTopicName: import-process-reporting
applicationId: test-iiif-manifest-creator applicationId: test-iiif-manifest-creator
groupId: test-iiif-manifest-creator groupId: test-iiif-manifest-creator
\ No newline at end of file
...@@ -34,7 +34,7 @@ object Dependencies { ...@@ -34,7 +34,7 @@ object Dependencies {
lazy val log4jScala = "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0" 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 log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4jV
lazy val memobaseServiceUtils = 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 scalatic = "org.scalactic" %% "scalactic" % scalatestV
lazy val scalaTest = "org.scalatest" %% "scalatest" % scalatestV lazy val scalaTest = "org.scalatest" %% "scalatest" % scalatestV
lazy val upickle = "com.lihaoyi" %% "upickle" % "0.9.5" lazy val upickle = "com.lihaoyi" %% "upickle" % "0.9.5"
......
...@@ -22,7 +22,7 @@ import java.time.Duration ...@@ -22,7 +22,7 @@ import java.time.Duration
import org.apache.kafka.streams.KafkaStreams import org.apache.kafka.streams.KafkaStreams
import org.apache.logging.log4j.scala.Logging import org.apache.logging.log4j.scala.Logging
import org.memobase.settings.SettingsLoader import ch.memobase.settings.SettingsLoader
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}
......
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