This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 053ca477f5 [ZEPPELIN-5842] Maven-Plugin management (#4503)
053ca477f5 is described below
commit 053ca477f55642ede75f3621e301ff9229d3d95e
Author: Philipp Dallig <[email protected]>
AuthorDate: Mon Nov 14 10:32:42 2022 +0100
[ZEPPELIN-5842] Maven-Plugin management (#4503)
* Plugin versions are managed in parent zeppelin pom
* Overwrite plugin version in pluginManagement section
* Add project.build.sourceEncoding UTF-8 into root pom.xml
---
file/pom.xml | 4 -
pom.xml | 196 +++++++++++++++++++++---------------
zeppelin-display/pom.xml | 6 --
zeppelin-integration/pom.xml | 5 -
zeppelin-interpreter-shaded/pom.xml | 1 -
zeppelin-interpreter/pom.xml | 3 -
6 files changed, 114 insertions(+), 101 deletions(-)
diff --git a/file/pom.xml b/file/pom.xml
index 546fa751f3..d2af6c34eb 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -36,10 +36,6 @@
<interpreter.name>file</interpreter.name>
<ws.rsapi.version>2.0</ws.rsapi.version>
<jersey.common.version>2.22.2</jersey.common.version>
-
- <!--plugin versions-->
- <plugin.surefire.version>2.18.1</plugin.surefire.version>
- <interpreter.name>file</interpreter.name>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 44e983bb49..c3c9a90ab1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,8 @@
</modules>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<!-- language versions -->
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
@@ -1388,7 +1390,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${plugin.compiler.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -1420,7 +1421,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${plugin.jar.version}</version>
<configuration>
<archive>
<manifest>
@@ -1435,7 +1435,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>${plugin.remote.resource.version}</version>
<executions>
<execution>
<id>process-remote-resources</id>
@@ -1454,7 +1453,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>${plugin.scm.version}</version>
<configuration>
<connectionType>developerConnection</connectionType>
<scmVersion>branch-0.1</scmVersion>
@@ -1465,7 +1463,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>${plugin.enforcer.version}</version>
<executions>
<execution>
<id>enforce</id>
@@ -1499,13 +1496,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${plugin.deploy.version}</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>${plugin.git.commit.id.version}</version>
<executions>
<execution>
<goals>
@@ -1547,17 +1542,54 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${plugin.shade.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${plugin.shade.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${plugin.install.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${plugin.jar.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>${plugin.scm.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>${plugin.git.commit.id.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${plugin.enforcer.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${plugin.deploy.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${plugin.remote.resource.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -1733,90 +1765,90 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
- <version>${plugin.scalatest.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest-maven-plugin</artifactId>
+ <version>${plugin.scalatest.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${plugin.buildhelper.version}</version>
- </plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>${plugin.frontend.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${plugin.buildhelper.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${plugin.failsafe.version}</version>
- </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>${plugin.frontend.version}</version>
+ </plugin>
- <plugin>
- <groupId>com.github.os72</groupId>
- <artifactId>protoc-jar-maven-plugin</artifactId>
- <version>${plugin.protobuf.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${plugin.failsafe.version}</version>
+ </plugin>
- <plugin>
- <groupId>com.bazaarvoice.maven.plugins</groupId>
- <artifactId>s3-upload-maven-plugin</artifactId>
- <version>${plugin.s3.upload.version}</version>
- </plugin>
+ <plugin>
+ <groupId>com.github.os72</groupId>
+ <artifactId>protoc-jar-maven-plugin</artifactId>
+ <version>${plugin.protobuf.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>${plugin.buildnumber.version}</version>
- </plugin>
+ <plugin>
+ <groupId>com.bazaarvoice.maven.plugins</groupId>
+ <artifactId>s3-upload-maven-plugin</artifactId>
+ <version>${plugin.s3.upload.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>${plugin.jdeb.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>${plugin.buildnumber.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <version>${plugin.avro.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <version>${plugin.jdeb.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.scalatra.scalate</groupId>
- <artifactId>maven-scalate-plugin_${scala.binary.version}</artifactId>
- <version>${plugin.scalate.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-maven-plugin</artifactId>
+ <version>${plugin.avro.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${plugin.source.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.scalatra.scalate</groupId>
+ <artifactId>maven-scalate-plugin_${scala.binary.version}</artifactId>
+ <version>${plugin.scalate.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${plugin.javadoc.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${plugin.source.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${plugin.gpg.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${plugin.javadoc.version}</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${plugin.rat.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${plugin.gpg.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${plugin.rat.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 751e3a726d..32241de2ed 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -30,12 +30,6 @@
<packaging>jar</packaging>
<name>Zeppelin: Display system apis</name>
- <properties>
- <!--plugin versions -->
- <plugin.failsafe.version>2.16</plugin.failsafe.version>
- <plugin.scalatest.version>1.0</plugin.scalatest.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index 0eb831e268..1849e1f5de 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -37,14 +37,9 @@
</prerequisites>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<!--test library versions-->
<selenium.java.version>3.141.59</selenium.java.version>
<commons.lang3.version>3.7</commons.lang3.version>
-
- <!--plugin library versions-->
- <plugin.failsafe.version>2.16</plugin.failsafe.version>
</properties>
<dependencies>
diff --git a/zeppelin-interpreter-shaded/pom.xml
b/zeppelin-interpreter-shaded/pom.xml
index 52fefb1ad6..3c52387dcd 100644
--- a/zeppelin-interpreter-shaded/pom.xml
+++ b/zeppelin-interpreter-shaded/pom.xml
@@ -33,7 +33,6 @@
<description>Zeppelin Interpreter Shaded</description>
<properties>
- <!--plugin versions-->
<shaded.dependency.prefix>org.apache.zeppelin.shaded</shaded.dependency.prefix>
</properties>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index d0eb2025ae..dab43501a3 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -41,9 +41,6 @@
<sisu.plexus.version>0.3.4</sisu.plexus.version>
<jline.version>2.14.3</jline.version>
<atomix.version>3.0.0-rc4</atomix.version>
-
- <!--plugin versions-->
- <plugin.shade.version>2.3</plugin.shade.version>
</properties>
<dependencies>
