Move new Hadoop3 deps into the Provided scope

locationtech · Apr 12, 2021 · 8f95f6b · 8f95f6b
1 parent f8e6111
commit 8f95f6b
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/project/Settings.scala b/project/Settings.scala
@@ -57,7 +57,6 @@ object Settings {
     "-language:existentials",
     "-language:experimental.macros",
     "-feature",
-    // "-Ypartial-unification", // required by Cats
     // "-Yrangepos",            // required by SemanticDB compiler plugin
     // "-Ywarn-unused-import",  // required by `RemoveUnused` rule
     "-target:jvm-1.8")
@@ -151,8 +150,7 @@ object Settings {
     libraryDependencies ++= Seq(
       accumuloCore
         exclude("org.jboss.netty", "netty")
-        exclude("org.apache.hadoop", "hadoop-client"),
-      hadoopClient % Provided
+        exclude("org.apache.hadoop", "hadoop-client")
     ),
     console / initialCommands :=
       """
@@ -382,10 +380,7 @@ object Settings {
       hbaseHadoop2Compact,
       hbaseMetrics,
       hbaseMetricsApi,
-      hbaseZooKeeper,
-      woodstoxCore,
-      stax2Api,
-      commonsConfiguration2
+      hbaseZooKeeper
     ).map(_ exclude("javax.servlet", "servlet-api") exclude("org.mortbay.jetty", "servlet-api-2.5")),
     libraryDependencies += jacksonCoreAsl,
     console / initialCommands :=
@@ -403,6 +398,9 @@ object Settings {
     name := "geotrellis-hbase-spark",
     libraryDependencies ++= Seq(
       hadoopClient % Provided,
+      woodstoxCore % Provided,
+      stax2Api % Provided,
+      commonsConfiguration2 % Provided,
       apacheSpark("core").value % Provided,
       apacheSpark("sql").value % Test,
       scalatest % Test
@@ -556,10 +554,10 @@ object Settings {
   lazy val spark = Seq(
     name := "geotrellis-spark",
     libraryDependencies ++= Seq(
-      woodstoxCore,
-      stax2Api,
-      commonsConfiguration2,
-      re2j,
+      woodstoxCore % Provided,
+      stax2Api % Provided,
+      commonsConfiguration2 % Provided,
+      re2j % Provided,
       apacheSpark("core").value % Provided,
       hadoopClient % Provided,
       apacheSpark("sql").value % Test,