Commit fb27d3f4 authored by Günter Hipler's avatar Günter Hipler
Browse files

adaptations because of assembly problems - after Sebastian changed

.gitla-ci.yml ...
parent 1f0b63c2
Pipeline #23547 passed with stage
in 4 minutes and 52 seconds
......@@ -17,6 +17,28 @@ lazy val root = (project in file("."))
.settings(
name := "oaiServiceMemobase",
assemblyJarName in assembly := "app.jar",
//mainClass in assembly := Some("ch.memobase.rico2edm.Main"),
test in assembly := {},
assemblyMergeStrategy in assembly := {
case "log4j.properties" => MergeStrategy.first
case "module-info.class" => MergeStrategy.discard
case "log4j2.xml" => MergeStrategy.first
case PathList("play","reference-overrides.conf") => MergeStrategy.discard
case PathList("org", "apache", "commons", "logging", "impl", "SimpleLog.class") => MergeStrategy.last
case PathList("org", "apache", "commons", "logging", "impl", "SimpleLog$1.class") => MergeStrategy.last
case PathList("org", "apache", "commons", "logging", "impl", "NoOpLog.class") => MergeStrategy.last
case PathList("apache", "commons", "logging", "LogFactory.class") => MergeStrategy.last
case PathList("org", "apache", "commons", "logging", "LogFactory.class") => MergeStrategy.last
case PathList("org", "apache", "commons", "logging", "LogConfigurationException.class") => MergeStrategy.last
case PathList("org", "apache", "commons", "logging", "Log.class") => MergeStrategy.last
case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x)
},
//assemblyJarName in assembly := "app.jar",
//test in assembly := {},
//mainClass in assembly := Some("Main"),
resolvers ++= Seq(
......
......@@ -23,7 +23,7 @@ object Dependencies {
lazy val joda = "org.joda" % "joda-convert" % "2.2.1"
lazy val logging = "net.logstash.logback" % "logstash-logback-encoder" % "6.2"
lazy val logging = "net.logstash.logback" % "logstash-logback-encoder" % "6.6"
lazy val lemonlabs = "io.lemonlabs" %% "scala-uri" % "1.5.1"
lazy val codingwell = "net.codingwell" %% "scala-guice" % "4.2.6"
//"org.apache.solr" % "solr-solrj" % "7.3.1",
......
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