[GitHub] stevedlawrence closed pull request #21: Clean up SBT warnings

[GitBox <gi...@apache.org>]

stevedlawrence closed pull request #21: Clean up SBT warnings
URL: https://github.com/apache/incubator-daffodil/pull/21
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build.sbt b/build.sbt
index 7f8f5f2a8..b34aee14b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -130,8 +130,8 @@ lazy val debugTestSettings = inConfig(TestDebug)(Defaults.testSettings ++ Seq(
 lazy val nopublish = Seq(
   publish := {},
   publishLocal := {},
-  packagedArtifacts := Map.empty,
-  publishArtifact := false,
+  publishM2 := {},
+  skip in publish := true
 )
 
 lazy val usesMacros = Seq(
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c84fcf395..99222d86c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,15 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2")
 
+// Both sbt and the sbt-native-pacakger plugin have transitive dependencies to
+// different versions of plexus-utils and guava, but with different major
+// version numbers. SBT interprets this major version number difference as
+// having dependencies that are potentially not binary compatible, resulting in
+// a warning message when starting SBT. It appears the binary incompatibilities
+// (if they exist) do not affect building Daffodil, so this overrides the
+// dependencies to the latest versions and removes the warning.
+dependencyOverrides ++= Seq(
+  "org.codehaus.plexus" % "plexus-utils" % "3.0.17",
+  "com.google.guava" % "guava" % "18.0"
+)
+
 addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services