Use odlparent-lite for aggregator

Change-Id: I33cfd551dcd28f0a9261e83887e0dc9520099a34
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/aaa-authn-mdsal-store/pom.xml b/aaa-authn-mdsal-store/pom.xml
index 8538e70623f991d98927bbd65e90ec41d295d70c..00d947003ad3e1e50fc5b2622b2951d485cd01c0 100644 (file)
--- a/aaa-authn-mdsal-store/pom.xml
+++ b/aaa-authn-mdsal-store/pom.xml
@@ -1,22 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Hewlett-Packard, L.P. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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">
-    <parent>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.opendaylight.aaa</groupId>
+  <artifactId>aaa-authn-mdsal-store</artifactId>
+  <name>${project.artifactId}</name>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <artifactId>aaa-authn-mdsal-store</artifactId>
-    <name>${project.artifactId}</name>
-    <packaging>pom</packaging>
+  <modules>
+    <module>aaa-authn-mdsal-api</module>
+    <module>aaa-authn-mdsal-store-impl</module>
+  </modules>
 
-    <modules>
-        <module>aaa-authn-mdsal-api</module>
-        <module>aaa-authn-mdsal-config</module>
-        <module>aaa-authn-mdsal-store-impl</module>
-    </modules>
-</project>
+  <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>
\ No newline at end of file

diff --git a/aaa-authz/pom.xml b/aaa-authz/pom.xml
index 689bbd02a6ea2cb7a74704f1b98ea2b09bcb134b..4a90d22434f360913bb228adf068d047b64558f0 100644 (file)
--- a/aaa-authz/pom.xml
+++ b/aaa-authz/pom.xml
@@ -1,23 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Hewlett-Packard, L.P. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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>
-    <parent>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-    </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.aaa</groupId>
+  <artifactId>aaa-authz</artifactId>
+  <name>${project.artifactId}</name>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <artifactId>aaa-authz</artifactId>
-    <name>${project.artifactId}</name>
-    <packaging>pom</packaging>
+  <modules>
+    <module>aaa-authz-model</module>
+    <module>aaa-authz-service</module>
+    <module>aaa-authz-restconf-config</module>
+  </modules>
 
-    <modules>
-        <module>aaa-authz-model</module>
-        <module>aaa-authz-service</module>
-        <module>aaa-authz-config</module>
-        <module>aaa-authz-restconf-config</module>
-    </modules>
-</project>
+  <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>
\ No newline at end of file

diff --git a/features/pom.xml b/features/pom.xml
index 63e4d39ed2fffac4ec0aab791b4d2a7f9498aac9..cce2634973f0f55b6279b1c89504e8fd42505a11 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Brocade Communications Systems, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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>
   <parent>
-    <groupId>org.opendaylight.aaa</groupId>
-    <artifactId>aaa-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>features-aggregator</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>shiro</module>
@@ -18,4 +27,24 @@
     <module>aaa-cert</module>
     <module>aaa-cli</module>
   </modules>
-</project>
+
+  <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>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index ab282d61857002b803ea4f478ed5905215d6cd57..4967671f71550b713fd1ab231277562ea3863687 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Brocade Communications Systems, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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>
   <parent>
-    <groupId>org.opendaylight.aaa</groupId>
-    <artifactId>aaa-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa.project</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>aaa</name> <!-- Used by Sonar to set project name -->
+  <name>aaa</name>
+
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
 
   <modules>
@@ -44,11 +52,29 @@
     <module>aaa-cassandra-store</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>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/AAA:Main</url>
   </scm>
-
-</project>
+</project>
\ No newline at end of file