accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/6] accumulo git commit: Merge branch '1.6' into 1.7
Date Wed, 03 Feb 2016 19:08:16 GMT
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: 301d91b4047c152006f6feeb42c31b3d9db66a57
Parents: b639709 fbd2faf
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 3 14:07:32 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 3 14:07:32 2016 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/301d91b4/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index bc2a909,8712b78..7138c2f
--- a/pom.xml
+++ b/pom.xml
@@@ -126,18 -125,16 +126,18 @@@
      <!-- 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.3</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>
+     <maven.min-version>3.0.5</maven.min-version>
      <!-- surefire/failsafe plugin option -->
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
      <powermock.version>1.5</powermock.version>


Mime
View raw message