Skip to content

Commit 2abcd60

Browse files
Matteo Seclìagilelab-tmnd1991
authored andcommitted
[!462] - Upgrade Spark version to 3.4.1
# New features and improvements - Upgrade Spark version to 3.4.1 - Upgrade Hadoop to 3.3.4, sl4j to 2.0.6, delta to 2.4.0, log4j to 2.19.0 - Remove netty and log4j1 - metrics use codahale instead of yammer - Remove netty exclusion - Since support to spark 2 and scala 2.11 has been removed and versions are now similar to EMR613 Flavor, all files under *-legacy and *-emr613 have been removed, keeping only "scala" and "java". # Breaking changes Spark 2 is no longer supported. As a result, projects using WASP will need to move to Spark 3 # Migration To use this WASP version, projects using WASP should migrate to Spark 3 # Bug fixes none # How this feature was tested Unit Test - Pipeline # Related issue Closes #578
1 parent 9b4f2c6 commit 2abcd60

File tree

58 files changed

+189
-929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+189
-929
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ test-plugin:
6161
script:
6262
- ./run-sbt-unprivileged.sh "clean coverage wasp-plugin/test wasp-plugin/coverageAggregate"
6363
after_script:
64-
- ls -R ${CI_PROJECT_DIR}/sbt-cache/ivy/jars/
6564
- mkdir test-output
6665
- find . -path '*/test-reports/*.xml' -exec cp '{}' ./test-output/ \;
6766
coverage: '/Aggregation complete. Coverage was \[(\d+.\d+)\]/'

build.sbt

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ lazy val model = Project("wasp-model", file("model"))
3636
.settings(libraryDependencies ++= dependencies.modelDependencies)
3737

3838
lazy val core = Project("wasp-core", file("core"))
39-
.settings(
40-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
41-
/ s"java${if (flavor == EMR613) "-emr613" else "-legacy"}",
42-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
43-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
44-
)
4539
.settings(settings.commonSettings: _*)
4640
.dependsOn(scala_compiler)
4741
.dependsOn(model)
@@ -84,10 +78,6 @@ lazy val producers = Project("wasp-producers", file("producers"))
8478
.settings(libraryDependencies ++= dependencies.producersDependencies)
8579

8680
lazy val consumers_spark = Project("wasp-consumers-spark", file("consumers-spark"))
87-
.settings(
88-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
89-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
90-
)
9181
.settings(settings.commonSettings: _*)
9282
.dependsOn(core)
9383
.settings(libraryDependencies ++= dependencies.consumersSparkDependencies)
@@ -107,7 +97,7 @@ lazy val plugin_elastic_spark = Project("wasp-plugin-elastic-spark", file("plugi
10797

10898
lazy val plugin_hbase_spark = Project("wasp-plugin-hbase-spark", file("plugin-hbase-spark"))
10999
.settings(settings.commonSettings: _*)
110-
.dependsOn(consumers_spark)
100+
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
111101
.settings(libraryDependencies ++= dependencies.pluginHbaseSparkDependencies)
112102

113103
lazy val plugin_plain_hbase_writer_spark =
@@ -128,10 +118,6 @@ lazy val plugin_postgresql_spark = Project("wasp-plugin-postgresql-spark", file(
128118

129119
lazy val plugin_kafka_spark = Project("wasp-plugin-kafka-spark", file("plugin-kafka-spark"))
130120
.settings(settings.commonSettings: _*)
131-
.settings(
132-
Test / unmanagedSourceDirectories += sourceDirectory.value / "test"
133-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
134-
)
135121
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
136122
.settings(libraryDependencies ++= dependencies.pluginKafkaSparkDependencies)
137123

@@ -156,10 +142,6 @@ lazy val plugin_mailer_spark = Project("wasp-plugin-mailer-spark", file("plugin-
156142
.settings(libraryDependencies ++= dependencies.pluginMailerSparkDependencies)
157143

158144
lazy val plugin_http_spark = Project("wasp-plugin-http-spark", file("plugin-http-spark"))
159-
.settings(
160-
Test / unmanagedSourceDirectories += sourceDirectory.value / "test"
161-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
162-
)
163145
.settings(settings.commonSettings: _*)
164146
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
165147
.settings(libraryDependencies ++= dependencies.pluginHttpSparkDependencies)
@@ -186,20 +168,12 @@ lazy val plugin_parallel_write_spark = Project("wasp-plugin-parallel-write-spark
186168

187169
lazy val yarn_auth_hdfs =
188170
Project("wasp-yarn-auth-hdfs", file("yarn/auth/hdfs"))
189-
.settings(
190-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
191-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
192-
)
193171
.settings(settings.commonSettings: _*)
194172
.settings(dependencies.kmsTest: _*)
195173
.settings(libraryDependencies ++= dependencies.yarnAuthHdfsDependencies)
196174

197175
lazy val yarn_auth_hbase =
198176
Project("wasp-yarn-auth-hbase", file("yarn/auth/hbase"))
199-
.settings(
200-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
201-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
202-
)
203177
.settings(settings.commonSettings: _*)
204178
.settings(libraryDependencies ++= dependencies.yarnAuthHBaseDependencies)
205179

@@ -212,18 +186,10 @@ lazy val yarn = Project("wasp-yarn", file("yarn"))
212186
.aggregate(yarn_auth)
213187

214188
lazy val spark_telemetry_plugin = Project("wasp-spark-telemetry-plugin", file("spark/telemetry-plugin"))
215-
.settings(
216-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
217-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
218-
)
219189
.settings(settings.commonSettings: _*)
220190
.settings(libraryDependencies ++= dependencies.sparkTelemetryPluginDependencies)
221191

222192
lazy val spark_nifi_plugin = Project("wasp-spark-nifi-plugin", file("spark/nifi-plugin"))
223-
.settings(
224-
Compile / unmanagedSourceDirectories += sourceDirectory.value / "main"
225-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
226-
)
227193
.settings(settings.commonSettings: _*)
228194
.settings(libraryDependencies ++= dependencies.sparkNifiPluginDependencies)
229195
.dependsOn(consumers_spark)
@@ -339,7 +305,7 @@ lazy val whiteLabelConsumersSpark =
339305
Project("wasp-whitelabel-consumers-spark", file("whitelabel/consumers-spark"))
340306
.settings(settings.commonSettings: _*)
341307
.dependsOn(whiteLabelModels)
342-
.dependsOn(consumers_spark)
308+
.dependsOn(consumers_spark % dependCompileOnCompileAndTestOnTest)
343309
.dependsOn(repository_mongo)
344310
.dependsOn(plugin_console_spark)
345311
.dependsOn(plugin_hbase_spark)
@@ -362,10 +328,6 @@ lazy val whiteLabelConsumersSpark =
362328
} else {
363329
Project("wasp-whitelabel-consumers-spark", file("whitelabel/consumers-spark"))
364330
.settings(settings.commonSettings: _*)
365-
.settings(
366-
Test / unmanagedSourceDirectories += sourceDirectory.value / "test"
367-
/ s"scala${if (flavor == EMR613) "-emr613" else "-legacy"}"
368-
)
369331
.dependsOn(whiteLabelModels)
370332
.dependsOn(consumers_spark)
371333
.dependsOn(repository_mongo)

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/streaming.actor.telemetry/CompatibilityTelemetryActor.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityAvroDeserializerExpression.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityAvroSerializerExpression.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityCompressExpression.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityDecodeUsingAvro.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityEncodeUsingAvro.scala

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

consumers-spark/src/main/scala-legacy/it/agilelab/bigdata/wasp/consumers/spark/utils/CompatibilityEncoders.scala

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

consumers-spark/src/main/scala-legacy/org.apache.spark/CompatibilitySparkHadoopUtil.scala

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

0 commit comments

Comments
 (0)