You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by km...@apache.org on 2019/01/18 07:59:50 UTC

[oozie] branch master updated: OOZIE-3420 [action] pom.xml fixes (andras.piros via kmarton)

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

kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new 7a8376a  OOZIE-3420 [action] pom.xml fixes (andras.piros via kmarton)
7a8376a is described below

commit 7a8376a914d9240ecbec8a8540342725672f84b6
Author: Julia Kinga Marton <km...@apache.org>
AuthorDate: Fri Jan 18 08:59:37 2019 +0100

    OOZIE-3420 [action] pom.xml fixes (andras.piros via kmarton)
---
 release-log.txt        | 1 +
 sharelib/git/pom.xml   | 6 ++++++
 sharelib/oozie/pom.xml | 1 +
 sharelib/spark/pom.xml | 1 +
 tools/pom.xml          | 1 +
 5 files changed, 10 insertions(+)

diff --git a/release-log.txt b/release-log.txt
index ffdaca4..72c717a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3420 [action] pom.xml fixes (andras.piros via kmarton)
 OOZIE-3414 Oozie master does not compile with -Dhadoop.version=2.8.5 (asalamon74 via kmarton)
 OOZIE-3401 [test] fix TestPySpark failure (kmarton, asalamon74)
 OOZIE-3419 [fluent-job] GraphVisualization fails before JDK 1.8.0_u40 (andras.piros via kmarton)
diff --git a/sharelib/git/pom.xml b/sharelib/git/pom.xml
index db2d47a..1c17e48 100644
--- a/sharelib/git/pom.xml
+++ b/sharelib/git/pom.xml
@@ -47,6 +47,12 @@
         <dependency>
             <groupId>org.apache.oozie</groupId>
             <artifactId>oozie-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.hive</groupId>
+                    <artifactId>hive-exec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/sharelib/oozie/pom.xml b/sharelib/oozie/pom.xml
index e522e9a..a53d335 100644
--- a/sharelib/oozie/pom.xml
+++ b/sharelib/oozie/pom.xml
@@ -76,6 +76,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml
index b26849c..76f6903 100644
--- a/sharelib/spark/pom.xml
+++ b/sharelib/spark/pom.xml
@@ -363,6 +363,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 832cb58..72a6c28 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -91,6 +91,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>