From f172b917ae60d709dff3d81c0b5402384a8f4ecf Mon Sep 17 00:00:00 2001 From: ChanHo Lee Date: Wed, 6 Nov 2024 22:30:45 +0900 Subject: [PATCH] [ZEPPELIN-6135] Fix clean goal not removing interpreter/ output(Spark,Flink) ### What is this PR for? The Maven clean goal does not remove some interpreter files in `interpreter/` directory as expected. Specifically, the `spark` and `flink` interpreters are not cleaned. This happens because when extending the `pom.xml` in the `pom.xml` of these interpreters, they lack the `interpreter.name` property. As a result, the clean target directory configured in `zeppelion-interpreter-parent` was not properly resolved before. ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? * Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN-6135 ### How should this be tested? - Build Zeppelin - Clean Zeppelin and check if all interpreters are removed in `interpreter/` ### Screenshots (if appropriate) ### Questions: * Does the license files need to update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Closes #4881 from tbonelee/fix-interparent-clean. Signed-off-by: Philipp Dallig --- flink/flink-scala-2.12/pom.xml | 1 - flink/pom.xml | 2 ++ spark/interpreter/pom.xml | 1 - spark/pom.xml | 2 ++ spark/spark-scala-parent/pom.xml | 12 ------------ 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml index db68ef957e4..f1939861c13 100644 --- a/flink/flink-scala-2.12/pom.xml +++ b/flink/flink-scala-2.12/pom.xml @@ -33,7 +33,6 @@ - flink ${flink1.17.version} 2.12.7 2.12 diff --git a/flink/pom.xml b/flink/pom.xml index 80e351616c5..07da347fb57 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -41,6 +41,8 @@ + flink + 1.15.1 1.16.0 1.17.1 diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml index f47e0e74339..2fbfc042b7f 100644 --- a/spark/interpreter/pom.xml +++ b/spark/interpreter/pom.xml @@ -33,7 +33,6 @@ Zeppelin spark support - spark 3.0 1.12 diff --git a/spark/pom.xml b/spark/pom.xml index 3b460171ed0..9e5c9738115 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -33,6 +33,8 @@ Zeppelin Spark Support + spark + 3.5.3 3.21.12 0.10.9.7 diff --git a/spark/spark-scala-parent/pom.xml b/spark/spark-scala-parent/pom.xml index cc6fef85885..53794dd6613 100644 --- a/spark/spark-scala-parent/pom.xml +++ b/spark/spark-scala-parent/pom.xml @@ -108,18 +108,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - - - - ${project.basedir}/../../interpreter/spark/scala-${spark.scala.binary.version} - false - - - - maven-resources-plugin