Repository: nifi Updated Branches: refs/heads/master 93aac8cff -> c5a174ae6
Revert "NIFI-1193: Add support for storing data in Hive tables." This reverts commit 9dfef8f4327ec4e58c5307fcde758e455267fddd. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c5a174ae Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c5a174ae Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c5a174ae Branch: refs/heads/master Commit: c5a174ae6de9e18b53d9077300781def17c129f0 Parents: 93aac8c Author: Aldrin Piri <[email protected]> Authored: Wed Jan 27 10:03:41 2016 -0500 Committer: Aldrin Piri <[email protected]> Committed: Wed Jan 27 10:03:41 2016 -0500 ---------------------------------------------------------------------- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 48 +------- .../nifi-kite-processors/pom.xml | 116 ------------------- 2 files changed, 4 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/c5a174ae/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml index ce3efc8..4679f8f 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml @@ -40,10 +40,6 @@ <artifactId>hadoop-client</artifactId> </exclusion> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-resourcemanager</artifactId> - </exclusion> - <exclusion> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> </exclusion> @@ -64,12 +60,12 @@ <artifactId>guava</artifactId> </exclusion> <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </exclusion> <exclusion> - <groupId>commons-compress</groupId> - <artifactId>commons-compress</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> <exclusion> <groupId>org.apache.commons</groupId> @@ -80,42 +76,6 @@ <artifactId>commons-codec</artifactId> </exclusion> <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang3</groupId> - <artifactId>commons-lang3</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.log4j</groupId> - <artifactId>apache-log4j-extras</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/nifi/blob/c5a174ae/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml index 60cce0d..62aaec8 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml @@ -26,7 +26,6 @@ <properties> <kite.version>1.0.0</kite.version> - <hive.version>1.2.0</hive.version> <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version> </properties> @@ -59,26 +58,8 @@ <dependency> <groupId>org.kitesdk</groupId> - <artifactId>kite-data-hive</artifactId> - <version>${kite.version}</version> - <exclusions> - <exclusion> - <!-- Use findbugs-annotations instead --> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - <exclusion> - <groupId>com.twitter</groupId> - <artifactId>parquet-hive-bundle</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.kitesdk</groupId> <artifactId>kite-hadoop-dependencies</artifactId> <type>pom</type> - <scope>provided</scope> <version>${kite.version}</version> <exclusions> <exclusion> @@ -92,103 +73,6 @@ </exclusions> </dependency> - <!-- Hive dependencies to connect to the MetaStore --> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-core</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - <exclusion> - <artifactId>jersey-servlet</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <artifactId>jersey-core</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <artifactId>jersey-server</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>jetty-all</artifactId> - <groupId>org.eclipse.jetty.aggregate</groupId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-exec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - </exclusion> - <exclusion> - <groupId>com.twitter</groupId> - <artifactId>parquet-hadoop-bundle</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-resourcemanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.antlr</groupId> - <artifactId>antlr-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </exclusion> - <exclusion> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </exclusion> - <exclusion> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </exclusion> - <exclusion> - <groupId>com.jolbox</groupId> - <artifactId>bonecp</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
