Unverified Commit 4ecb2b06 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

update kafka topic names

parent 872e547a
{"name":"sbt","version":"1.5.0","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/usr/lib/jvm/java-8-openjdk/jre/bin/java","-Xms100m","-Xmx100m","-classpath","/usr/share/sbt/bin/sbt-launch.jar","xsbt.boot.Boot","-bsp","--sbt-launch-jar=/usr/share/sbt/bin/sbt-launch.jar"]}
\ No newline at end of file
......@@ -13,28 +13,32 @@ lazy val root = (project in file("."))
.enablePlugins(GitVersioning)
.settings(
name := "Media Converter",
assemblyJarName in assembly := "app.jar",
test in assembly := {},
assemblyMergeStrategy in assembly := {
assembly / assemblyJarName := "app.jar",
assembly / test := {},
assembly / assemblyMergeStrategy := {
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 x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
},
mainClass in assembly := Some("ch.memobase.App"),
assembly / mainClass := Some("ch.memobase.App"),
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(
fedoraClient exclude("org.slf4j", "slf4j-simple"),
//fedoraClient exclude("org.slf4j", "slf4j-simple"),
kafkaClients,
log4jApi,
log4jCore,
log4jSlf4j,
log4jScala,
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"),
),
scalatic,
uPickle,
scalaMock % Test,
......
......@@ -14,10 +14,8 @@ k8sLimitsCpu: "1"
k8sLimitsMemory: "11Gi"
kafkaConfigs: prod-kafka-bootstrap-servers
# TODO: To be changed
inputTopicName: fedora-output-json-records
# TODO: To be changed
reportingTopicName: import-process-reporting
inputTopicName: mb-di-processed-records-prod
reportingTopicName: mb-di-reporting-prod
applicationId: prod-iiif-manifest-creator
groupId: prod-media-converter
clientId: prod-media-converter-client
......
......@@ -14,10 +14,8 @@ k8sLimitsCpu: "1"
k8sLimitsMemory: "11Gi"
kafkaConfigs: prod-kafka-bootstrap-servers
# TODO: To be changed
inputTopicName: fedora-output-json-records
# TODO: To be changed
reportingTopicName: import-process-reporting
inputTopicName: mb-di-processed-records-stage
reportingTopicName: mb-di-reporting-stage
applicationId: stage-iiif-manifest-creator
groupId: stage-media-converter
clientId: stage-media-converter-client
......
......@@ -14,10 +14,8 @@ k8sLimitsCpu: "1"
k8sLimitsMemory: "2Gi"
kafkaConfigs: test-kafka-bootstrap-servers
# TODO: To be changed
inputTopicName: fedora-output-json-records
# TODO: To be changed
reportingTopicName: import-process-reporting
inputTopicName: mb-di-processed-records-prod
reportingTopicName: mb-di-reporting-prod
applicationId: test-iiif-manifest-creator
groupId: test-media-converter
clientId: test-media-converter-client
......
......@@ -20,17 +20,17 @@
import sbt._
object Dependencies {
lazy val kafkaV = "2.3.1"
lazy val kafkaV = "2.7.0"
lazy val log4jV = "2.11.2"
lazy val scalatestV = "3.1.2"
lazy val fedoraClient = "org.memobase" % "fedora-client" % "0.6.1"
//lazy val fedoraClient = "org.memobase" % "fedora-client" % "0.6.1"
lazy val kafkaClients = "org.apache.kafka" % "kafka-clients" % kafkaV
lazy val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jV
lazy val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jV
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"
lazy val memobaseServiceUtils = "org.memobase" % "memobase-service-utilities" % "3.0.1"
lazy val scalaMock = "org.scalamock" %% "scalamock" % "5.0.0"
lazy val scalatic = "org.scalactic" %% "scalactic" % scalatestV
lazy val scalaTest = "org.scalatest" %% "scalatest" % scalatestV
......
......@@ -16,4 +16,4 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
sbt.version=1.3.10
sbt.version=1.5.0
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
\ No newline at end of file
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addDependencyTreePlugin
\ No newline at end of file
......@@ -22,7 +22,7 @@ package ch.memobase
import ch.memobase.models._
import org.apache.kafka.clients.consumer.KafkaConsumer
import org.apache.logging.log4j.scala.Logging
import org.memobase.settings.SettingsLoader
import ch.memobase.settings.SettingsLoader
import java.time.Duration
import scala.collection.JavaConverters._
......
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