Repository: oozie Updated Branches: refs/heads/master 2e6b50ad1 -> f73303735
OOZIE-2963 Use net.hydromatic instead of org.pentaho aggdesigner-algorithmin pomfilesi (dbist13 via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f7330373 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f7330373 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f7330373 Branch: refs/heads/master Commit: f73303735bd011e8d271c504b4b73ec9a95a3405 Parents: 2e6b50a Author: Gezapeti Cseh <[email protected]> Authored: Mon Oct 2 11:31:02 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Mon Oct 2 11:31:02 2017 +0200 ---------------------------------------------------------------------- core/pom.xml | 11 +++++++++++ release-log.txt | 1 + sharelib/hive/pom.xml | 9 +++++++++ webapp/pom.xml | 4 ++++ 4 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f7330373/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 57a5ad5..6f9adb6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -150,6 +150,17 @@ <artifactId>hive-exec</artifactId> <scope>compile</scope> <classifier>${hive.classifier}</classifier> + <exclusions> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.hydromatic</groupId> + <artifactId>aggdesigner-algorithm</artifactId> + <version>6.0</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/f7330373/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0b8a109..69ad0b3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2963 Use net.hydromatic instead of org.pentaho aggdesigner-algorithmin pomfilesi (dbist13 via gezapeti) OOZIE-3070 Remove references to org.mortbay.jetty (pbacsko) OOZIE-2885 Running Spark actions should not need Hive on the classpath (satishsaley) OOZIE-2909 amend Fix license headers (andras.piros via gezapeti) http://git-wip-us.apache.org/repos/asf/oozie/blob/f7330373/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index 8253114..092b703 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -131,8 +131,17 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> </exclusion> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>net.hydromatic</groupId> + <artifactId>aggdesigner-algorithm</artifactId> + <version>6.0</version> + </dependency> <dependency> <groupId>org.antlr</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/f7330373/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index ee6341c..67b1432 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -109,6 +109,10 @@ <groupId>info.ganglia.gmetric4j</groupId> <artifactId>gmetric4j</artifactId> </exclusion> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> </exclusions> </dependency>
