You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2013/12/28 01:05:13 UTC
[01/18] git commit: ACCUMULO-1796 Document supported Hadoop for
binary distro
Updated Branches:
refs/heads/1.4.5-SNAPSHOT fc7a0a336 -> ed9811c82
refs/heads/1.5.1-SNAPSHOT 0c1ea722a -> 17f4de1b4
refs/heads/1.6.0-SNAPSHOT 4aa48e1cb -> bea6e9417
refs/heads/master a0c2be084 -> ce8a568a6
ACCUMULO-1796 Document supported Hadoop for binary distro
Signed-off-by: Mike Drob <md...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/79266cba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/79266cba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/79266cba
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 79266cba135cf81f6241705746481795b2820cd4
Parents: 975e8c0
Author: Bill Havanki <bh...@cloudera.com>
Authored: Fri Dec 6 12:08:49 2013 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 12:28:11 2013 -0800
----------------------------------------------------------------------
README | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/79266cba/README
----------------------------------------------------------------------
diff --git a/README b/README
index a70d62b..08bac4c 100644
--- a/README
+++ b/README
@@ -11,14 +11,16 @@ key/value pairs at various points in the data management process.
1. Building
In the normal tarball or RPM release of accumulo, everything is built and
-ready to go on x86 GNU/Linux: there is no build step.
+ready to go on x86 GNU/Linux for Hadoop 0.20.x and Hadoop 1.x: there is no
+build step.
-However, if you only have source code, or you wish to make changes, you need to
-have maven configured to get Accumulo prerequisites from repositories. See
-the pom.xml file for the necessary components.
+However, if you only have source code, or you wish to make changes, or you
+wish to run under a different version of Hadoop, you need to have Maven
+configured to get Accumulo prerequisites from repositories. See the pom.xml
+file for the necessary components.
-Run "mvn package && mvn assembly:single -N". By default,
-Accumulo compiles against Hadoop 0.20.203.0. To compile against a different version
+Run "mvn package && mvn assembly:single -N". By default, Accumulo compiles
+against Hadoop 0.20.203.0. To compile against a different version
that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". To compile
against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses
@@ -74,8 +76,9 @@ found in the same location on every machine in the cluster. You will need to
have password-less ssh set up as described in the hadoop documentation.
You will need to have hadoop installed and configured on your system.
-Accumulo 1.4.5-SNAPSHOT has been tested with hadoop version 0.20.2 and
-0.20.203.0.
+As a part of our release process, Accumulo is tested on a variety of Hadoop
+versions. For specific details about tested configurations, please see the
+release notes for this version of Accumulo.
Additionally, it is strongly recommended that you enable 'dfs.datanode.synconclose'
(only available in Apache Hadoop >=1.1.1 or >=0.23) in your hdfs-site.xml configuration
[16/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bea6e941
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bea6e941
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bea6e941
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: bea6e94176188f9c14daacf9c5b7cc1678da39cb
Parents: 4aa48e1 17f4de1
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:04:02 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:04:02 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bea6e941/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2681508,4d223d9..3aa1892
--- a/pom.xml
+++ b/pom.xml
@@@ -136,9 -126,14 +136,14 @@@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <version>1.30</version>
+ <version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
[17/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bea6e941
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bea6e941
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bea6e941
Branch: refs/heads/master
Commit: bea6e94176188f9c14daacf9c5b7cc1678da39cb
Parents: 4aa48e1 17f4de1
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:04:02 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:04:02 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bea6e941/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2681508,4d223d9..3aa1892
--- a/pom.xml
+++ b/pom.xml
@@@ -136,9 -126,14 +136,14 @@@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <version>1.30</version>
+ <version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
[10/18] git commit: ACCUMULO-2064 switch to mavanagaiata for sha
Posted by md...@apache.org.
ACCUMULO-2064 switch to mavanagaiata for sha
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed9811c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed9811c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed9811c8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ed9811c82f9e5d03c5bfcbaa9c720cdaa0384977
Parents: fc7a0a3
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 15:18:57 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 15:35:32 2013 -0800
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed9811c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20916c7..bd913b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <executions>
+ <execution>
+ <id>git-commit</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>commit</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -125,8 +138,7 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
</manifestEntries>
</archive>
<includes>
@@ -878,6 +890,13 @@
<artifactId>commons-jci-fam</artifactId>
<version>1.0</version>
</dependency>
+
+ <!-- Version management -->
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[11/18] git commit: ACCUMULO-2064 switch to mavanagaiata for sha
Posted by md...@apache.org.
ACCUMULO-2064 switch to mavanagaiata for sha
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed9811c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed9811c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed9811c8
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: ed9811c82f9e5d03c5bfcbaa9c720cdaa0384977
Parents: fc7a0a3
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 15:18:57 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 15:35:32 2013 -0800
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed9811c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20916c7..bd913b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <executions>
+ <execution>
+ <id>git-commit</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>commit</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -125,8 +138,7 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
</manifestEntries>
</archive>
<includes>
@@ -878,6 +890,13 @@
<artifactId>commons-jci-fam</artifactId>
<version>1.0</version>
</dependency>
+
+ <!-- Version management -->
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[18/18] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by md...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ce8a568a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ce8a568a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ce8a568a
Branch: refs/heads/master
Commit: ce8a568a637c8fe771990325b3830480ac386eea
Parents: a0c2be0 bea6e94
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:04:35 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:04:35 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce8a568a/pom.xml
----------------------------------------------------------------------
[05/18] git commit: ACCUMULO-2108 set dependency management version
for submodules via maven project version.
Posted by md...@apache.org.
ACCUMULO-2108 set dependency management version for submodules via maven project version.
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc7a0a33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc7a0a33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc7a0a33
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: fc7a0a336a8e2623fb7eca1f01ab8a63cdc24967
Parents: 79266cb
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Fri Dec 27 16:51:32 2013 -0600
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 27 17:59:30 2013 -0500
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc7a0a33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc0222e..20916c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -778,27 +778,27 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- additional dependencies we need to provide -->
[07/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c1ea722
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c1ea722
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c1ea722
Branch: refs/heads/master
Commit: 0c1ea722afe36c2acd22bf517666e320d6d7284b
Parents: b315fe2 fc7a0a3
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 27 18:02:10 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 27 18:02:10 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/18] git commit: ACCUMULO-2064 switch to mavanagaiata for sha
Posted by md...@apache.org.
ACCUMULO-2064 switch to mavanagaiata for sha
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed9811c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed9811c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed9811c8
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: ed9811c82f9e5d03c5bfcbaa9c720cdaa0384977
Parents: fc7a0a3
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 15:18:57 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 15:35:32 2013 -0800
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed9811c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20916c7..bd913b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <executions>
+ <execution>
+ <id>git-commit</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>commit</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -125,8 +138,7 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
</manifestEntries>
</archive>
<includes>
@@ -878,6 +890,13 @@
<artifactId>commons-jci-fam</artifactId>
<version>1.0</version>
</dependency>
+
+ <!-- Version management -->
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[02/18] git commit: ACCUMULO-1796 Document supported Hadoop for
binary distro
Posted by md...@apache.org.
ACCUMULO-1796 Document supported Hadoop for binary distro
Signed-off-by: Mike Drob <md...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/79266cba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/79266cba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/79266cba
Branch: refs/heads/master
Commit: 79266cba135cf81f6241705746481795b2820cd4
Parents: 975e8c0
Author: Bill Havanki <bh...@cloudera.com>
Authored: Fri Dec 6 12:08:49 2013 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 12:28:11 2013 -0800
----------------------------------------------------------------------
README | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/79266cba/README
----------------------------------------------------------------------
diff --git a/README b/README
index a70d62b..08bac4c 100644
--- a/README
+++ b/README
@@ -11,14 +11,16 @@ key/value pairs at various points in the data management process.
1. Building
In the normal tarball or RPM release of accumulo, everything is built and
-ready to go on x86 GNU/Linux: there is no build step.
+ready to go on x86 GNU/Linux for Hadoop 0.20.x and Hadoop 1.x: there is no
+build step.
-However, if you only have source code, or you wish to make changes, you need to
-have maven configured to get Accumulo prerequisites from repositories. See
-the pom.xml file for the necessary components.
+However, if you only have source code, or you wish to make changes, or you
+wish to run under a different version of Hadoop, you need to have Maven
+configured to get Accumulo prerequisites from repositories. See the pom.xml
+file for the necessary components.
-Run "mvn package && mvn assembly:single -N". By default,
-Accumulo compiles against Hadoop 0.20.203.0. To compile against a different version
+Run "mvn package && mvn assembly:single -N". By default, Accumulo compiles
+against Hadoop 0.20.203.0. To compile against a different version
that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". To compile
against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses
@@ -74,8 +76,9 @@ found in the same location on every machine in the cluster. You will need to
have password-less ssh set up as described in the hadoop documentation.
You will need to have hadoop installed and configured on your system.
-Accumulo 1.4.5-SNAPSHOT has been tested with hadoop version 0.20.2 and
-0.20.203.0.
+As a part of our release process, Accumulo is tested on a variety of Hadoop
+versions. For specific details about tested configurations, please see the
+release notes for this version of Accumulo.
Additionally, it is strongly recommended that you enable 'dfs.datanode.synconclose'
(only available in Apache Hadoop >=1.1.1 or >=0.23) in your hdfs-site.xml configuration
[04/18] git commit: Merge branch 1.4.5-SNAP into 1.5.1-SNAP (-sours)
Posted by md...@apache.org.
Merge branch 1.4.5-SNAP into 1.5.1-SNAP (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b315fe2d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b315fe2d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b315fe2d
Branch: refs/heads/master
Commit: b315fe2d4b51acb68d077d4b1f0128163dfd691f
Parents: 7449524 79266cb
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 12:34:43 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 12:34:43 2013 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c1ea722
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c1ea722
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c1ea722
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0c1ea722afe36c2acd22bf517666e320d6d7284b
Parents: b315fe2 fc7a0a3
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 27 18:02:10 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 27 18:02:10 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/18] git commit: ACCUMULO-2108 set dependency management version
for submodules via maven project version.
Posted by md...@apache.org.
ACCUMULO-2108 set dependency management version for submodules via maven project version.
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc7a0a33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc7a0a33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc7a0a33
Branch: refs/heads/master
Commit: fc7a0a336a8e2623fb7eca1f01ab8a63cdc24967
Parents: 79266cb
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Fri Dec 27 16:51:32 2013 -0600
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 27 17:59:30 2013 -0500
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc7a0a33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc0222e..20916c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -778,27 +778,27 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>1.4.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- additional dependencies we need to provide -->
[13/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17f4de1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17f4de1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17f4de1b
Branch: refs/heads/master
Commit: 17f4de1b4deaacd56fc912e703959c119747ee39
Parents: 0c1ea72 ed9811c
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:02:56 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:02:56 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17f4de1b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cfb2a5c,bd913b8..4d223d9
--- a/pom.xml
+++ b/pom.xml
@@@ -20,483 -21,313 +20,489 @@@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
-
-
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <version>1.4.5-SNAPSHOT</version>
- <name>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>
+ <organization>
+ <name>Apache Accumulo Project</name>
+ <url>http://accumulo.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>User</name>
+ <subscribe>user-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>user@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>dev-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>dev@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>commits-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Notifications</name>
+ <subscribe>notifications-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive>
+ </mailingList>
+ </mailingLists>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<modules>
- <module>src/trace</module>
- <module>src/core</module>
- <module>src/server</module>
- <module>src/start</module>
- <module>src/examples</module>
- <module>src/proxy</module>
- <module>src/minicluster</module>
+ <module>trace</module>
+ <module>core</module>
+ <module>fate</module>
+ <module>server</module>
+ <module>start</module>
+ <module>examples</module>
+ <module>assemble</module>
+ <module>proxy</module>
+ <module>test</module>
+ <module>minicluster</module>
</modules>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-mvn</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
+ <scm>
+ <connection>scm:git:git://git.apache.org/accumulo.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Apache Jenkins</system>
+ <url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
+ </ciManagement>
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <!-- this is not likely to be what we really want, but it's good enough for a test -->
+ <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <!-- used for filtering the java source with the current version -->
+ <accumulo.release.version>${project.version}</accumulo.release.version>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <hadoop.version>1.2.1</hadoop.version>
+ <httpclient.version>3.0.1</httpclient.version>
+ <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
+ <maven.min-version>3.0.4</maven.min-version>
+ <powermock.version>1.5</powermock.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sealJars>false</sealJars>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <slf4j.version>1.4.3</slf4j.version>
+ <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. -->
+ <zookeeper.version>3.3.6</zookeeper.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.30</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
- <executions>
- <execution>
- <id>git-commit</id>
- <phase>validate</phase>
- <goals>
- <goal>commit</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
- </manifestEntries>
- </archive>
- <includes>
- <include>cloudtrace/**</include>
- <include>org/apache/accumulo**/**</include>
- <include>web/**</include>
- <include>randomwalk/**</include>
- <include>*.*</include>
- <include>**/META-INF/*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/dist.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <jarOutputDirectory>lib</jarOutputDirectory>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>1.6</javadocVersion>
- <additionalJOption>-J-Xmx512m</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <ACCUMULO_HOME>../..</ACCUMULO_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-3</version>
- <inherited>false</inherited>
- <configuration>
- <name>accumulo</name>
- <projversion>${project.version}</projversion>
- <summary>Apache Accumulo BigTable clone</summary>
- <description>
- Apache Accumulo is a large distributed structured store based on
- Google's BigTable design.
- </description>
- <copyright>2011 The Apache Software Foundation.</copyright>
- <url>http://accumulo.apache.org</url>
- <needarch>x86_64</needarch>
- <group>Utilities</group>
- <requires>
- <require>jdk</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
- <prefix>/opt/accumulo</prefix>
- <defaultDirmode>755</defaultDirmode>
- <defaultFilemode>644</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>docs</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>test</location>
- <excludes>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**/*.pyc</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>bin</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <sources>
- <source>
- <location>conf</location>
- <excludes>
- <exclude>**/accumulo-site.xml</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/masters</exclude>
- <exclude>**/tracers</exclude>
- <exclude>**/gc</exclude>
- <exclude>**/monitor</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <dependency />
- <sources>
- <source>
- <location>lib</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>false</inherited>
++ <version>0.6.1</version>
++ </dependency>
++ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>1.2</version>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>docs/src/user_manual/build.sh</argument>
- </arguments>
- </configuration>
- <executions>
- <execution>
- <id>user-manual</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-tools</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>${sealJars}</Sealed>
++ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <tagNameFormat>@{project.version}-RC</tagNameFormat>
+ <releaseProfiles>seal-jars</releaseProfiles>
+ <useReleaseProfile>false</useReleaseProfile>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>docs/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
@@@ -605,104 -402,8 +611,117 @@@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-sorted-pom</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeClassifiers>sources,test-sources</excludeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${maven.min-version},)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
++ <groupId>com.github.koraktor</groupId>
++ <artifactId>mavanagaiata</artifactId>
++ <executions>
++ <execution>
++ <id>git-commit</id>
++ <goals>
++ <goal>commit</goal>
++ </goals>
++ <phase>validate</phase>
++ </execution>
++ </executions>
++ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ <execution>
+ <id>verify-integration-tests</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <!-- enable ssh deployment of site with maven 3 -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.4</version>
+ </extension>
+ </extensions>
</build>
-
<reporting>
<plugins>
<plugin>
[14/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17f4de1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17f4de1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17f4de1b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 17f4de1b4deaacd56fc912e703959c119747ee39
Parents: 0c1ea72 ed9811c
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:02:56 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:02:56 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17f4de1b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cfb2a5c,bd913b8..4d223d9
--- a/pom.xml
+++ b/pom.xml
@@@ -20,483 -21,313 +20,489 @@@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
-
-
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <version>1.4.5-SNAPSHOT</version>
- <name>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>
+ <organization>
+ <name>Apache Accumulo Project</name>
+ <url>http://accumulo.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>User</name>
+ <subscribe>user-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>user@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>dev-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>dev@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>commits-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Notifications</name>
+ <subscribe>notifications-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive>
+ </mailingList>
+ </mailingLists>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<modules>
- <module>src/trace</module>
- <module>src/core</module>
- <module>src/server</module>
- <module>src/start</module>
- <module>src/examples</module>
- <module>src/proxy</module>
- <module>src/minicluster</module>
+ <module>trace</module>
+ <module>core</module>
+ <module>fate</module>
+ <module>server</module>
+ <module>start</module>
+ <module>examples</module>
+ <module>assemble</module>
+ <module>proxy</module>
+ <module>test</module>
+ <module>minicluster</module>
</modules>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-mvn</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
+ <scm>
+ <connection>scm:git:git://git.apache.org/accumulo.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Apache Jenkins</system>
+ <url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
+ </ciManagement>
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <!-- this is not likely to be what we really want, but it's good enough for a test -->
+ <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <!-- used for filtering the java source with the current version -->
+ <accumulo.release.version>${project.version}</accumulo.release.version>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <hadoop.version>1.2.1</hadoop.version>
+ <httpclient.version>3.0.1</httpclient.version>
+ <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
+ <maven.min-version>3.0.4</maven.min-version>
+ <powermock.version>1.5</powermock.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sealJars>false</sealJars>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <slf4j.version>1.4.3</slf4j.version>
+ <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. -->
+ <zookeeper.version>3.3.6</zookeeper.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.30</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
- <executions>
- <execution>
- <id>git-commit</id>
- <phase>validate</phase>
- <goals>
- <goal>commit</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
- </manifestEntries>
- </archive>
- <includes>
- <include>cloudtrace/**</include>
- <include>org/apache/accumulo**/**</include>
- <include>web/**</include>
- <include>randomwalk/**</include>
- <include>*.*</include>
- <include>**/META-INF/*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/dist.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <jarOutputDirectory>lib</jarOutputDirectory>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>1.6</javadocVersion>
- <additionalJOption>-J-Xmx512m</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <ACCUMULO_HOME>../..</ACCUMULO_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-3</version>
- <inherited>false</inherited>
- <configuration>
- <name>accumulo</name>
- <projversion>${project.version}</projversion>
- <summary>Apache Accumulo BigTable clone</summary>
- <description>
- Apache Accumulo is a large distributed structured store based on
- Google's BigTable design.
- </description>
- <copyright>2011 The Apache Software Foundation.</copyright>
- <url>http://accumulo.apache.org</url>
- <needarch>x86_64</needarch>
- <group>Utilities</group>
- <requires>
- <require>jdk</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
- <prefix>/opt/accumulo</prefix>
- <defaultDirmode>755</defaultDirmode>
- <defaultFilemode>644</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>docs</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>test</location>
- <excludes>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**/*.pyc</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>bin</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <sources>
- <source>
- <location>conf</location>
- <excludes>
- <exclude>**/accumulo-site.xml</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/masters</exclude>
- <exclude>**/tracers</exclude>
- <exclude>**/gc</exclude>
- <exclude>**/monitor</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <dependency />
- <sources>
- <source>
- <location>lib</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>false</inherited>
++ <version>0.6.1</version>
++ </dependency>
++ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>1.2</version>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>docs/src/user_manual/build.sh</argument>
- </arguments>
- </configuration>
- <executions>
- <execution>
- <id>user-manual</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-tools</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>${sealJars}</Sealed>
++ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <tagNameFormat>@{project.version}-RC</tagNameFormat>
+ <releaseProfiles>seal-jars</releaseProfiles>
+ <useReleaseProfile>false</useReleaseProfile>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>docs/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
@@@ -605,104 -402,8 +611,117 @@@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-sorted-pom</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeClassifiers>sources,test-sources</excludeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${maven.min-version},)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
++ <groupId>com.github.koraktor</groupId>
++ <artifactId>mavanagaiata</artifactId>
++ <executions>
++ <execution>
++ <id>git-commit</id>
++ <goals>
++ <goal>commit</goal>
++ </goals>
++ <phase>validate</phase>
++ </execution>
++ </executions>
++ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ <execution>
+ <id>verify-integration-tests</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <!-- enable ssh deployment of site with maven 3 -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.4</version>
+ </extension>
+ </extensions>
</build>
-
<reporting>
<plugins>
<plugin>
[15/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17f4de1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17f4de1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17f4de1b
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 17f4de1b4deaacd56fc912e703959c119747ee39
Parents: 0c1ea72 ed9811c
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:02:56 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:02:56 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17f4de1b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cfb2a5c,bd913b8..4d223d9
--- a/pom.xml
+++ b/pom.xml
@@@ -20,483 -21,313 +20,489 @@@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
-
-
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <version>1.4.5-SNAPSHOT</version>
- <name>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>
+ <organization>
+ <name>Apache Accumulo Project</name>
+ <url>http://accumulo.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>User</name>
+ <subscribe>user-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>user@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>dev-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>dev@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>commits-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Notifications</name>
+ <subscribe>notifications-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive>
+ </mailingList>
+ </mailingLists>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<modules>
- <module>src/trace</module>
- <module>src/core</module>
- <module>src/server</module>
- <module>src/start</module>
- <module>src/examples</module>
- <module>src/proxy</module>
- <module>src/minicluster</module>
+ <module>trace</module>
+ <module>core</module>
+ <module>fate</module>
+ <module>server</module>
+ <module>start</module>
+ <module>examples</module>
+ <module>assemble</module>
+ <module>proxy</module>
+ <module>test</module>
+ <module>minicluster</module>
</modules>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-mvn</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
+ <scm>
+ <connection>scm:git:git://git.apache.org/accumulo.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Apache Jenkins</system>
+ <url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
+ </ciManagement>
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <!-- this is not likely to be what we really want, but it's good enough for a test -->
+ <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <!-- used for filtering the java source with the current version -->
+ <accumulo.release.version>${project.version}</accumulo.release.version>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <hadoop.version>1.2.1</hadoop.version>
+ <httpclient.version>3.0.1</httpclient.version>
+ <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
+ <maven.min-version>3.0.4</maven.min-version>
+ <powermock.version>1.5</powermock.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sealJars>false</sealJars>
+ <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+ <slf4j.version>1.4.3</slf4j.version>
+ <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. -->
+ <zookeeper.version>3.3.6</zookeeper.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.30</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
- <executions>
- <execution>
- <id>git-commit</id>
- <phase>validate</phase>
- <goals>
- <goal>commit</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
- </manifestEntries>
- </archive>
- <includes>
- <include>cloudtrace/**</include>
- <include>org/apache/accumulo**/**</include>
- <include>web/**</include>
- <include>randomwalk/**</include>
- <include>*.*</include>
- <include>**/META-INF/*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/dist.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <jarOutputDirectory>lib</jarOutputDirectory>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>1.6</javadocVersion>
- <additionalJOption>-J-Xmx512m</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <ACCUMULO_HOME>../..</ACCUMULO_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-3</version>
- <inherited>false</inherited>
- <configuration>
- <name>accumulo</name>
- <projversion>${project.version}</projversion>
- <summary>Apache Accumulo BigTable clone</summary>
- <description>
- Apache Accumulo is a large distributed structured store based on
- Google's BigTable design.
- </description>
- <copyright>2011 The Apache Software Foundation.</copyright>
- <url>http://accumulo.apache.org</url>
- <needarch>x86_64</needarch>
- <group>Utilities</group>
- <requires>
- <require>jdk</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
- <prefix>/opt/accumulo</prefix>
- <defaultDirmode>755</defaultDirmode>
- <defaultFilemode>644</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>docs</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>test</location>
- <excludes>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**/*.pyc</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>bin</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <sources>
- <source>
- <location>conf</location>
- <excludes>
- <exclude>**/accumulo-site.xml</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/masters</exclude>
- <exclude>**/tracers</exclude>
- <exclude>**/gc</exclude>
- <exclude>**/monitor</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <dependency />
- <sources>
- <source>
- <location>lib</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>false</inherited>
++ <version>0.6.1</version>
++ </dependency>
++ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>1.2</version>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>docs/src/user_manual/build.sh</argument>
- </arguments>
- </configuration>
- <executions>
- <execution>
- <id>user-manual</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-tools</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>${sealJars}</Sealed>
++ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <tagNameFormat>@{project.version}-RC</tagNameFormat>
+ <releaseProfiles>seal-jars</releaseProfiles>
+ <useReleaseProfile>false</useReleaseProfile>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>docs/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
@@@ -605,104 -402,8 +611,117 @@@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-sorted-pom</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeClassifiers>sources,test-sources</excludeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${maven.min-version},)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
++ <groupId>com.github.koraktor</groupId>
++ <artifactId>mavanagaiata</artifactId>
++ <executions>
++ <execution>
++ <id>git-commit</id>
++ <goals>
++ <goal>commit</goal>
++ </goals>
++ <phase>validate</phase>
++ </execution>
++ </executions>
++ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ </execution>
+ <execution>
+ <id>verify-integration-tests</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <!-- enable ssh deployment of site with maven 3 -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.4</version>
+ </extension>
+ </extensions>
</build>
-
<reporting>
<plugins>
<plugin>
[12/18] git commit: ACCUMULO-2064 switch to mavanagaiata for sha
Posted by md...@apache.org.
ACCUMULO-2064 switch to mavanagaiata for sha
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed9811c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed9811c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed9811c8
Branch: refs/heads/master
Commit: ed9811c82f9e5d03c5bfcbaa9c720cdaa0384977
Parents: fc7a0a3
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 15:18:57 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 15:35:32 2013 -0800
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed9811c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20916c7..bd913b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <executions>
+ <execution>
+ <id>git-commit</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>commit</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -125,8 +138,7 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
</manifestEntries>
</archive>
<includes>
@@ -878,6 +890,13 @@
<artifactId>commons-jci-fam</artifactId>
<version>1.0</version>
</dependency>
+
+ <!-- Version management -->
+ <dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[03/18] git commit: Merge branch 1.4.5-SNAP into 1.5.1-SNAP (-sours)
Posted by md...@apache.org.
Merge branch 1.4.5-SNAP into 1.5.1-SNAP (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b315fe2d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b315fe2d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b315fe2d
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b315fe2d4b51acb68d077d4b1f0128163dfd691f
Parents: 7449524 79266cb
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 12:34:43 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 12:34:43 2013 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------