Merge branch 'develop' into spark-3.2

echeipesh · web-flow · commit b937a70aa308 · 2022-12-14T13:13:46.000-05:00
diff --git a/project/RFDependenciesPlugin.scala b/project/RFDependenciesPlugin.scala
@@ -58,6 +58,7 @@ object RFDependenciesPlugin extends AutoPlugin {
     val framelessRefined = "org.typelevel" %% "frameless-refined" % "0.12.0"
     val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
     val sparktestingbase = "com.holdenkarau" %% "spark-testing-base" % "3.2.1_1.3.0" % Test
+
   }
   import autoImport._
 
@@ -74,6 +75,6 @@ object RFDependenciesPlugin extends AutoPlugin {
     rfSparkVersion := "3.2.1",
     rfGeoTrellisVersion := "3.6.3",
     rfGeoMesaVersion := "3.4.1"
-    //excludeDependencies += "log4j" % "log4j"
+    excludeDependencies += "log4j" % "log4j"
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ object RFDependenciesPlugin extends AutoPlugin {`
`58`	`58`	`val framelessRefined = "org.typelevel" %% "frameless-refined" % "0.12.0"`
`59`	`59`	val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
`60`	`60`	`val sparktestingbase = "com.holdenkarau" %% "spark-testing-base" % "3.2.1_1.3.0" % Test`
	`61`	`+`
`61`	`62`	`}`
`62`	`63`	`import autoImport._`
`63`	`64`
`@@ -74,6 +75,6 @@ object RFDependenciesPlugin extends AutoPlugin {`
`74`	`75`	`rfSparkVersion := "3.2.1",`
`75`	`76`	`rfGeoTrellisVersion := "3.6.3",`
`76`	`77`	`rfGeoMesaVersion := "3.4.1"`
`77`		`- //excludeDependencies += "log4j" % "log4j"`
	`78`	`+ excludeDependencies += "log4j" % "log4j"`
`78`	`79`	`)`
`79`	`80`	`}`