ACCUMULO-1166 Merge from 1.5 to trunk for source release updates and minicluster artifact dependency


git-svn-id: https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk@1487703 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index ca4f6fe..25f2032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,18 +17,17 @@
 -->

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

   <modelVersion>4.0.0</modelVersion>

-

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

   <artifactId>instamo-archetype</artifactId>

   <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>

+  <url>http://accumulo.apache.org</url>

   <build>

     <extensions>

       <extension>

@@ -37,16 +36,43 @@
         <version>2.2</version>

       </extension>

     </extensions>

-

     <pluginManagement>

       <plugins>

         <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

           <artifactId>maven-archetype-plugin</artifactId>

           <version>2.2</version>

         </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-source-plugin</artifactId>

+          <version>2.2.1</version>

+          <configuration>

+            <includePom>true</includePom>

+          </configuration>

+        </plugin>

       </plugins>

     </pluginManagement>

   </build>

-

-  <url>http://accumulo.apache.org</url>

+  <profiles>

+    <profile>

+      <id>release</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-source-plugin</artifactId>

+            <executions>

+              <execution>

+                <id>attach-sources</id>

+                  <goals>

+                    <goal>jar</goal>

+                  </goals>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+  </profiles>

 </project>

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 5089c07..5f8da0f 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -154,6 +154,11 @@
       <version>${accumulo.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-minicluster</artifactId>
+      <version>${accumulo.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>3.3.6</version>