From 32ef9205495fe5cb6cdea183145909dd59d240c2 Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Sun, 4 Nov 2018 10:44:21 +0100 Subject: [PATCH 1/3] Added sbt plugin in order to determine transitive dependencies - 'sbt dependencyTree' --- project/plugins.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index daba3aa84..565cd692a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,3 +7,4 @@ addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtCoursier addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") From e5c6b9f67ea757b8eddba0383eee2cd8b7246d94 Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Sun, 4 Nov 2018 10:45:17 +0100 Subject: [PATCH 2/3] Exclude HikariCP-java6 - fixes #2181 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ad28306bd..51447d351 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ libraryDependencies ++= Seq( "fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0", "com.github.bkromhout" % "java-diff-utils" % "2.1.1", "org.cache2k" % "cache2k-all" % "1.0.2.Final", - "com.enragedginger" %% "akka-quartz-scheduler" % "1.7.0-akka-2.5.x" exclude ("c3p0", "c3p0"), + "com.enragedginger" %% "akka-quartz-scheduler" % "1.7.0-akka-2.5.x" exclude ("c3p0", "c3p0") exclude ("com.zaxxer", "HikariCP-java6"), "net.coobird" % "thumbnailator" % "0.4.8", "com.github.zafarkhaja" % "java-semver" % "0.9.0", "com.nimbusds" % "oauth2-oidc-sdk" % "5.64.4", From 7fe3211485c734e90f7fd5bd0d732f4a23551f92 Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Mon, 5 Nov 2018 06:37:07 +0100 Subject: [PATCH 3/3] Fixed scalafmtSbtCheck --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 565cd692a..238030ac4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8") addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtCoursier -addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")