You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/01/22 18:58:10 UTC
[04/12] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
assemble/build.sh
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5401db1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5401db1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5401db1
Branch: refs/heads/1.7
Commit: e5401db1ce74d69f126519e57331b50f968b9422
Parents: 0720515 34bd263
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jan 22 12:20:42 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jan 22 12:20:42 2016 -0500
----------------------------------------------------------------------
assemble/build.sh | 276 +++++++++++++++++++++++++++++++++++++------------
pom.xml | 4 +-
2 files changed, 213 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5401db1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3fc5d96,3238007..cf1f172
--- a/pom.xml
+++ b/pom.xml
@@@ -123,17 -122,17 +123,19 @@@
<bouncycastle.version>1.50</bouncycastle.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
<eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
+ <!-- extra release args for testing -->
+ <extraReleaseArgs />
<!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer -->
- <findbugs.version>2.5.5</findbugs.version>
+ <findbugs.version>3.0.1</findbugs.version>
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
- <!-- overwritten in profiles hadoop-1 or hadoop-2 -->
+ <!-- overwritten in hadoop profiles -->
<hadoop.version>2.2.0</hadoop.version>
+ <htrace.version>3.1.0-incubating</htrace.version>
<httpclient.version>3.1</httpclient.version>
- <java.ver>1.6</java.ver>
- <jetty.version>8.1.15.v20140411</jetty.version>
+ <jetty.version>9.1.5.v20140505</jetty.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
<!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
<maven.min-version>3.0.4</maven.min-version>
<!-- surefire/failsafe plugin option -->
@@@ -649,8 -620,10 +651,8 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <!-- Work around MRELEASE-812 -->
- <version>2.5</version>
<configuration>
- <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
- <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
++ <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>