You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by al...@apache.org on 2020/06/18 16:50:29 UTC

[zeppelin] branch master updated: [ZEPPELIN-4891] Remove duplicate declaration

This is an automated email from the ASF dual-hosted git repository.

alexott 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 54c8ce8  [ZEPPELIN-4891] Remove duplicate declaration
54c8ce8 is described below

commit 54c8ce895fb56419c54500791d8bfeba364e9b10
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Thu Jun 18 12:01:25 2020 +0200

    [ZEPPELIN-4891] Remove duplicate declaration
    
    ### What is this PR for?
     Fixes a Maven warning because maven-resources-plugin and net.jodah:concurrentunit is defined twice in flink/interpreter/pom.xml
    
    ### What type of PR is it?
    Bug Fix
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4891
    
    ### How should this be tested?
    * **Travis-CI**: https://travis-ci.org/github/Reamer/zeppelin/builds/699634998
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #3807 from Reamer/mvn_warning_flink_interpreter and squashes the following commits:
    
    f5e945060 [Philipp Dallig] Fixes a Maven warning because maven-resources-plugin and net.jodah:concurrentunit is defined twice in this pom.xml
---
 flink/interpreter/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/flink/interpreter/pom.xml b/flink/interpreter/pom.xml
index 3adc45b..5d6d41b 100644
--- a/flink/interpreter/pom.xml
+++ b/flink/interpreter/pom.xml
@@ -619,13 +619,6 @@
     </dependency>
 
     <dependency>
-      <groupId>net.jodah</groupId>
-      <artifactId>concurrentunit</artifactId>
-      <version>0.4.4</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_2.11</artifactId>
       <version>3.0.8</version>
@@ -801,9 +794,6 @@
         <artifactId>maven-dependency-plugin</artifactId>
       </plugin>
       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <configuration>