From 58524b5f8a418977ef7c87624043910a0db5ffb0 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Wed, 6 Jul 2016 06:19:51 +0100
Subject: [PATCH] [VIVO-1082] Cleanup of VIVO poms

---
 installer/home/pom.xml   |  6 +++---
 installer/pom.xml        | 14 ++++++++++++++
 installer/solr/pom.xml   |  6 +++---
 installer/webapp/pom.xml |  6 +++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/installer/home/pom.xml b/installer/home/pom.xml
index 16568121..3af799ac 100644
--- a/installer/home/pom.xml
+++ b/installer/home/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.vivoweb</groupId>
-    <artifactId>home</artifactId>
+    <artifactId>vivo-installer-home</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -17,7 +17,7 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <name>VIVO Prepare Home</name>
+    <name>VIVO Install Home</name>
 
     <properties>
         <default-theme>wilma</default-theme>
@@ -51,7 +51,7 @@
                     </plugin>
                     <plugin>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.3</version>
+                        <version>1.8</version>
                         <executions>
                             <execution>
                                 <id>remove-webapp</id>
diff --git a/installer/pom.xml b/installer/pom.xml
index afa6bb66..891fca53 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -85,6 +85,13 @@
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>3.1</version>
@@ -99,6 +106,13 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.10</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
                         <version>2.6</version>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
index 60abe9ef..8e445e1a 100644
--- a/installer/solr/pom.xml
+++ b/installer/solr/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.vivoweb</groupId>
-    <artifactId>solr</artifactId>
+    <artifactId>vivo-installer-solr</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
@@ -17,7 +17,7 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <name>VIVO Prepare Solr App</name>
+    <name>VIVO Install Solr App</name>
 
     <profiles>
         <profile>
@@ -65,7 +65,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.3</version>
+                        <version>1.8</version>
                         <executions>
                             <execution>
                                 <id>remove-webapp</id>
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
index 3ec6943f..c2532c3f 100644
--- a/installer/webapp/pom.xml
+++ b/installer/webapp/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.vivoweb</groupId>
-    <artifactId>vivo</artifactId>
+    <artifactId>vivo-installer-vivo</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
@@ -17,7 +17,7 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <name>VIVO Prepare Web App</name>
+    <name>VIVO Install Web App</name>
 
     <profiles>
         <profile>
@@ -66,7 +66,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.3</version>
+                        <version>1.8</version>
                         <executions>
                             <execution>
                                 <id>remove-webapp</id>