From 648ccf4d14076a7ece4fc5196bae954804f44766 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Wed, 6 Jul 2016 06:39:39 +0100 Subject: [PATCH] [VIVO-1082] Clean up pluginManagement --- installer/home/pom.xml | 4 --- installer/pom.xml | 59 +++++++++++++++++++++++++++++++++------- installer/solr/pom.xml | 4 --- installer/webapp/pom.xml | 4 --- 4 files changed, 49 insertions(+), 22 deletions(-) diff --git a/installer/home/pom.xml b/installer/home/pom.xml index f87672abb..ce88261b2 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -33,7 +33,6 @@ maven-assembly-plugin - 2.5.5 src/main/assembly/home.xml @@ -51,7 +50,6 @@ maven-antrun-plugin - 1.8 remove-webapp @@ -69,7 +67,6 @@ maven-resources-plugin - 2.7 install @@ -97,7 +94,6 @@ maven-install-plugin - 2.5.2 true diff --git a/installer/pom.xml b/installer/pom.xml index c436e4700..f689ad202 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -20,7 +20,6 @@ maven-install-plugin - 2.5.2 true @@ -28,19 +27,66 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 true maven-deploy-plugin - 2.7 true + + + + maven-antrun-plugin + 1.8 + + + maven-assembly-plugin + 2.5.5 + + + maven-compiler-plugin + 3.1 + + + maven-dependency-plugin + 2.10 + + + maven-deploy-plugin + 2.7 + + + maven-enforcer-plugin + 1.4.1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + maven-install-plugin + 2.5.2 + + + maven-resources-plugin + 2.7 + + + maven-surefire-plugin + 2.12.4 + + + maven-war-plugin + 2.6 + + + @@ -87,14 +133,12 @@ maven-antrun-plugin - 1.8 true maven-compiler-plugin - 3.1 default-compile @@ -108,14 +152,12 @@ maven-dependency-plugin - 2.10 true maven-resources-plugin - 2.6 default-resources @@ -129,7 +171,6 @@ maven-surefire-plugin - 2.12.4 test @@ -139,7 +180,6 @@ maven-war-plugin - 2.6 default-war @@ -159,7 +199,6 @@ maven-enforcer-plugin - 1.4.1 enforce-properties diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml index 5fd188eca..f70cc91c3 100644 --- a/installer/solr/pom.xml +++ b/installer/solr/pom.xml @@ -30,7 +30,6 @@ maven-war-plugin - 2.6 @@ -65,7 +64,6 @@ maven-antrun-plugin - 1.8 remove-webapp @@ -84,7 +82,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 install @@ -116,7 +113,6 @@ maven-install-plugin - 2.5.2 true diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 5db443b0c..7ccd9e270 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -31,7 +31,6 @@ org.apache.maven.plugins maven-war-plugin - 2.6 @@ -66,7 +65,6 @@ maven-antrun-plugin - 1.8 remove-webapp @@ -85,7 +83,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 install @@ -117,7 +114,6 @@ maven-install-plugin - 2.5.2 true