ctubbsii closed pull request #531: Use Hadoop 3 exclusively for Accumulo 2.0
URL: https://github.com/apache/accumulo/pull/531
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 31f9a9915a..d977701c6e 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -79,6 +79,34 @@
<artifactId>protobuf-java</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -196,6 +224,10 @@
<artifactId>htrace-core</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core4</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -364,7 +396,7 @@
<outputScope>false</outputScope>
<sort>true</sort>
<!-- this list should match that in
src/main/assemblies/component.xml -->
- <includeArtifactIds>${artifactList}</includeArtifactIds>
+
<includeArtifactIds>commons-cli,commons-codec,commons-collections,commons-configuration,commons-io,commons-lang,commons-logging,commons-math3,commons-vfs2,gson,guava,htrace-core,htrace-core4,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12,log4j</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
@@ -413,7 +445,7 @@
<phase>package</phase>
<configuration>
<descriptors>
- <descriptor>${assemblyDescriptor}</descriptor>
+ <descriptor>src/main/assemblies/binary-release.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -468,80 +500,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
-
<artifactList>commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12,log4j</artifactList>
-
<assemblyDescriptor>src/main/assemblies/binary-release.xml</assemblyDescriptor>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <properties>
-
<artifactList>commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12,log4j</artifactList>
-
<assemblyDescriptor>src/main/assemblies/binary-release.xml</assemblyDescriptor>
- </properties>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <properties>
-
<artifactList>commons-cli,commons-codec,commons-collections,commons-configuration,commons-io,commons-lang,commons-logging,commons-math3,commons-vfs2,gson,guava,htrace-core,htrace-core4,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12,log4j</artifactList>
-
<assemblyDescriptor>src/main/assemblies/binary-release-hadoop3.xml</assemblyDescriptor>
- </properties>
- <!-- When using Hadoop 3 with the shaded jars, we need to provide
- the jars we need instead of relying on
them externally. -->
- <dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core4</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/assemble/src/main/assemblies/binary-release-hadoop3.xml
b/assemble/src/main/assemblies/binary-release-hadoop3.xml
deleted file mode 100644
index c21f5da9a5..0000000000
--- a/assemble/src/main/assemblies/binary-release-hadoop3.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <componentDescriptors>
-
<componentDescriptor>src/main/assemblies/component-hadoop3.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/assemble/src/main/assemblies/component-hadoop3.xml
b/assemble/src/main/assemblies/component-hadoop3.xml
deleted file mode 100644
index e1dda0f449..0000000000
--- a/assemble/src/main/assemblies/component-hadoop3.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <!-- if you update this list, you should also update the assembly
- pom.xml section which executes the maven-dependency-plugin to generate
a
- version listing for packaged artifacts -->
- <include>${groupId}:${artifactId}-*</include>
- <include>com.beust:jcommander</include>
- <include>com.github.ben-manes.caffeine:caffeine</include>
- <include>com.google.code.gson:gson</include>
- <include>com.google.guava:guava</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-io:commons-io</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-logging:commons-logging</include>
- <include>commons-configuration:commons-configuration</include>
- <include>javax.servlet:javax.servlet-api</include>
- <include>jline:jline</include>
- <include>org.apache.commons:commons-math3</include>
- <include>org.apache.commons:commons-vfs2</include>
- <include>org.apache.htrace:htrace-core4</include>
- <include>org.apache.thrift:libthrift</include>
- <include>org.eclipse.jetty:jetty-continuation</include>
- <include>org.eclipse.jetty:jetty-http</include>
- <include>org.eclipse.jetty:jetty-io</include>
- <include>org.eclipse.jetty:jetty-security</include>
- <include>org.eclipse.jetty:jetty-server</include>
- <!-- jetty-servlet only needed by old monitor -->
- <include>org.eclipse.jetty:jetty-servlet</include>
- <include>org.eclipse.jetty:jetty-util</include>
- <include>org.apache.htrace:htrace-core</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-log4j12</include>
- <!-- Jersey/Jackson-based webservice -->
- <include>com.fasterxml:classmate</include>
- <include>com.fasterxml.jackson.core:jackson-annotations</include>
- <include>com.fasterxml.jackson.core:jackson-core</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
-
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
-
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
- <include>javax.annotation:javax.annotation-api</include>
- <include>javax.el:javax.el-api</include>
- <include>javax.validation:validation-api</include>
- <include>javax.ws.rs:javax.ws.rs-api</include>
- <include>org.freemarker:freemarker</include>
- <include>org.glassfish.hk2.external:aopalliance-repackaged</include>
- <include>org.glassfish.hk2.external:javax.inject</include>
- <include>org.glassfish.hk2:hk2-api</include>
- <include>org.glassfish.hk2:hk2-locator</include>
- <include>org.glassfish.hk2:hk2-utils</include>
- <include>org.glassfish.hk2:osgi-resource-locator</include>
- <include>org.glassfish.jersey.bundles.repackaged:jersey-guava</include>
-
<include>org.glassfish.jersey.containers:jersey-container-jetty-http</include>
-
<include>org.glassfish.jersey.containers:jersey-container-servlet-core</include>
-
<include>org.glassfish.jersey.containers:jersey-container-servlet</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.core:jersey-server</include>
- <include>org.glassfish.jersey.ext:jersey-bean-validation</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.ext:jersey-mvc-freemarker</include>
- <include>org.glassfish.jersey.ext:jersey-mvc</include>
- <include>org.glassfish.jersey.media:jersey-media-jaxb</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.web:javax.el</include>
- <include>org.glassfish.web:el-impl</include>
- <include>org.hibernate:hibernate-validator</include>
- <include>org.javassist:javassist</include>
- <include>org.jboss.logging:jboss-logging</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>bin</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>lib/ext</outputDirectory>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/example-configs</directory>
- <outputDirectory>conf</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>accumulo-client.properties</include>
- </includes>
- </fileSet>
- <!-- Lift generated thrift proxy code into its own directory -->
- <fileSet>
- <directory>../proxy/target</directory>
- <outputDirectory>lib/proxy</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>gen-cpp/**</include>
- <include>gen-py/**</include>
- <include>gen-rb/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy</directory>
- <outputDirectory>conf/templates</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>proxy.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/src/main/thrift</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>lib/proxy/thrift</outputDirectory>
- <includes>
- <include>*.thrift</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <fileMode>0644</fileMode>
- <includes>
- <include>README.md</include>
- <include>INSTALL.md</include>
- <include>BUILD.md</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>VERSIONS</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
- </fileSets>
-</component>
diff --git a/assemble/src/main/assemblies/component.xml
b/assemble/src/main/assemblies/component.xml
index 98e3b9c583..e1dda0f449 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -35,10 +35,18 @@
<include>com.google.code.gson:gson</include>
<include>com.google.guava:guava</include>
<include>com.google.protobuf:protobuf-java</include>
+ <include>commons-cli:commons-cli</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-logging:commons-logging</include>
+ <include>commons-configuration:commons-configuration</include>
<include>javax.servlet:javax.servlet-api</include>
<include>jline:jline</include>
<include>org.apache.commons:commons-math3</include>
<include>org.apache.commons:commons-vfs2</include>
+ <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.thrift:libthrift</include>
<include>org.eclipse.jetty:jetty-continuation</include>
<include>org.eclipse.jetty:jetty-http</include>
diff --git a/client/mapreduce/pom.xml b/client/mapreduce/pom.xml
index acfe3f51ac..4bb9dd6196 100644
--- a/client/mapreduce/pom.xml
+++ b/client/mapreduce/pom.xml
@@ -43,10 +43,19 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -100,58 +109,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/core/pom.xml b/core/pom.xml
index 53e32cec62..909ee483a1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -87,6 +87,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -103,11 +107,21 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-minicluster</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -317,72 +331,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml
index 538d29cf41..e9187aff46 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -39,68 +39,23 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/maven-plugin/src/it/plugin-test/pom.xml
b/maven-plugin/src/it/plugin-test/pom.xml
index e77cf2845f..dcab227fe5 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -67,6 +67,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -83,6 +87,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -146,58 +155,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index df7a972ce3..d3fecf5365 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -87,6 +87,15 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-minicluster</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -99,6 +108,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -152,73 +166,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-minicluster</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index cde58c7b69..5f999917ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<findbugs.version>3.0.5</findbugs.version>
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
- <hadoop.version>2.6.4</hadoop.version>
+ <hadoop.version>3.0.2</hadoop.version>
<hk2.version>2.4.0-b27</hk2.version>
<htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
<htrace.version>3.1.0-incubating</htrace.version>
@@ -1173,22 +1173,6 @@
</rules>
</configuration>
</execution>
- <execution>
- <id>enforce-hadoop-profile</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>hadoop.profile</property>
- <regex>(2|3)</regex>
- <regexMessage>You should specify the Hadoop profile by major
Hadoop generation, i.e. 2 or 3, not by a version number.
- Use hadoop.version to use a particular Hadoop version within that
generation.</regexMessage>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -1791,44 +1775,5 @@
</plugins>
</build>
</profile>
- <!-- Active by default, build against Hadoop 2 -->
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- <hadoop.version>2.6.4</hadoop.version>
- </properties>
- </profile>
- <!-- Build against hadoop 2 explicitly -->
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>2.6.4</hadoop.version>
- </properties>
- </profile>
- <!-- Build against hadoop 3 explicitly -->
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>3.0.0</hadoop.version>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 3998922f8e..6cb7f63957 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -59,6 +59,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -67,6 +71,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -107,57 +116,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/server/base/pom.xml b/server/base/pom.xml
index d2e31d380c..96523a3a54 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -80,6 +80,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -96,6 +100,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -144,57 +153,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index e5de5a3c5d..a19bcc7579 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -56,6 +56,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -68,6 +72,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -84,58 +93,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/server/master/pom.xml b/server/master/pom.xml
index ab84144137..7075e3ce75 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -76,6 +80,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -92,58 +101,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 4c889d05ad..c70c66df83 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -76,6 +76,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -120,6 +124,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -205,70 +214,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index d7ca49d020..d33fc4dc2c 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -56,6 +56,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -72,6 +76,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -112,57 +121,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index aee011c672..a4b3c1e0c1 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -76,6 +76,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -92,6 +96,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -129,58 +138,4 @@
</plugins>
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/shell/pom.xml b/shell/pom.xml
index 75f63cdf9a..52806a2bee 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -87,6 +87,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -95,6 +99,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -121,58 +130,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/start/pom.xml b/start/pom.xml
index d14879efe6..c90f493e92 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -42,15 +42,29 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-minicluster</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
@@ -109,73 +123,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index 02ded2a0ea..f06ca97452 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -130,6 +130,14 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-minicluster</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
@@ -173,6 +181,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-iterator-test-harness</artifactId>
@@ -349,69 +362,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>hadoop-default</id>
- <activation>
- <property>
- <name>!hadoop.profile</name>
- </property>
- </activation>
- <properties>
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop3</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-minicluster</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
