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 9368005 ZEPPELIN-5534 Fix Maven warnings
9368005 is described below
commit 9368005e7bd8ac4665df99fd9b532ecb742882cd
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Wed Sep 22 14:39:54 2021 +0300
ZEPPELIN-5534 Fix Maven warnings
### What is this PR for?
There are Maven warnings caused by duplicate declarations of Maven plugins.
### What type of PR is it?
[Improvement]
### Todos
None
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5534
### How should this be tested?
* Execute any Maven goal, e.g. `mvn clean`
* Make sure there are no warnings
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
Closes #4231 from martin-g/zeppelin-5534-fix-maven-warnings and squashes
the following commits:
20c4d5b6c [Martin Tzvetanov Grigorov] ZEPPELIN-5534 Fix Maven warnings
---
flink/flink-scala-2.11/pom.xml | 11 +-----
flink/flink-scala-2.12/pom.xml | 9 -----
flink/flink-scala-parent/pom.xml | 77 ++++++++++++++--------------------------
3 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/flink/flink-scala-2.11/pom.xml b/flink/flink-scala-2.11/pom.xml
index 129746f..bdb6c46 100644
--- a/flink/flink-scala-2.11/pom.xml
+++ b/flink/flink-scala-2.11/pom.xml
@@ -43,16 +43,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- </plugin>
-
+
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml
index 7b7b816..9dd83ba 100644
--- a/flink/flink-scala-2.12/pom.xml
+++ b/flink/flink-scala-2.12/pom.xml
@@ -45,15 +45,6 @@
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
diff --git a/flink/flink-scala-parent/pom.xml b/flink/flink-scala-parent/pom.xml
index fd5af93..04c9e9e 100644
--- a/flink/flink-scala-parent/pom.xml
+++ b/flink/flink-scala-parent/pom.xml
@@ -232,21 +232,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-connector-hive_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-connector-hive_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<!-- hadoop compatibility dependency -->
<dependency>
<groupId>org.apache.flink</groupId>
@@ -644,12 +629,38 @@
<build>
<pluginManagement>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/scala</source>
+ </sources>
+ </configuration>
+ </execution>
+ <!-- Add src/test/scala to eclipse build path -->
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/test/scala</source>
+ </sources>
+ </configuration>
+ </execution>
+
+ <execution>
<id>add-java-sources</id>
<phase>generate-sources</phase>
<goals>
@@ -848,40 +859,6 @@
</configuration>
</plugin>
- <!-- Adding scala source directories to build path -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <!-- Add src/main/scala to eclipse build path -->
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/scala</source>
- </sources>
- </configuration>
- </execution>
- <!-- Add src/test/scala to eclipse build path -->
- <execution>
- <id>add-test-source</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/test/scala</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
