accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [10/10] accumulo git commit: Merge branch '1.8'
Date Fri, 27 May 2016 02:38:24 GMT
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/a15ff128
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a15ff128
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a15ff128

Branch: refs/heads/master
Commit: a15ff128b45c7d952967a2d4bef46e893c280073
Parents: 355d4e7 fd37134
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu May 26 22:37:55 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu May 26 22:37:55 2016 -0400

----------------------------------------------------------------------
 assemble/pom.xml                                |   2 -
 .../org/apache/accumulo/plugin/PluginIT.java    | 136 -------------
 .../org/apache/accumulo/plugin/it/PluginIT.java | 137 +++++++++++++
 pom.xml                                         | 191 ++++---------------
 server/native/pom.xml                           |   1 -
 test/pom.xml                                    |   2 +
 6 files changed, 177 insertions(+), 292 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a15ff128/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 066d4bb,f783731..d74eebc
--- a/pom.xml
+++ b/pom.xml
@@@ -24,12 -24,18 +24,18 @@@
    </parent>
    <groupId>org.apache.accumulo</groupId>
    <artifactId>accumulo-project</artifactId>
 -  <version>1.8.0-SNAPSHOT</version>
 +  <version>2.0.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <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>
+   <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; currently not used -->
+   <url>https://accumulo.apache.org</url>
    <!-- this is the year of inception at ASF -->
    <inceptionYear>2011</inceptionYear>
    <organization>
@@@ -728,10 -682,7 +717,9 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-javadoc-plugin</artifactId>
 +          <!-- overridden version from ASF-17 parent pom -->
 +          <version>2.10.3</version>
            <configuration>
-             <encoding>${project.reporting.outputEncoding}</encoding>
              <quiet>true</quiet>
              <javadocVersion>${maven.compiler.target}</javadocVersion>
              <additionalJOption>-J-Xmx512m</additionalJOption>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a15ff128/server/native/pom.xml
----------------------------------------------------------------------

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


Mime
View raw message