accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [08/10] accumulo git commit: Merge branch '1.6' into 1.7
Date Thu, 10 Sep 2015 23:07:36 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/6861d7bb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6861d7bb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6861d7bb

Branch: refs/heads/1.7
Commit: 6861d7bba7adbc0cf86ee094892737262d3d0137
Parents: 10aba2a 8827e47
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Sep 10 19:05:37 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Sep 10 19:05:37 2015 -0400

----------------------------------------------------------------------
 NOTICE                  | 2 +-
 assemble/pom.xml        | 2 +-
 core/pom.xml            | 2 +-
 docs/pom.xml            | 2 +-
 examples/simple/pom.xml | 2 +-
 fate/pom.xml            | 2 +-
 maven-plugin/pom.xml    | 2 +-
 minicluster/pom.xml     | 2 +-
 pom.xml                 | 8 +++++---
 proxy/pom.xml           | 2 +-
 server/base/pom.xml     | 2 +-
 server/gc/pom.xml       | 2 +-
 server/master/pom.xml   | 2 +-
 server/monitor/pom.xml  | 2 +-
 server/native/pom.xml   | 2 +-
 server/tracer/pom.xml   | 2 +-
 server/tserver/pom.xml  | 2 +-
 shell/pom.xml           | 2 +-
 start/pom.xml           | 2 +-
 test/pom.xml            | 2 +-
 trace/pom.xml           | 2 +-
 21 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/NOTICE
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index 46ec7f4,cd5a379..a56a909
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-core</artifactId>
-   <name>Core</name>
+   <name>Apache Accumulo Core</name>
    <description>Apache Accumulo core libraries.</description>
    <dependencies>
      <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/docs/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/fate/pom.xml
----------------------------------------------------------------------
diff --cc fate/pom.xml
index b794a56,5929a3d..489bc07
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-fate</artifactId>
-   <name>Fate</name>
+   <name>Apache Accumulo Fate</name>
    <description>A FAult-Tolerant Executor library used by Apache Accumulo.</description>
    <dependencies>
      <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/maven-plugin/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/minicluster/pom.xml
----------------------------------------------------------------------
diff --cc minicluster/pom.xml
index 7bb4b0a,8cdccef..4aa05c5
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-minicluster</artifactId>
-   <name>MiniCluster</name>
+   <name>Apache Accumulo MiniCluster</name>
    <description>A library for launching and running a standalone instance of Apache
Accumulo for testing.</description>
    <dependencies>
      <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3477bff,13c7a16..8b0c656
--- a/pom.xml
+++ b/pom.xml
@@@ -24,9 -24,9 +24,9 @@@
    </parent>
    <groupId>org.apache.accumulo</groupId>
    <artifactId>accumulo-project</artifactId>
 -  <version>1.6.4-SNAPSHOT</version>
 +  <version>1.7.1-SNAPSHOT</version>
    <packaging>pom</packaging>
-   <name>Apache Accumulo</name>
+   <name>Apache Accumulo Project</name>
    <description>Apache Accumulo is a sorted, distributed key/value store based on Google's
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a
few novel improvements on the BigTable design in the form of cell-level access labels and
a server-side programming mechanism that can modify key/value pairs at various points in the
data management process.</description>
    <!-- this URL is where the site derived via the maven-site-plugin ends up, not the
generic site -->
    <url>http://accumulo.apache.org/maven-site/</url>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index 1b3f122,1ffd560..5a4c882
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-proxy</artifactId>
-   <name>Proxy</name>
+   <name>Apache Accumulo Proxy</name>
    <description>A server for Apache Accumulo that proxies connections from any language
supported by Apache Thrift.</description>
    <dependencies>
      <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/gc/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/master/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/native/pom.xml
----------------------------------------------------------------------
diff --cc server/native/pom.xml
index a71a6b5,2e534c1..f17ecdb
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@@ -25,11 -25,8 +25,11 @@@
    </parent>
    <artifactId>accumulo-native</artifactId>
    <packaging>pom</packaging>
-   <name>Native Libraries</name>
+   <name>Apache Accumulo Native Libraries</name>
    <description>C++ native libraries for improved performance in Apache Accumulo.</description>
 +  <properties>
 +    <CXX>g++</CXX>
 +  </properties>
    <dependencies>
      <dependency>
        <groupId>org.apache.accumulo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/tracer/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/shell/pom.xml
----------------------------------------------------------------------
diff --cc shell/pom.xml
index be97e5b,0000000..782afa1
mode 100644,000000..100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -1,128 -1,0 +1,128 @@@
 +<?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.
 +-->
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +  <modelVersion>4.0.0</modelVersion>
 +  <parent>
 +    <groupId>org.apache.accumulo</groupId>
 +    <artifactId>accumulo-project</artifactId>
 +    <version>1.7.1-SNAPSHOT</version>
 +  </parent>
 +  <artifactId>accumulo-shell</artifactId>
-   <name>Shell</name>
++  <name>Apache Accumulo Shell</name>
 +  <description>An interactive shell for accessing Apache Accumulo via a command line
interface.</description>
 +  <dependencies>
 +    <dependency>
 +      <groupId>com.beust</groupId>
 +      <artifactId>jcommander</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.auto.service</groupId>
 +      <artifactId>auto-service</artifactId>
 +      <optional>true</optional>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.guava</groupId>
 +      <artifactId>guava</artifactId>
 +    </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>jline</groupId>
 +      <artifactId>jline</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-core</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-fate</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-start</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-tracer</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <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>
 +    </dependency>
 +    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.easymock</groupId>
 +      <artifactId>easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-api-easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-core</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-module-junit4</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +  </dependencies>
 +</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/start/pom.xml
----------------------------------------------------------------------
diff --cc start/pom.xml
index c19fd7c,4dc0bcd..d72f7f5
--- a/start/pom.xml
+++ b/start/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-start</artifactId>
-   <name>Start</name>
+   <name>Apache Accumulo Start</name>
    <description>A library for launching Apache Accumulo services.</description>
    <dependencies>
      <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index 295fa74,89dbafd..6723559
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-test</artifactId>
-   <name>Testing</name>
+   <name>Apache Accumulo Testing</name>
    <description>Tests for Apache Accumulo.</description>
    <properties>
      <timeout.factor>1</timeout.factor>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6861d7bb/trace/pom.xml
----------------------------------------------------------------------
diff --cc trace/pom.xml
index 93f342f,b4316a5..d642e98
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@@ -20,10 -20,10 +20,10 @@@
    <parent>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-project</artifactId>
 -    <version>1.6.4-SNAPSHOT</version>
 +    <version>1.7.1-SNAPSHOT</version>
    </parent>
    <artifactId>accumulo-trace</artifactId>
-   <name>Trace</name>
+   <name>Apache Accumulo Trace</name>
    <description>A distributed tracing library for Apache Accumulo.</description>
    <dependencies>
      <dependency>


Mime
View raw message