diff --git a/shotgun/build.sbt b/shotgun/build.sbt index 578f94a..57a3edf 100644 --- a/shotgun/build.sbt +++ b/shotgun/build.sbt @@ -16,8 +16,6 @@ val PekkoHttpVersion = "1.0.1" libraryDependencies ++= Seq( "ch.qos.logback" % "logback-classic" % "1.5.6", "org.slf4j" % "slf4j-api" % "2.0.12", - "com.auth0" % "jwks-rsa" % "0.22.1", - "com.github.jwt-scala" % "jwt-json-common_native0.4_2.12" % "10.0.1", "org.apache.pekko" %% "pekko-actor-typed" % PekkoVersion, "org.apache.pekko" %% "pekko-stream" % PekkoVersion, "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, @@ -25,3 +23,10 @@ libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-http-cors" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion, ) + +assembly / assemblyMergeStrategy := { + case PathList("module-info.class") => MergeStrategy.first + case x => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(x) +} diff --git a/webapp/src/components/DFMapPopup.vue b/webapp/src/components/DFMapPopup.vue index 0718f98..8fa93be 100644 --- a/webapp/src/components/DFMapPopup.vue +++ b/webapp/src/components/DFMapPopup.vue @@ -22,7 +22,7 @@ {{ alpr.tags.brand }} - Unknown Brand + Unknown Manufacturer