Skip to content

Commit

Permalink
[ZEPPELIN-6135] Fix clean goal not removing interpreter/ output(Spark…
Browse files Browse the repository at this point in the history
…,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.dallig@gmail.com>
(cherry picked from commit f172b91)
Signed-off-by: Philipp Dallig <philipp.dallig@gmail.com>
  • Loading branch information
tbonelee authored and Reamer committed Nov 6, 2024
1 parent f4847ea commit aa216f8
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 14 deletions.
1 change: 0 additions & 1 deletion flink/flink-scala-2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion spark/interpreter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions spark/spark-scala-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit aa216f8

Please sign in to comment.