From 5e6d23417247f596ae60725d954a4c9ead96b9cb Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 8 Dec 2020 18:18:20 -0500 Subject: [PATCH 1/2] Rm unused scaffeine --- project/Settings.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index a09e2a627d..53d60ee080 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -433,8 +433,7 @@ object Settings { openCSV, parserCombinators, scalatest % Test, - scalacheck % Test, - scaffeine + scalacheck % Test ), // https://github.com/sbt/sbt/issues/4609 Test / fork := true From e61c1027210d33e89e8c0c922466342b2eac0cae Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 8 Dec 2020 21:37:10 -0500 Subject: [PATCH 2/2] Rm scaffeine from all projects where it is unused --- CHANGELOG.md | 3 +++ build.sbt | 2 +- project/Settings.scala | 6 +----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a8a917f3..b226595b2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Remove explicit unused Scaffeine dependency from projects [#3314](https://github.com/locationtech/geotrellis/pull/3314) + ## [3.5.1] - 2020-11-23 ### Changed diff --git a/build.sbt b/build.sbt index 882429c308..620db72b1b 100644 --- a/build.sbt +++ b/build.sbt @@ -127,7 +127,7 @@ lazy val `cassandra-spark` = project lazy val hbase = project .dependsOn(store) .settings(Settings.hbase) - .settings(projectDependencies := { Seq((layer / projectID).value.exclude("com.google.protobuf", "protobuf-java")) }) + .settings(projectDependencies := { Seq((store / projectID).value.exclude("com.google.protobuf", "protobuf-java")) }) lazy val `hbase-spark` = project .dependsOn( diff --git a/project/Settings.scala b/project/Settings.scala index 53d60ee080..3531869ad4 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -484,7 +484,6 @@ object Settings { libraryDependencies ++= Seq( awsSdkS3 excludeAll ExclusionRule("com.fasterxml.jackson.core"), spire, - scaffeine, scalatest % Test ), /** https://github.com/lucidworks/spark-solr/issues/179 */ @@ -518,7 +517,6 @@ object Settings { libraryDependencies ++= Seq( sparkCore % Provided, spire, - scaffeine, sparkSql % Test, scalatest % Test ), @@ -559,8 +557,7 @@ object Settings { chronoscala, sparkSql % Test, scalatest % Test, - logging, - scaffeine + logging ), mimaPreviousArtifacts := Set( "org.locationtech.geotrellis" %% "geotrellis-spark" % Version.previousVersion @@ -671,7 +668,6 @@ object Settings { spire, chronoscala, logging, - scaffeine, uzaygezenCore, pureconfig, scalactic,