This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch branch-0.10
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.10 by this push:
new fe493e9 [ZEPPELIN-5522] Remove unnecessary maven-dependency-plugin
maven plugin calls
fe493e9 is described below
commit fe493e93a18eba7e7536a1638bcdce0415edc306
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Thu Sep 16 09:21:14 2021 +0200
[ZEPPELIN-5522] Remove unnecessary maven-dependency-plugin maven plugin
calls
### What is this PR for?
This PR removes unnecessary maven-dependency-plugin maven plugin calls
### What type of PR is it?
- Refactoring
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5522
### How should this be tested?
* CI
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <philipp.dal...@gmail.com>
Closes #4224 from Reamer/maven-dependency-plugin and squashes the following
commits:
1a73f4f29 [Philipp Dallig] Remove maven-dependency-plugin from
zeppelin-distribution
aa5d203d9 [Philipp Dallig] Remove maven-dependency-plugin from
zeppelin-interpreter-parent
ff562e246 [Philipp Dallig] Remove plugin maven-dependency-plugin, which is
skipped by default in zeppelin-interpreter-parent
43ee00ca7 [Philipp Dallig] Skip maven-dependency-plugin
copy-plugin-dependencies for k8s-standard
(cherry picked from commit 37630f2e4e1a1b65ca87a45a5bc3db4331f065cd)
Signed-off-by: Philipp Dallig <philipp.dal...@gmail.com>
---
alluxio/pom.xml | 3 ---
angular/pom.xml | 3 ---
beam/pom.xml | 3 ---
bigquery/pom.xml | 3 ---
cassandra/pom.xml | 3 ---
elasticsearch/pom.xml | 3 ---
file/pom.xml | 3 ---
flink-cmd/pom.xml | 3 ---
geode/pom.xml | 3 ---
groovy/pom.xml | 3 ---
hazelcastjet/pom.xml | 3 ---
hbase/pom.xml | 3 ---
ignite/pom.xml | 3 ---
influxdb/pom.xml | 3 ---
java/pom.xml | 3 ---
jdbc/pom.xml | 3 ---
kotlin/pom.xml | 3 ---
ksql/pom.xml | 3 ---
kylin/pom.xml | 3 ---
lens/pom.xml | 3 ---
livy/pom.xml | 3 ---
markdown/pom.xml | 3 ---
mongodb/pom.xml | 3 ---
neo4j/pom.xml | 3 ---
pig/pom.xml | 3 ---
rlang/pom.xml | 3 ---
sap/pom.xml | 3 ---
scalding/pom.xml | 3 ---
scio/pom.xml | 3 ---
shell/pom.xml | 3 ---
spark-submit/pom.xml | 3 ---
spark/spark-dependencies/pom.xml | 18 ------------------
sparql/pom.xml | 5 +----
submarine/pom.xml | 3 ---
zeppelin-common/pom.xml | 6 ------
zeppelin-distribution/pom.xml | 8 --------
zeppelin-interpreter-parent/pom.xml | 15 ---------------
zeppelin-jupyter-interpreter/pom.xml | 4 ----
zeppelin-plugins/launcher/k8s-standard/pom.xml | 6 ++++--
39 files changed, 5 insertions(+), 153 deletions(-)
diff --git a/alluxio/pom.xml b/alluxio/pom.xml
index d041f21..8db6974 100644
--- a/alluxio/pom.xml
+++ b/alluxio/pom.xml
@@ -108,9 +108,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/angular/pom.xml b/angular/pom.xml
index 7b0349c..6fe546f 100644
--- a/angular/pom.xml
+++ b/angular/pom.xml
@@ -41,9 +41,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/beam/pom.xml b/beam/pom.xml
index a07aade..dbb36b0 100644
--- a/beam/pom.xml
+++ b/beam/pom.xml
@@ -252,9 +252,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/bigquery/pom.xml b/bigquery/pom.xml
index cbf0dae..bc39ea9 100644
--- a/bigquery/pom.xml
+++ b/bigquery/pom.xml
@@ -86,9 +86,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 24bdf95..8e62296 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -235,9 +235,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 1d504ee..6afc7e8 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -89,9 +89,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/file/pom.xml b/file/pom.xml
index d85c597..42a4f2e 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -72,9 +72,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/flink-cmd/pom.xml b/flink-cmd/pom.xml
index 8a46157..0cb5f94 100644
--- a/flink-cmd/pom.xml
+++ b/flink-cmd/pom.xml
@@ -63,9 +63,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/geode/pom.xml b/geode/pom.xml
index ad04b1c..493f587 100644
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -63,9 +63,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/groovy/pom.xml b/groovy/pom.xml
index 6dbcf16..208bfd9 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -51,9 +51,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/hazelcastjet/pom.xml b/hazelcastjet/pom.xml
index 9472e45..37ae3dd 100644
--- a/hazelcastjet/pom.xml
+++ b/hazelcastjet/pom.xml
@@ -56,9 +56,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 110caec..45c5f04 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -104,9 +104,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/ignite/pom.xml b/ignite/pom.xml
index a43cb96..29a99d5 100644
--- a/ignite/pom.xml
+++ b/ignite/pom.xml
@@ -121,9 +121,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/influxdb/pom.xml b/influxdb/pom.xml
index cb8ffe6..c5e5a4a 100644
--- a/influxdb/pom.xml
+++ b/influxdb/pom.xml
@@ -65,9 +65,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/java/pom.xml b/java/pom.xml
index b39fbeb..b542d77 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -52,9 +52,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index b005b0e..5843db1 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -196,9 +196,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index a6a7aad..b2bf5a3 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -103,9 +103,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/ksql/pom.xml b/ksql/pom.xml
index c064429..359ffd8 100644
--- a/ksql/pom.xml
+++ b/ksql/pom.xml
@@ -70,9 +70,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/kylin/pom.xml b/kylin/pom.xml
index f023d5e..262ca53 100644
--- a/kylin/pom.xml
+++ b/kylin/pom.xml
@@ -62,9 +62,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/lens/pom.xml b/lens/pom.xml
index 99f8a8a..b3f48db 100644
--- a/lens/pom.xml
+++ b/lens/pom.xml
@@ -146,9 +146,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/livy/pom.xml b/livy/pom.xml
index 959c364..46a2221 100644
--- a/livy/pom.xml
+++ b/livy/pom.xml
@@ -304,9 +304,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/markdown/pom.xml b/markdown/pom.xml
index 4f9d251..1bf5e9f 100644
--- a/markdown/pom.xml
+++ b/markdown/pom.xml
@@ -83,9 +83,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 00f0fc1..2e59e57 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -52,9 +52,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index a506d59..9287cbc 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -78,9 +78,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/pig/pom.xml b/pig/pom.xml
index cd84f0b..8e52bec 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -147,9 +147,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/rlang/pom.xml b/rlang/pom.xml
index 556b778..ac9c333 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -134,9 +134,6 @@
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
<!-- include sparkr by default -->
<plugin>
diff --git a/sap/pom.xml b/sap/pom.xml
index 0186784..8795b06 100644
--- a/sap/pom.xml
+++ b/sap/pom.xml
@@ -62,9 +62,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/scalding/pom.xml b/scalding/pom.xml
index ecbd11b..716b9d5 100644
--- a/scalding/pom.xml
+++ b/scalding/pom.xml
@@ -143,9 +143,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/scio/pom.xml b/scio/pom.xml
index 788c210..6103c6f 100644
--- a/scio/pom.xml
+++ b/scio/pom.xml
@@ -111,9 +111,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/shell/pom.xml b/shell/pom.xml
index 647d854..12fc566 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -121,9 +121,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/spark-submit/pom.xml b/spark-submit/pom.xml
index 0390326..f584d0c 100644
--- a/spark-submit/pom.xml
+++ b/spark-submit/pom.xml
@@ -49,9 +49,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/spark/spark-dependencies/pom.xml b/spark/spark-dependencies/pom.xml
index a199092..b4b74e9 100644
--- a/spark/spark-dependencies/pom.xml
+++ b/spark/spark-dependencies/pom.xml
@@ -203,24 +203,6 @@
</executions>
</plugin>
- <!-- Deploy datanucleus jars to the interpreter/spark directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-interpreter-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
diff --git a/sparql/pom.xml b/sparql/pom.xml
index de0e9bc..47044ec 100644
--- a/sparql/pom.xml
+++ b/sparql/pom.xml
@@ -58,9 +58,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
@@ -75,4 +72,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/submarine/pom.xml b/submarine/pom.xml
index 4771f34..733b825 100644
--- a/submarine/pom.xml
+++ b/submarine/pom.xml
@@ -157,9 +157,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
diff --git a/zeppelin-common/pom.xml b/zeppelin-common/pom.xml
index 0193c41..114804a 100644
--- a/zeppelin-common/pom.xml
+++ b/zeppelin-common/pom.xml
@@ -69,12 +69,6 @@
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 47a5b14..e1f5964 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -118,14 +118,6 @@
</configuration>
</plugin>
- <plugin>
- <!--assembly does all the job here-->
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
</plugins>
</build>
diff --git a/zeppelin-interpreter-parent/pom.xml
b/zeppelin-interpreter-parent/pom.xml
index 5adff82..db8a70d 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -160,21 +160,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
diff --git a/zeppelin-jupyter-interpreter/pom.xml
b/zeppelin-jupyter-interpreter/pom.xml
index a796a39..b6e413c 100644
--- a/zeppelin-jupyter-interpreter/pom.xml
+++ b/zeppelin-jupyter-interpreter/pom.xml
@@ -169,10 +169,6 @@
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
-
- <plugin>
<artifactId>maven-shade-plugin</artifactId>
</plugin>
diff --git a/zeppelin-plugins/launcher/k8s-standard/pom.xml
b/zeppelin-plugins/launcher/k8s-standard/pom.xml
index a52795c..b47d8f6 100644
--- a/zeppelin-plugins/launcher/k8s-standard/pom.xml
+++ b/zeppelin-plugins/launcher/k8s-standard/pom.xml
@@ -118,13 +118,15 @@
</filters>
</configuration>
</plugin>
- <!-- disable maven-dependency-plugin with execution
copy-plugin-dependencies because we shade the whole dependency -->
+ <!-- skip maven-dependency-plugin with execution
copy-plugin-dependencies because we shade the whole dependency -->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-plugin-dependencies</id>
- <phase>none</phase>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</execution>
</executions>
</plugin>
