commit cc5a8aaff38089f88ae9b972ac0e7a3d5e26c848
author Josh Elser <elserj@apache.org> Tue May 28 02:02:03 2013 +0000
committer Josh Elser <elserj@apache.org> Tue May 28 02:02:03 2013 +0000
tree 0639550ee06159d9d33370a521fdf4adb29eb628
parent c720b284c6683a8d0c7fd8216941386ffaf9e299
parent 6bbe8eb9c04efe9aa69b25b964e0658dc8d160d3

ACCUMULO-1166 Merge 1.5 to trunk


git-svn-id: https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk@1486729 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 3b00b76..ca4f6fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,15 @@
 

   <groupId>org.apache.accumulo</groupId>

   <artifactId>instamo-archetype</artifactId>

-  <version>1.5.0</version>

+  <version>1.6.0-SNAPSHOT</version>

   <packaging>maven-archetype</packaging>

 

   <name>instamo-archetype</name>

-

+  <scm>

+    <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk</connection>

+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk</developerConnection>

+    <url>http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk</url>

+  </scm>

   <build>

     <extensions>

       <extension>

src/main/resources/archetype-resources/pom.xml

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 10b2844..5089c07 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,7 @@
   <url>http://accumulo.apache.org</url>
 
   <properties>
-    <accumulo.version>1.5.0</accumulo.version>
+    <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
     <hadoop-one.version>1.0.4</hadoop-one.version>
     <hadoop-two.version>2.0.2-alpha</hadoop-two.version>
     <slf4j.version>1.6.1</slf4j.version>