This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.12 by this push:
new aa216f8ba0 [ZEPPELIN-6135] Fix clean goal not removing interpreter/
output(Spark,Flink)
aa216f8ba0 is described below
commit aa216f8ba0309545be0a3224283fc9d9c8f87cd0
Author: ChanHo Lee <chanho0...@gmail.com>
AuthorDate: Wed Nov 6 22:30:45 2024 +0900
[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 <philipp.dal...@gmail.com>
(cherry picked from commit f172b917ae60d709dff3d81c0b5402384a8f4ecf)
Signed-off-by: Philipp Dallig <philipp.dal...@gmail.com>
---
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 db68ef957e..f1939861c1 100644
--- a/flink/flink-scala-2.12/pom.xml
+++ b/flink/flink-scala-2.12/pom.xml
@@ -33,7 +33,6 @@
<properties>
<!--library versions-->
- <interpreter.name>flink</interpreter.name>
<flink.version>${flink1.17.version}</flink.version>
<flink.scala.version>2.12.7</flink.scala.version>
<flink.scala.binary.version>2.12</flink.scala.binary.version>
diff --git a/flink/pom.xml b/flink/pom.xml
index 80e351616c..07da347fb5 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -41,6 +41,8 @@
</modules>
<properties>
+ <interpreter.name>flink</interpreter.name>
+
<flink1.15.version>1.15.1</flink1.15.version>
<flink1.16.version>1.16.0</flink1.16.version>
<flink1.17.version>1.17.1</flink1.17.version>
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index f47e0e7433..2fbfc042b7 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -33,7 +33,6 @@
<description>Zeppelin spark support</description>
<properties>
- <interpreter.name>spark</interpreter.name>
<!--library versions-->
<maven.plugin.api.version>3.0</maven.plugin.api.version>
<aether.version>1.12</aether.version>
diff --git a/spark/pom.xml b/spark/pom.xml
index 3b460171ed..9e5c973811 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -33,6 +33,8 @@
<description>Zeppelin Spark Support</description>
<properties>
+ <interpreter.name>spark</interpreter.name>
+
<spark.version>3.5.3</spark.version>
<protobuf.version>3.21.12</protobuf.version>
<py4j.version>0.10.9.7</py4j.version>
diff --git a/spark/spark-scala-parent/pom.xml b/spark/spark-scala-parent/pom.xml
index cc6fef8588..53794dd661 100644
--- a/spark/spark-scala-parent/pom.xml
+++ b/spark/spark-scala-parent/pom.xml
@@ -108,18 +108,6 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
-
<directory>${project.basedir}/../../interpreter/spark/scala-${spark.scala.binary.version}</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
