Skip to content

Commit ded1923

Browse files
[!457] - Resolve "Remove plugin-kafka-spark-old plugin"
# New features and improvements Removed empty module `plugin-kafka-spark-old` # Breaking changes None. # Migration None. # Bug fixes None. # How this feature was tested No tests needed. # Related issue Closes #572
1 parent 269945c commit ded1923

File tree

7 files changed

+0
-52
lines changed

7 files changed

+0
-52
lines changed

build.sbt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,6 @@ lazy val plugin_kafka_spark = Project("wasp-plugin-kafka-spark", file("plugin-ka
135135
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
136136
.settings(libraryDependencies ++= dependencies.pluginKafkaSparkDependencies)
137137

138-
lazy val plugin_kafka_spark_old = Project("wasp-plugin-kafka-spark-old", file("plugin-kafka-spark-old"))
139-
.settings(settings.commonSettings: _*)
140-
.settings(
141-
Compile / scalaSource := baseDirectory.value / ".." / "plugin-kafka-spark" / "src" / "main" / "scala",
142-
Test / scalaSource := baseDirectory.value / ".." / "plugin-kafka-spark" / "src" / "test" / "scala",
143-
Test / unmanagedSourceDirectories += baseDirectory.value / ".." / "plugin-kafka-spark" / "src" / "test"
144-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
145-
)
146-
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
147-
.settings(libraryDependencies ++= dependencies.pluginKafkaSparkOldDependencies)
148-
149138
lazy val plugin_raw_spark = Project("wasp-plugin-raw-spark", file("plugin-raw-spark"))
150139
.settings(settings.commonSettings: _*)
151140
.settings(libraryDependencies ++= dependencies.sparkPluginBasicDependencies)
@@ -286,7 +275,6 @@ lazy val plugin =
286275
plugin_jdbc_spark,
287276
plugin_postgresql_spark,
288277
plugin_kafka_spark,
289-
plugin_kafka_spark_old,
290278
plugin_raw_spark,
291279
plugin_solr_spark,
292280
plugin_cdc_spark,

plugin-kafka-spark-old/src/test/resources/log4j.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

plugin-kafka-spark-old/src/test/resources/log4j2.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

project/CDP719Dependencies.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import sbt.Keys.{libraryDependencies, transitiveClassifiers}
55
class CDP719Dependencies(versions: CDP719Versions) extends Dependencies {
66

77
lazy val spark_sql_kafka = "it.agilelab" %% "wasp-spark-sql-kafka" % "0.2.0-2.4.1-2.4.8-7.1.9.0-387-SNAPSHOT"
8-
lazy val spark_sql_kafka_old = "it.agilelab" %% "wasp-spark-sql-kafka-old" % "0.2.0-2.4.1-2.4.8-7.1.9.0-387-SNAPSHOT"
98
lazy val delta = "it.agilelab" %% "wasp-delta-lake" % "0.6.1-2.4.8.7.1.9.0-387"
109
lazy val solrj = "org.apache.solr" % "solr-solrj" % versions.solr
1110
lazy val sparkSolr = versions.scala.take(4) match {
@@ -629,7 +628,6 @@ class CDP719Dependencies(versions: CDP719Versions) extends Dependencies {
629628
scalaTest
630629
)
631630
override lazy val pluginKafkaSparkDependencies: Seq[sbt.ModuleID] = Seq(spark_sql_kafka) ++ testDependencies
632-
override lazy val pluginKafkaSparkOldDependencies: Seq[sbt.ModuleID] = Seq(spark_sql_kafka_old) ++ testDependencies
633631
override lazy val pluginSolrSparkDependencies: Seq[sbt.ModuleID] = Seq(sparkSolr, solrj) ++ testDependencies
634632
override lazy val pluginMongoSparkDependencies: Seq[sbt.ModuleID] = Seq(
635633
("org.mongodb.spark" %% "mongo-spark-connector" % "2.4.3").exclude("org.mongodb", "mongo-java-driver"),

project/Dependencies.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ trait Dependencies {
2323
val pluginPlainHbaseWriterSparkDependencies: Seq[ModuleID]
2424
val pluginPostgreSQLSparkDependencies: Seq[ModuleID]
2525
val pluginKafkaSparkDependencies: Seq[ModuleID]
26-
val pluginKafkaSparkOldDependencies: Seq[ModuleID]
2726
val pluginSolrSparkDependencies: Seq[ModuleID]
2827
val pluginMongoSparkDependencies: Seq[ModuleID]
2928
val pluginMailerSparkDependencies: Seq[ModuleID]

project/EMR613Dependencies.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ class EMR613Dependencies(val versions: EMR613Versions)
198198
(Seq(sparkSqlKafka) ++ _pluginKafkaSparkDependencies)
199199
.map(_.exclude(exclusions.log4jExclude ++ exclusions.nettyExclude)) ++ logging ++ Seq(nettyAll)
200200

201-
override val pluginKafkaSparkOldDependencies: Seq[ModuleID] =
202-
(_pluginKafkaSparkDependencies)
203-
.map(_.exclude(exclusions.log4jExclude ++ exclusions.nettyExclude)) ++ logging ++ Seq(nettyAll)
204-
205201
override val pluginSolrSparkDependencies: Seq[ModuleID] = spark ++ Seq(
206202
httpClient,
207203
httpCore,

project/Vanilla2Dependencies.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,6 @@ class Vanilla2Dependencies(val versions: Vanilla2Versions)
176176
(Seq(sparkSqlKafka) ++ _pluginKafkaSparkDependencies)
177177
.map(_.exclude(exclusions.log4jExclude ++ exclusions.nettyExclude)) ++ logging ++ Seq(nettyAll)
178178

179-
override val pluginKafkaSparkOldDependencies: Seq[ModuleID] =
180-
(Seq(sparkSqlKafkaOld) ++ _pluginKafkaSparkDependencies)
181-
.map(_.exclude(exclusions.log4jExclude ++ exclusions.nettyExclude)) ++ logging ++ Seq(nettyAll)
182-
183179
override val pluginSolrSparkDependencies: Seq[ModuleID] = spark ++ Seq(
184180
httpClient,
185181
httpCore,
@@ -389,7 +385,6 @@ trait Vanilla2KafkaDependencies {
389385
lazy val kafkaStreaming = "org.apache.spark" %% "spark-streaming-kafka-0-8" % versions.spark exclude (exclusions.sparkExclusions ++ exclusions.kafka08Exclude) // TODO remove jersey?
390386
lazy val kafkaTests = kafka % Test exclude (exclusions.jacksonExclude)
391387
lazy val sparkSqlKafka = "it.agilelab" %% "wasp-spark-sql-kafka" % versions.sparkSqlKafka
392-
lazy val sparkSqlKafkaOld = "it.agilelab" %% "wasp-spark-sql-kafka-old" % versions.sparkSqlKafka
393388
}
394389

395390
trait Vanilla2MongoDependencies {

0 commit comments

Comments
 (0)