Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ctubbsii@apache.org
To: commits@accumulo.apache.org
Date: Thu, 23 Jun 2016 23:59:25 -0000
Message-Id: <403eba2685dc439cac04b566da944bbc@git.apache.org>
In-Reply-To: <fc393b6939f14238b12cdcbfe61c18d0@git.apache.org>
References: <fc393b6939f14238b12cdcbfe61c18d0@git.apache.org>
Subject: [14/14] accumulo git commit: Merge branch '1.8'
archived-at: Thu, 23 Jun 2016 23:59:14 -0000

Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97fdfc59
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97fdfc59
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97fdfc59

Branch: refs/heads/master
Commit: 97fdfc5912ce07615b9e85899675adc3d1b12578
Parents: 56af3a2 5660464
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jun 23 19:58:48 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jun 23 19:58:48 2016 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE                            | 263 ++++++++++++-------
 assemble/bin-NOTICE                             |  53 +---
 assemble/pom.xml                                |   2 +-
 assemble/src/main/assemblies/component.xml      |   2 +-
 core/pom.xml                                    |   2 +-
 .../accumulo/core/file/rfile/PrintInfo.java     |   2 +-
 .../apache/accumulo/core/file/rfile/RFile.java  |   2 +-
 .../org/apache/accumulo/core/util/Stat.java     |  12 +-
 .../accumulo/fate/zookeeper/ZooCacheTest.java   |   5 +-
 pom.xml                                         |  75 ++----
 test/pom.xml                                    |  43 +--
 .../test/randomwalk/concurrent/Config.java      |  11 +-
 .../test/randomwalk/conditional/Transfer.java   |   6 +-
 13 files changed, 215 insertions(+), 263 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/97fdfc59/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/97fdfc59/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/97fdfc59/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a19ab8e,467bd2b..f3130c0
--- a/pom.xml
+++ b/pom.xml
@@@ -137,9 -137,10 +136,10 @@@
      <htrace.version>3.1.0-incubating</htrace.version>
      <httpclient.version>3.1</httpclient.version>
      <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
-     <jetty.version>9.1.5.v20140505</jetty.version>
+     <!-- 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.compiler.source>1.8</maven.compiler.source>
 +    <maven.compiler.target>1.8</maven.compiler.target>
      <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
      <maven.min-version>3.0.5</maven.min-version>
      <!-- surefire/failsafe plugin option -->
@@@ -1363,43 -1312,29 +1360,7 @@@
          <it.test>ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT</it.test>
        </properties>
      </profile>
-     <!-- profile for our default Hadoop build
-          unfortunately, has to duplicate one of our
-          specified profiles. see MNG-3328 -->
-     <profile>
-       <id>hadoop-default</id>
-       <activation>
-         <property>
-           <name>!hadoop.profile</name>
-         </property>
-       </activation>
-       <properties>
-         <!-- Denotes intention and allows the enforcer plugin to pass when
-              the user is relying on default behavior; won't work to activate profile -->
-         <hadoop.profile>2</hadoop.profile>
-         <hadoop.version>2.2.0</hadoop.version>
-         <httpclient.version>3.1</httpclient.version>
-         <slf4j.version>1.7.5</slf4j.version>
-       </properties>
-     </profile>
-     <!-- profile for building against Hadoop 2.x
-      XXX Since this is the default, make sure to sync hadoop-default when changing.
-     Activate using: mvn -Dhadoop.profile=2 -->
-     <profile>
-       <id>hadoop-2</id>
-       <activation>
-         <property>
-           <name>hadoop.profile</name>
-           <value>2</value>
-         </property>
-       </activation>
-       <properties>
-         <hadoop.version>2.2.0</hadoop.version>
-         <httpclient.version>3.1</httpclient.version>
-         <slf4j.version>1.7.5</slf4j.version>
-       </properties>
-     </profile>
      <profile>
 -      <id>jdk8</id>
 -      <activation>
 -        <jdk>[1.8,1.9)</jdk>
 -      </activation>
 -      <build>
 -        <pluginManagement>
 -          <plugins>
 -            <plugin>
 -              <groupId>org.apache.maven.plugins</groupId>
 -              <artifactId>maven-javadoc-plugin</artifactId>
 -              <configuration>
 -                <quiet>true</quiet>
 -                <javadocVersion>1.8</javadocVersion>
 -                <additionalJOption>-J-Xmx512m</additionalJOption>
 -                <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam>
 -              </configuration>
 -            </plugin>
 -          </plugins>
 -        </pluginManagement>
 -      </build>
 -    </profile>
 -    <profile>
        <id>performanceTests</id>
        <build>
          <pluginManagement>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/97fdfc59/test/pom.xml
----------------------------------------------------------------------