Merge branch '1.4' into 1.5
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/repo
Commit:
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/commit/8c898e78
Tree:
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/8c898e78
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/8c898e78
Branch: refs/heads/master
Commit: 8c898e78f657ce34e1af3f1777478f5f3855a8a6
Parents: 0c77dae 2a6f2fc
Author: Josh Elser <josh.el...@gmail.com>
Authored: Tue Oct 8 18:48:59 2013 -0400
Committer: Josh Elser <josh.el...@gmail.com>
Committed: Tue Oct 8 18:48:59 2013 -0400
----------------------------------------------------------------------
LICENSE | 514 -------------------
NOTICE | 7 +-
pom.xml | 43 +-
.../META-INF/maven/archetype-metadata.xml | 2 +
src/main/resources/archetype-resources/LICENSE | 202 ++++++++
src/main/resources/archetype-resources/NOTICE | 8 +
6 files changed, 233 insertions(+), 543 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/8c898e78/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7115c3c,ea24db5..ff4155b
--- a/pom.xml
+++ b/pom.xml
@@@ -24,10 -24,10 +24,10 @@@
</parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>instamo-archetype</artifactId>
+ <artifactId>accumulo-instamo-archetype</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>instamo-archetype</name>
+ <name>Accumulo Instamo Archetype</name>
<scm>
<connection>scm:git:git://git.apache.org/accumulo-instamo-archetype.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git</developerConnection>
