accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Thu, 02 Jan 2014 22:56:08 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	pom.xml


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 9524e8171c89b529e14de79d2d95a9b928d0c41a
Parents: a56b766 db1ebe4
Author: Josh Elser <elserj@apache.org>
Authored: Thu Jan 2 17:55:51 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jan 2 17:55:51 2014 -0500

----------------------------------------------------------------------
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9524e817/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e808562,241d116..6dc973f
--- a/pom.xml
+++ b/pom.xml
@@@ -136,14 -126,9 +136,9 @@@
        <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>
@@@ -566,11 -368,14 +561,19 @@@
            </configuration>
          </plugin>
          <plugin>
+           <groupId>com.github.koraktor</groupId>
+           <artifactId>mavanagaiata</artifactId>
+           <version>0.6.1</version>
+           <configuration>
+             <skipNoGit>true</skipNoGit>
+           </configuration>
+         </plugin>
+         <plugin>
 +          <groupId>org.codehaus.mojo</groupId>
 +          <artifactId>native-maven-plugin</artifactId>
 +          <version>1.0-alpha-7</version>
 +        </plugin>
 +        <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-assembly-plugin</artifactId>
            <configuration>


Mime
View raw message