stevedlawrence closed pull request #95: Update sbt and sbt-native-packager
plugin to make jar hashes consistent
URL: https://github.com/apache/incubator-daffodil/pull/95
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/project/build.properties b/project/build.properties
index 4996afe9b..ffc1c94a1 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -15,4 +15,4 @@
* limitations under the License.
*/
-sbt.version=1.0.4
+sbt.version=1.2.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e13bab840..fe864da4f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
addSbtPlugin("org.musigma" % "sbt-rat" % "0.6.0")
@@ -28,5 +28,5 @@ addSbtPlugin("org.musigma" % "sbt-rat" % "0.6.0")
// 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"
+ "com.google.guava" % "guava" % "20.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:
us...@infra.apache.org
With regards,
Apache Git Services
