Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
memoriav
Memobase 2020
services
ExternalAPIs
OAI
Commits
fb27d3f4
Commit
fb27d3f4
authored
Mar 22, 2021
by
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
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
build.sbt
View file @
fb27d3f4
...
...
@@ -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
(
...
...
project/Dependencies.scala
View file @
fb27d3f4
...
...
@@ -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",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment