This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 761cebc02ddc635fa8a7259f620c6c4c16b76f47
Merge: 45b638c fc75402
Author: Josh Elser <els...@apache.org>
AuthorDate: Sun Feb 25 21:12:58 2018 -0500
Merge branch '1.8'
.travis.yml | 4 +-
assemble/pom.xml | 79 ++++++++-
.../src/main/assemblies/binary-release-hadoop3.xml | 27 +++
assemble/src/main/assemblies/component-hadoop3.xml | 194 +++++++++++++++++++++
core/pom.xml | 76 +++++++-
iterator-test-harness/pom.xml | 58 +++++-
maven-plugin/src/it/plugin-test/pom.xml | 58 +++++-
minicluster/pom.xml | 78 ++++++++-
pom.xml | 80 +++++++++
proxy/pom.xml | 56 +++++-
server/base/pom.xml | 56 +++++-
server/gc/pom.xml | 58 +++++-
server/master/pom.xml | 58 +++++-
server/monitor/pom.xml | 76 ++++++--
server/tracer/pom.xml | 56 +++++-
server/tserver/pom.xml | 58 +++++-
shell/pom.xml | 58 +++++-
start/pom.xml | 78 ++++++++-
test/pom.xml | 72 +++++++-
19 files changed, 1196 insertions(+), 84 deletions(-)
diff --cc assemble/pom.xml
index 9a9d94d,38f8339..9a0663b
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -468,5 -323,80 +468,80 @@@
</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</artifactList>
++
<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</artifactList>
++
<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</artifactList>
++
<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 --cc assemble/src/main/assemblies/component-hadoop3.xml
index 0000000,38755cc..e1dda0f
mode 000000,100644..100644
--- a/assemble/src/main/assemblies/component-hadoop3.xml
+++ b/assemble/src/main/assemblies/component-hadoop3.xml
@@@ -1,0 -1,283 +1,194 @@@
+ <?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>
- </includes>
- <excludes>
- <exclude>${groupId}:${artifactId}-docs</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>${artifactId}_user_manual.${artifact.extension}</outputFileNameMapping>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>${groupId}:${artifactId}-docs:html:user-manual</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>../examples/simple</directory>
- <outputDirectory>examples/simple</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>src/main/**</include>
- </includes>
- </fileSet>
- <fileSet>
+ <directory>./</directory>
+ <outputDirectory>lib/ext</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <directoryMode>0700</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../docs/src/main/resources</directory>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.html</include>
- <include>*.css</include>
- <include>examples/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../docs/target</directory>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>config.html</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
+ <directory>conf</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
+ </fileSet>
+ <fileSet>
- <!-- preserve old behavior of extra copy in conf -->
- <directory>conf/templates</directory>
++ <directory>target/example-configs</directory>
+ <outputDirectory>conf</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
- <includes>
- <include>accumulo.policy.example</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/example-configs</directory>
- <outputDirectory>conf/examples</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.sh</include>
- </includes>
+ </fileSet>
+ <fileSet>
- <directory>target/example-configs</directory>
- <outputDirectory>conf/examples</outputDirectory>
- <directoryMode>0755</directoryMode>
++ <directory>target</directory>
++ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
+ <includes>
- <include>**/*.sh</include>
- <include>**/*.py</include>
- <include>**/*.pl</include>
++ <include>accumulo-client.properties</include>
+ </includes>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/continuous-env.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/.*/**</exclude>
- <exclude>pom.xml</exclude>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.pyo</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/randomwalk/conf/logger.xml</exclude>
- <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
- <exclude>**/randomwalk/conf/walkers</exclude>
- </excludes>
+ </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>
- <outputDirectory>proxy/thrift</outputDirectory>
+ <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>README</include>
+ <include>proxy.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.py</include>
- <include>**/*.rb</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.py</exclude>
- <exclude>**/*.rb</exclude>
- </excludes>
- </fileSet>
- <fileSet>
+ <directory>../proxy/src/main/thrift</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
- <outputDirectory>proxy/thrift</outputDirectory>
++ <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 --cc core/pom.xml
index fe89b6b,ca5734d..1643cd6
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -88,10 -88,10 +88,6 @@@
<artifactId>commons-math3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
-- </dependency>
-- <dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</dependency>
diff --cc iterator-test-harness/pom.xml
index dd867d9,fe137ab..538d29c
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@@ -43,14 -43,59 +43,64 @@@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</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 --cc maven-plugin/src/it/plugin-test/pom.xml
index d55410d,9f16afa..e77cf28
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@@ -68,14 -76,6 +68,10 @@@
<artifactId>accumulo-minicluster</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
diff --cc minicluster/pom.xml
index 0947cc7,04153f3..4d4aa82
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@@ -92,19 -88,6 +92,10 @@@
<artifactId>commons-vfs2</artifactId>
</dependency>
<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>
- <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
diff --cc pom.xml
index 7845395,b8d2e6b..38b013c
--- a/pom.xml
+++ b/pom.xml
@@@ -126,17 -129,15 +126,18 @@@
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
<hadoop.version>2.6.4</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>
- <httpclient.version>3.1</httpclient.version>
+ <httpclient.version>4.3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
- <jetty.version>9.2.17.v20160517</jetty.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- <maven.plugin-version>3.0.5</maven.plugin-version>
+ <jackson.version>2.9.0</jackson.version>
+ <javax.el.version>2.2.4</javax.el.version>
+ <jersey.version>2.25.1</jersey.version>
+ <jetty.version>9.3.21.v20170918</jetty.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.plugin-version>3.2.5</maven.plugin-version>
<!-- surefire/failsafe plugin option -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<powermock.version>1.6.6</powermock.version>
@@@ -478,9 -437,14 +494,14 @@@
<version>${htrace.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core4</artifactId>
+ <version>${htrace.hadoop.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.1</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@@ -1154,9 -917,13 +1175,13 @@@
<checkSignatureRule
implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
+ <artifactId>java18</artifactId>
<version>1.0</version>
</signature>
+ <ignores>
+ <ignore>org.apache.hadoop.conf.Configuration</ignore>
+ <ignore>org.apache.hadoop.fs.FileSystem</ignore>
+ </ignores>
</checkSignatureRule>
</rules>
</configuration>
diff --cc proxy/pom.xml
index ff291f4,e1e8391..3998922
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -56,14 -60,6 +56,10 @@@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
diff --cc server/gc/pom.xml
index 2fc9154,05ab3fa..ff0367f
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@@ -57,14 -57,6 +57,10 @@@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
@@@ -86,10 -82,59 +82,64 @@@
<artifactId>easymock</artifactId>
<scope>test</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 --cc server/master/pom.xml
index 6204672,ecca2fc..d686b5b
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@@ -61,14 -61,6 +61,10 @@@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</dependency>
@@@ -94,10 -90,59 +90,64 @@@
<artifactId>easymock</artifactId>
<scope>test</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 --cc shell/pom.xml
index 10c96ed,3de9f99..8a0a25f
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -96,16 -96,8 +96,12 @@@
<artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --cc start/pom.xml
index 08f8ad1,917d8e3..d14879e
--- a/start/pom.xml
+++ b/start/pom.xml
@@@ -56,11 -52,16 +52,6 @@@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<scope>test</scope>
diff --cc test/pom.xml
index 81133b7,d9a271d..1c6dbbe
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -131,11 -140,11 +131,7 @@@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
els...@apache.org.
