Skip to content

Commit

Permalink
Resolve sbt assembly problem with log4j-core, fix banner having extra…
Browse files Browse the repository at this point in the history
… 'v'
  • Loading branch information
pflooky committed Jun 14, 2024
1 parent d5da7a8 commit 61794b1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ lazy val commonSettings = Seq(
autoScalaLibrary := false,
crossPaths := false, // No scala cross building
assembly / assemblyMergeStrategy := {
case PathList("META-INF", xs @ _*) => MergeStrategy.discard
case PathList("META-INF", xs@_*) =>
(xs map {_.toLowerCase}) match {
case "services" :: xs =>
MergeStrategy.filterDistinctLines
case _ => MergeStrategy.discard
}
case x => MergeStrategy.first
},

Expand Down Expand Up @@ -113,6 +118,7 @@ lazy val server = (project in file("server"))
.settings (
name := s"$artifactNamePrefix-server",
assembly / assemblyJarName := s"$artifactNamePrefix-server-assembly.jar",
assembly / mainClass := Some(orgName + ".server.UnityCatalogServer"),
commonSettings,
javaCheckstyleSettings(file("dev") / "checkstyle-config.xml"),
libraryDependencies ++= Seq(
Expand All @@ -134,6 +140,7 @@ lazy val server = (project in file("server"))
"org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.23.1",

"jakarta.activation" % "jakarta.activation-api" % "2.1.3",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % Provided,
"net.bytebuddy" % "byte-buddy" % "1.14.15",
"org.projectlombok" % "lombok" % "1.18.32" % "provided",

Expand Down Expand Up @@ -201,6 +208,7 @@ lazy val cli = (project in file("examples") / "cli")
.settings(
name := s"$artifactNamePrefix-cli",
assembly / assemblyJarName := s"$artifactNamePrefix-cli-assembly.jar",
assembly / mainClass := Some(orgName + ".cli.UnityCatalogCli"),
mainClass := Some(orgName + ".cli.UnityCatalogCli"),
commonSettings,
javaCheckstyleSettings(file("dev") / "checkstyle-config.xml"),
Expand Down
Binary file modified etc/db/h2db.mv.db
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private void printArt() {
"# | |__| | | | | | |_| |_| | | |___| (_| | || (_| | | (_) | (_| | #\n" +
"# \\____/|_| |_|_|\\__|\\__, | \\_____\\__,_|\\__\\__,_|_|\\___/ \\__, | #\n" +
"# __/ | __/ | #\n" +
"# |___/ v" + String.format("%15s", ("v" + VersionUtils.VERSION)) + " |___/ #\n" +
"# |___/ v" + String.format("%15s", (VersionUtils.VERSION)) + " |___/ #\n" +
"###################################################################\n";
System.out.println(art);
}
Expand Down

0 comments on commit 61794b1

Please sign in to comment.