Repository: flume Updated Branches: refs/heads/trunk d8638afd3 -> 1c8c5e671 (forced update)
FLUME-2464 Remove hadoop and hbase profiles. Hadoop 1/2 profiles were obsolete and had not been used for a long time, so they have been deleted. HBase profile was always active, so its content has been moved to top level. Additional clean-ups: some version declarations moved to the parent pom, redundant version declarations and exclusions deleted. This closes #239 Reviewers: Ferenc Szabo (Peter Turcsanyi via Ferenc Szabo) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/0d2a9f9c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0d2a9f9c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0d2a9f9c Branch: refs/heads/trunk Commit: 0d2a9f9c1b36ecb6f57370d0b32bc61242d87f51 Parents: 5ec8bb6 Author: Peter Turcsanyi <[email protected]> Authored: Thu Nov 22 10:38:56 2018 +0100 Committer: Ferenc Szabo <[email protected]> Committed: Thu Nov 22 12:41:08 2018 +0100 ---------------------------------------------------------------------- flume-ng-auth/pom.xml | 2 +- flume-ng-channels/flume-kafka-channel/pom.xml | 2 - .../flume-spillable-memory-channel/pom.xml | 1 - flume-ng-configuration/pom.xml | 14 +- flume-ng-dist/pom.xml | 48 +- flume-ng-sinks/flume-dataset-sink/pom.xml | 2 - flume-ng-sinks/flume-hdfs-sink/pom.xml | 111 +-- flume-ng-sinks/flume-hive-sink/pom.xml | 126 +-- flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 233 ++--- flume-ng-sinks/flume-ng-hbase2-sink/pom.xml | 2 +- flume-ng-sinks/flume-ng-kafka-sink/pom.xml | 1 - flume-ng-sinks/pom.xml | 48 +- flume-ng-tests/pom.xml | 2 +- flume-shared/flume-shared-kafka/pom.xml | 1 - flume-shared/pom.xml | 14 - flume-tools/pom.xml | 62 -- pom.xml | 852 +++++++------------ 17 files changed, 419 insertions(+), 1102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-auth/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-auth/pom.xml b/flume-ng-auth/pom.xml index fa65b09..ab05dc7 100644 --- a/flume-ng-auth/pom.xml +++ b/flume-ng-auth/pom.xml @@ -59,7 +59,7 @@ limitations under the License. <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> + <artifactId>hadoop-common</artifactId> <optional>true</optional> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-channels/flume-kafka-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-kafka-channel/pom.xml b/flume-ng-channels/flume-kafka-channel/pom.xml index b9fb0d1..f9211b2 100644 --- a/flume-ng-channels/flume-kafka-channel/pom.xml +++ b/flume-ng-channels/flume-kafka-channel/pom.xml @@ -59,12 +59,10 @@ limitations under the License. <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> </dependency> <dependency> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-ng-kafka-sink</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-channels/flume-spillable-memory-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml index 9e61026..47434cc 100644 --- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml +++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.easytesting</groupId> <artifactId>fest-reflect</artifactId> - <version>${fest-reflect.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml index af698d8..ced620f 100644 --- a/flume-ng-configuration/pom.xml +++ b/flume-ng-configuration/pom.xml @@ -38,13 +38,14 @@ limitations under the License. <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> @@ -63,10 +64,11 @@ limitations under the License. <groupId>org.apache.flume</groupId> <artifactId>flume-ng-sdk</artifactId> </dependency> - <dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-ng-config-filter-api</artifactId> - <version>1.9.0-SNAPSHOT</version> - </dependency> + + <dependency> + <groupId>org.apache.flume</groupId> + <artifactId>flume-ng-config-filter-api</artifactId> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml index da5fa8a..3e74f02 100644 --- a/flume-ng-dist/pom.xml +++ b/flume-ng-dist/pom.xml @@ -57,46 +57,6 @@ </plugins> </build> - <profiles> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-dataset-sink</artifactId> - </dependency> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-hive-sink</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-dataset-sink</artifactId> - </dependency> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-hive-sink</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.flume</groupId> @@ -167,6 +127,14 @@ <artifactId>flume-ng-kafka-sink</artifactId> </dependency> <dependency> + <groupId>org.apache.flume.flume-ng-sinks</groupId> + <artifactId>flume-dataset-sink</artifactId> + </dependency> + <dependency> + <groupId>org.apache.flume.flume-ng-sinks</groupId> + <artifactId>flume-hive-sink</artifactId> + </dependency> + <dependency> <groupId>org.apache.flume.flume-ng-sources</groupId> <artifactId>flume-scribe-source</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-dataset-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-dataset-sink/pom.xml b/flume-ng-sinks/flume-dataset-sink/pom.xml index 1ceb31c..2fcc03a 100644 --- a/flume-ng-sinks/flume-dataset-sink/pom.xml +++ b/flume-ng-sinks/flume-dataset-sink/pom.xml @@ -91,7 +91,6 @@ limitations under the License. --> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop2.version}</version> <optional>true</optional> </dependency> @@ -114,7 +113,6 @@ limitations under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop2.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-hdfs-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml index 3681e6c..099c785 100644 --- a/flume-ng-sinks/flume-hdfs-sink/pom.xml +++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml @@ -89,11 +89,29 @@ limitations under the License. <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> + <artifactId>hadoop-common</artifactId> <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> @@ -105,95 +123,4 @@ limitations under the License. </dependencies> - <profiles> - - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <scope>test</scope> - </dependency> - - <!-- required because the hadoop-core pom is missing these deps - and MiniDFSCluster pulls in the webhdfs classes --> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-hive-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/pom.xml b/flume-ng-sinks/flume-hive-sink/pom.xml index 84ee3e1..7e29d75 100644 --- a/flume-ng-sinks/flume-hive-sink/pom.xml +++ b/flume-ng-sinks/flume-hive-sink/pom.xml @@ -36,96 +36,6 @@ limitations under the License. <artifactId>flume-hive-sink</artifactId> <name>Flume NG Hive Sink</name> - <profiles> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <scope>test</scope> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <scope>test</scope> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <scope>test</scope> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> <dependency> @@ -176,41 +86,33 @@ limitations under the License. <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> <scope>provided</scope> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>test</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <scope>test</scope> </dependency> <!--temporary - really belongs to hive-streaming : roshan --> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>runtime</scope> <version>${xerces.version}</version> + <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-ng-hbase-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml index 04c9c2d..7fb0ee1 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml @@ -54,7 +54,6 @@ <artifactId>guava</artifactId> </dependency> - <dependency> <groupId>org.hbase</groupId> <artifactId>asynchbase</artifactId> @@ -85,7 +84,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> + <artifactId>hadoop-common</artifactId> <optional>true</optional> </dependency> @@ -111,198 +110,62 @@ <artifactId>flume-hdfs-sink</artifactId> </dependency> - </dependencies> - - <profiles> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <scope>test</scope> - </dependency> - <!-- required because the hadoop-core pom is missing these deps - and MiniDFSCluster pulls in the webhdfs classes --> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> + <!-- There should be no need for Flume to include the following two + artifacts, but HBase pom has a bug which causes these to not get + pulled in. So we have to pull it in. Ideally this should be optional, + but making it optional causes build to fail. + --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <optional>true</optional> + </dependency> - <!-- There should be no need for Flume to include the following two - artifacts, but HBase pom has a bug which causes these to not get - pulled in. So we have to pull it in. Ideally this should be optional, - but making it optional causes build to fail. - --> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml index a34c2fa..42d4e9c 100644 --- a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml @@ -135,7 +135,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> + <artifactId>hadoop-common</artifactId> <optional>true</optional> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/flume-ng-kafka-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml index eb65500..59d5222 100644 --- a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml @@ -90,7 +90,6 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-sinks/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml index 4977acb..e1f1d8f 100644 --- a/flume-ng-sinks/pom.xml +++ b/flume-ng-sinks/pom.xml @@ -40,52 +40,8 @@ limitations under the License. <module>flume-ng-morphline-solr-sink</module> <module>flume-ng-kafka-sink</module> <module>flume-http-sink</module> + <module>flume-dataset-sink</module> + <module>flume-hive-sink</module> </modules> - <profiles> - - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - </profile> - - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <!-- add the flume-dataset-sink, which is only compatible with hadoop-2 - --> - <modules> - <module>flume-dataset-sink</module> - <module>flume-hive-sink</module> - </modules> - </profile> - - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <!-- add the flume-dataset-sink, which is only compatible with hadoop-2 - --> - <modules> - <module>flume-dataset-sink</module> - <module>flume-hive-sink</module> - </modules> - </profile> - - - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-ng-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index b57c4d2..5c74196 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> + <artifactId>hadoop-common</artifactId> <optional>true</optional> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-shared/flume-shared-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/flume-shared/flume-shared-kafka/pom.xml b/flume-shared/flume-shared-kafka/pom.xml index deb6a35..0fc83ab 100644 --- a/flume-shared/flume-shared-kafka/pom.xml +++ b/flume-shared/flume-shared-kafka/pom.xml @@ -39,7 +39,6 @@ limitations under the License. <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-shared/pom.xml ---------------------------------------------------------------------- diff --git a/flume-shared/pom.xml b/flume-shared/pom.xml index 7e9f4c7..d819c05 100644 --- a/flume-shared/pom.xml +++ b/flume-shared/pom.xml @@ -37,18 +37,4 @@ limitations under the License. <module>flume-shared-kafka-test</module> </modules> - <profiles> - - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - </profile> - - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/flume-tools/pom.xml ---------------------------------------------------------------------- diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml index abc25eb..2670832 100644 --- a/flume-tools/pom.xml +++ b/flume-tools/pom.xml @@ -70,70 +70,8 @@ limitations under the License. <dependency> <groupId>org.easytesting</groupId> <artifactId>fest-reflect</artifactId> - <version>${fest-reflect.version}</version> </dependency> </dependencies> - <profiles> - - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <scope>test</scope> - </dependency> - - <!-- required because the hadoop-core pom is missing these deps - and MiniDFSCluster pulls in the webhdfs classes --> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - - </profiles> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/0d2a9f9c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6b35fb..57d1d90 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,8 @@ limitations under the License. <gson.version>2.2.2</gson.version> <guava.version>18.0</guava.version> <guava-old.version>11.0.2</guava-old.version> - <hadoop2.version>2.9.0</hadoop2.version> + <hadoop.version>2.9.0</hadoop.version> + <hbase.version>1.0.0</hbase.version> <hbase2.jetty.version>9.3.19.v20170502</hbase2.jetty.version> <hbase2.version>2.0.0</hbase2.version> <httpcore.version>4.4.6</httpcore.version> @@ -139,498 +140,6 @@ limitations under the License. <profiles> <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>1</value> - </property> - </activation> - <properties> - <hadoop.version>1.2.1</hadoop.version> - <hbase.version>0.92.1</hbase.version> - <hadoop.common.artifact.id>hadoop-core</hadoop.common.artifact.id> - <thrift.version>0.7.0</thrift.version> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>flume.hadoop.profile</name> - <value>2</value> - </property> - </activation> - <properties> - <hadoop.version>${hadoop2.version}</hadoop.version> - <hbase.version>0.94.2</hbase.version> - <hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- only compatible with hadoop-2 --> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-dataset-sink</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <profile> - <id>hbase-1</id> - <activation> - <property> - <name>!flume.hadoop.profile</name> - </property> - </activation> - <properties> - <hadoop.version>${hadoop2.version}</hadoop.version> - <hbase.version>1.0.0</hbase.version> - <hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>${hadoop.common.artifact.id}</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- Ideally this should be optional, but making it optional causes - build to fail. - --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- There should be no need for Flume to include the following two - artifacts, but HBase pom has a bug which causes these to not get - pulled in. So we have to pull it in. Ideally this should be optional, - but making it optional causes build to fail. - --> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- only compatible with hadoop-2 --> - <dependency> - <groupId>org.apache.flume.flume-ng-sinks</groupId> - <artifactId>flume-dataset-sink</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <profile> <id>compileThriftLegacy</id> <activation> <activeByDefault>false</activeByDefault> @@ -1200,7 +709,7 @@ limitations under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> - <version>${hadoop2.version}</version> + <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -1368,31 +877,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${commons-codec.version}</version> @@ -1468,22 +952,6 @@ limitations under the License. dependency from asynchbase. --> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> <version>${elasticsearch.version}</version> @@ -1633,6 +1101,19 @@ limitations under the License. </dependency> <dependency> + <groupId>org.apache.flume.flume-ng-sinks</groupId> + <artifactId>flume-ng-kafka-sink</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>org.apache.flume.flume-ng-sinks</groupId> + <artifactId>flume-dataset-sink</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.apache.flume.flume-ng-sources</groupId> <artifactId>flume-scribe-source</artifactId> <version>${project.version}</version> @@ -1915,9 +1396,35 @@ limitations under the License. </dependency> <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-core</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Dependency for Zk provider --> @@ -1955,6 +1462,281 @@ limitations under the License. <version>${xalan.version}</version> </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <scope>test</scope> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <scope>test</scope> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- Ideally this should be optional, but making it optional causes + build to fail. + --> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- There should be no need for Flume to include the following two + artifacts, but HBase pom has a bug which causes these to not get + pulled in. So we have to pull it in. Ideally this should be optional, + but making it optional causes build to fail. + --> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement>
