Remove install/deploy plugin configuration

Control install/deploy through a simple property rather than
spelling out the complete configuration for install/deploy plugins.

Change-Id: I902c383957d815fd32eb0c35125db9d34d017e11
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index bf2e2e8e0585c304a47c8fe7ff0fa502b3619284..da71ea28aa91517987cfda34f8d8af866ed9bdd9 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -21,35 +21,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/aaa-shiro.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa-shiro.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/aaa-shiro:Main</url>
-  </scm>
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
 
   <modules>
     <module>api</module>
     <module>impl</module>
   </modules>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/AAA:Main</url>
+  </scm>
 </project>

diff --git a/dependency-check/pom.xml b/dependency-check/pom.xml
index bb7bde85e34a546e4d71bb43c304a51592dfab70..e89cc74a62fc37182613bd6c5468cd8f989c38ab 100644 (file)
--- a/dependency-check/pom.xml
+++ b/dependency-check/pom.xml
@@ -21,6 +21,11 @@
     <version>0.11.0-SNAPSHOT</version>
     <name>ODL :: aaa :: ${project.artifactId}</name>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <!--
     This POM serves to check that all the dependencies in AAA’s dependency management are available.
     It should contain all the dependencies in management.
@@ -145,24 +150,4 @@
         </dependency>
 
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index f051980638745232856ff9c0fb80b2e0dfacceb3..4a6dfe5959a5730131038b2c4027b6aa71eb5d9b 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -21,6 +21,11 @@
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <module>features-aaa</module>
         <module>odl-aaa-api</module>
@@ -32,25 +37,6 @@
         <module>odl-aaa-web</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index cbc8733f6552664aac16a9879cc4c2aec2b1c4b1..d299fcb84a88cf9c450d741f180d82d3ec7ce91c 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -22,6 +22,11 @@
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -53,26 +58,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!-- DO NOT install or deploy the karaf artifact -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>