Due to a scheduled upgrade to version 14.10, GitLab will be unavailabe on Monday 30.05., from 19:00 until 20:00.

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

update new dependencies for memobase utils

parent d380f957
Pipeline #24767 passed with stages
in 7 minutes and 54 seconds
...@@ -5,3 +5,4 @@ target/ ...@@ -5,3 +5,4 @@ target/
project/project project/project
project/target project/target
data data
local
...@@ -16,17 +16,28 @@ lazy val root = (project in file(".")) ...@@ -16,17 +16,28 @@ lazy val root = (project in file("."))
mainClass in assembly := Some("ch.memobase.rico2edm.Main"), mainClass in assembly := Some("ch.memobase.rico2edm.Main"),
test in assembly := {}, test in assembly := {},
assemblyExcludedJars in assembly := { assemblyExcludedJars in assembly := {
val cp = (fullClasspath in assembly).value val cp = (fullClasspath in assembly).value
cp filter { f => cp filter { f =>
//f.data.getName.contains("spark-core") || //f.data.getName.contains("spark-core") ||
f.data.getName == "jcl-over-slf4j-1.7.30.jar" f.data.getName == "jcl-over-slf4j-1.7.30.jar" ||
f.data.getName == "commons-codec-1.13.jar"
} }
}, },
assemblyMergeStrategy in assembly := { assemblyMergeStrategy in assembly := {
case "log4j.properties" => MergeStrategy.first case "log4j.properties" => MergeStrategy.first
case "module-info.class" => MergeStrategy.discard case "module-info.class" => MergeStrategy.discard
case "log4j2.xml" => MergeStrategy.first case "log4j2.xml" => MergeStrategy.first
//case "module-info.class" => MergeStrategy.first
case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.first
case PathList("org", "slf4j", "impl", "StaticLoggerBinder.class") => MergeStrategy.first
case PathList("org", "slf4j", "impl", "StaticMDCBinder.class") => MergeStrategy.first
case PathList("org", "slf4j", "impl", "StaticMarkerBinder.class") => MergeStrategy.first
/* /*
case PathList("org", "apache", "commons", "logging", "impl", "SimpleLog.class") => MergeStrategy.first case PathList("org", "apache", "commons", "logging", "impl", "SimpleLog.class") => MergeStrategy.first
...@@ -37,6 +48,7 @@ lazy val root = (project in file(".")) ...@@ -37,6 +48,7 @@ lazy val root = (project in file("."))
case PathList("org", "apache", "commons", "logging", "LogConfigurationException.class") => MergeStrategy.first case PathList("org", "apache", "commons", "logging", "LogConfigurationException.class") => MergeStrategy.first
case PathList("org", "apache", "commons", "logging", "Log.class") => MergeStrategy.first case PathList("org", "apache", "commons", "logging", "Log.class") => MergeStrategy.first
*/ */
case x => case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x) oldStrategy(x)
...@@ -47,7 +59,7 @@ lazy val root = (project in file(".")) ...@@ -47,7 +59,7 @@ lazy val root = (project in file("."))
// cp filter {_.data.getName == "httpclient-osgi-4.5.12.jar"} // cp filter {_.data.getName == "httpclient-osgi-4.5.12.jar"}
//}, //},
resolvers ++= Seq( resolvers ++= Seq(
"Memobase Utils" at "https://dl.bintray.com/memoriav/memobase" "Memobase Utils" at "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
), ),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
//iiifApis, //iiifApis,
......
...@@ -2,4 +2,6 @@ docker run -d --network host --rm --env-file ./env.txt rico2edm:latest ...@@ -2,4 +2,6 @@ docker run -d --network host --rm --env-file ./env.txt rico2edm:latest
cd /home/swissbib/environment/code/repositories/memoriav/gitlab/services/elastic-services/elastic-bulk-action-service/gh cd /home/swissbib/environment/code/repositories/memoriav/gitlab/services/elastic-services/elastic-bulk-action-service/gh
docker run -d --network host --rm --env-file ./env.txt elastic-bulk:latest docker run -d --network host --rm --env-file ./env.txt elastic-bulk:latest
\ No newline at end of file
docker run -d -v /home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs:/configs --network host --rm --env-file ./env.txt rico2edm:latest
\ No newline at end of file
...@@ -24,7 +24,7 @@ object Dependencies { ...@@ -24,7 +24,7 @@ object Dependencies {
lazy val log4jV = "2.12.0" lazy val log4jV = "2.12.0"
lazy val scalatestV = "3.1.2" lazy val scalatestV = "3.1.2"
lazy val jenaV = "3.17.0" lazy val jenaV = "3.17.0"
lazy val rdf4jV = "3.5.1" lazy val rdf4jV = "3.6.2"
val esVersion = "7.3.1" val esVersion = "7.3.1"
//lazy val iiifApis = "de.digitalcollections.iiif" % "iiif-apis" % "0.3.8" //lazy val iiifApis = "de.digitalcollections.iiif" % "iiif-apis" % "0.3.8"
...@@ -37,8 +37,9 @@ object Dependencies { ...@@ -37,8 +37,9 @@ object Dependencies {
lazy val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jV lazy val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jV
lazy val log4jScala = "org.apache.logging.log4j" %% "log4j-api-scala" % "12.0" lazy val log4jScala = "org.apache.logging.log4j" %% "log4j-api-scala" % "12.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" % "3.0.1"
"org.memobase" % "memobase-service-utilities" % "1.4.1" //lazy val memobaseServiceUtils = "org.memobase" % "memobase-service-utilities" % "1.4.1"
//"org.memobase" % "memobase-service-utilities" % "1.4.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"
......
...@@ -23,7 +23,7 @@ package ch.memobase.rico2edm ...@@ -23,7 +23,7 @@ package ch.memobase.rico2edm
import ch.memobase.rico2edm.utils.{ElasticSearchClientWrapper, Helper, Keys} import ch.memobase.rico2edm.utils.{ElasticSearchClientWrapper, Helper, Keys}
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 java.time.Duration import java.time.Duration
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
package ch.memobase.rico2edm.utils package ch.memobase.rico2edm.utils
import com.typesafe.scalalogging.Logger //import com.typesafe.scalalogging.Logger
import org.apache.http.{Header, HttpHost} import org.apache.http.{Header, HttpHost}
import org.apache.http.message.BasicHeader import org.apache.http.message.BasicHeader
import org.apache.logging.log4j.scala.Logging import org.apache.logging.log4j.scala.Logging
......
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