POM File refactoring

Refactoring all *impl and *-api pom files

Change-Id: I183a760754e8da04deff67edc42f92ae2b14b541
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/bgpmanager/bgpmanager-api/pom.xml b/bgpmanager/bgpmanager-api/pom.xml
index 609a4ace30a1bbc3679782455a158fd85592b049..d359c1487bb957e0759af2321dd2f02fc1c6a923 100644 (file)
--- a/bgpmanager/bgpmanager-api/pom.xml
+++ b/bgpmanager/bgpmanager-api/pom.xml
@@ -9,34 +9,18 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>bgpmanager-api</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
-<!--
-  <dependencies>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}.third-party</groupId>
-      <artifactId>org.apache.thriftlib</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
-    </dependency>
-
-  </dependencies>
- -->
   <properties>
     <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>

diff --git a/bgpmanager/bgpmanager-impl/pom.xml b/bgpmanager/bgpmanager-impl/pom.xml
index 7ad9092faba7600760143b7bfa02357d30e745a9..78469fd1ec2bdc562e39aa69c645a7a98800ce29 100644 (file)
--- a/bgpmanager/bgpmanager-impl/pom.xml
+++ b/bgpmanager/bgpmanager-impl/pom.xml
@@ -9,33 +9,33 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>bgpmanager-impl</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
   <dependencies>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>bgpmanager-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model-bgp</artifactId>
-      <version>2013.07.15.7-SNAPSHOT</version>
+      <version>${model.bgp.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>fibmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
 
     <dependency>
@@ -45,21 +45,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
new file mode 100644 (file)
index 0000000..8710446
--- /dev/null
+++ b/commons/binding-parent/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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.yangtools</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.vpnservice</groupId>
+  <artifactId>binding-parent</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <vpnservices.version>0.0.1-SNAPSHOT</vpnservices.version>
+    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
+    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
+    <ietf.interfaces.version>2014.05.08.7-SNAPSHOT</ietf.interfaces.version>
+    <iana.if.type.version>2014.05.08.7-SNAPSHOT</iana.if.type.version>
+    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
+    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <vpns.mdsalutil.version>0.0.1-SNAPSHOT</vpns.mdsalutil.version>
+    <model.bgp.version>2013.07.15.7-SNAPSHOT</model.bgp.version>
+  </properties>
+</project>

diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml
new file mode 100644 (file)
index 0000000..98a1c10
--- /dev/null
+++ b/commons/config-parent/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.vpnservice</groupId>
+  <artifactId>config-parent</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <!-- ODL -->
+    <vpnservices.version>0.0.1-SNAPSHOT</vpnservices.version>
+    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
+    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
+    <ietf.interfaces.version>2014.05.08.7-SNAPSHOT</ietf.interfaces.version>
+    <iana.if.type.version>2014.05.08.7-SNAPSHOT</iana.if.type.version>
+    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
+    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <vpns.mdsalutil.version>0.0.1-SNAPSHOT</vpns.mdsalutil.version>
+    <model.bgp.version>2013.07.15.7-SNAPSHOT</model.bgp.version>
+  </properties>
+
+  <dependencies>
+    <!-- Testing Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>
+            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
+          </configLocation>
+          <failsOnError>true</failsOnError>
+          <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
+          <excludes>**/yang/</excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/fibmanager-api/pom.xml
index 89ff83d9445e9a9a5d4bdf160b725a9816d9ef30..aa25305ae6322865a444c5ce414d6f82552fad8f 100644 (file)
--- a/fibmanager/fibmanager-api/pom.xml
+++ b/fibmanager/fibmanager-api/pom.xml
@@ -8,27 +8,18 @@ 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.yangtools</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>fibmanager-api</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- ODL -->
-    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -53,12 +44,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>

diff --git a/fibmanager/fibmanager-impl/pom.xml b/fibmanager/fibmanager-impl/pom.xml
index 95b37969a3e5456c9bb70c8b16fdc38ca2015777..9e91a468a2a00cbeedfe7e3e4f630b3b11da4afc 100644 (file)
--- a/fibmanager/fibmanager-impl/pom.xml
+++ b/fibmanager/fibmanager-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: --><!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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,
@@ -9,55 +9,29 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>fibmanager-impl</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>fibmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>vpnmanager-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <version>${vpnservices.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>

diff --git a/idmanager/idmanager-api/pom.xml b/idmanager/idmanager-api/pom.xml
index 04766482f10fec764c12f2125ca406cc6b33cb4a..6a7708fa0861c372476aa3d369a40362beec200e 100644 (file)
--- a/idmanager/idmanager-api/pom.xml
+++ b/idmanager/idmanager-api/pom.xml
@@ -8,27 +8,18 @@ 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.yangtools</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>idmanager-api</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- ODL -->
-    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml
index 06b5f88a8e9740e905efd14bd897af81810d5f1b..039d4e053c8211e55b852de7d872204ea26e12e9 100644 (file)
--- a/idmanager/idmanager-impl/pom.xml
+++ b/idmanager/idmanager-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: --><!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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,
@@ -9,49 +9,23 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>idmanager-impl</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
   <dependencies>
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>

diff --git a/interfacemgr/interfacemgr-api/pom.xml b/interfacemgr/interfacemgr-api/pom.xml
index 4cfdfcf6919de45a345c3371e1ab999adb0061d0..32dace0f44892e2889b3066004ab4270600d92a8 100644 (file)
--- a/interfacemgr/interfacemgr-api/pom.xml
+++ b/interfacemgr/interfacemgr-api/pom.xml
@@ -8,27 +8,18 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>interfacemgr-api</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- ODL -->
-    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <vpns.mdsalutil.version>0.0.1-SNAPSHOT</vpns.mdsalutil.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -58,12 +49,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>

diff --git a/interfacemgr/interfacemgr-impl/pom.xml b/interfacemgr/interfacemgr-impl/pom.xml
index fec2ca0d00715d4a73dd5b770d0823a35473aaae..59451e2ad7279c0fdbc76a79dc120356836386a9 100644 (file)
--- a/interfacemgr/interfacemgr-impl/pom.xml
+++ b/interfacemgr/interfacemgr-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: --><!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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,
@@ -9,10 +9,10 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -38,52 +38,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>vpnmanager-impl</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>idmanager-impl</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
+      <version>${vpnservices.version}</version>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>

diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml
index 46ed199ce071466e7c7d2a86b31a048bc8328e81..1a205a397b91dd00fd6834d13069f2fa5033837a 100644 (file)
--- a/model-bgp/pom.xml
+++ b/model-bgp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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,
@@ -9,28 +9,21 @@
 -->
 <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.yangtools</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.vpnservice</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../commons/binding-parent</relativePath>
+  </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>model-bgp</artifactId>
-    <version>2013.07.15.7-SNAPSHOT</version>
+    <version>${model.bgp.version}</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
     <packaging>bundle</packaging>
 
-    <properties>
-        <!-- ODL -->
-        <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-        <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -52,10 +45,5 @@
             <artifactId>ietf-yang-types</artifactId>
             <version>${ietf.yang.types.version}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

diff --git a/nexthopmgr/nexthopmgr-api/pom.xml b/nexthopmgr/nexthopmgr-api/pom.xml
index f4022970f3aecaaf4fc1ed45619936f38aa74c78..24e58e6b5e965a21594f7ac339859cddb6a99087 100644 (file)
--- a/nexthopmgr/nexthopmgr-api/pom.xml
+++ b/nexthopmgr/nexthopmgr-api/pom.xml
@@ -8,27 +8,18 @@ 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.yangtools</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>nexthopmgr-api</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- ODL -->
-    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -58,12 +49,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>

diff --git a/nexthopmgr/nexthopmgr-impl/pom.xml b/nexthopmgr/nexthopmgr-impl/pom.xml
index a6f04dd24895268fea1cb83ddf2b154ba86f0654..601bc90f4a7aedc0149c9d234a85689e07ecc4c2 100644 (file)
--- a/nexthopmgr/nexthopmgr-impl/pom.xml
+++ b/nexthopmgr/nexthopmgr-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: --><!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. 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,
@@ -9,22 +9,22 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>nexthopmgr-impl</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>vpnmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -34,12 +34,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>idmanager-impl</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -52,33 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
 
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>

diff --git a/pom.xml b/pom.xml
index 22e07fb4e52314b65cc1cf030ecd5fd71ab0392e..7c29c75c64b1dbd3e43f6eca07dde5c657abd0a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <modules>
-       <module>model-bgp</module>
-       <module>mdsalutil</module>
+    <module>commons/binding-parent</module>
+    <module>commons/config-parent</module>
+    <module>model-bgp</module>
+    <module>mdsalutil</module>
     <module>vpnmanager</module>
     <module>interfacemgr</module>
     <module>nexthopmgr</module>

diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/vpnmanager-api/pom.xml
index 99490b122a4244611f5634ae820fbe35bc83c3e5..b042c1eb3e9816184aa66665420b9b71f0362b84 100644 (file)
--- a/vpnmanager/vpnmanager-api/pom.xml
+++ b/vpnmanager/vpnmanager-api/pom.xml
@@ -8,27 +8,18 @@ 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.yangtools</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>vpnmanager-api</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- ODL -->
-    <ietf.inet.types.version>2010.09.24.7-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.7-SNAPSHOT</ietf.yang.types.version>
-    <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -58,17 +49,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.7-SNAPSHOT</version>
+      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>model-bgp</artifactId>
-      <version>2013.07.15.7-SNAPSHOT</version>
+      <version>${model.bgp.version}</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/vpnmanager/vpnmanager-impl/pom.xml b/vpnmanager/vpnmanager-impl/pom.xml
index ba626fb075a0b76c962ee4aec85add75968b72cc..8a138746e46de63ceefc4610ff6c46fd18cf31b5 100644 (file)
--- a/vpnmanager/vpnmanager-impl/pom.xml
+++ b/vpnmanager/vpnmanager-impl/pom.xml
@@ -9,16 +9,16 @@ 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.controller</groupId>
+    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath/>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.vpnservice</groupId>
   <artifactId>vpnmanager-impl</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>${vpnservices.version}</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -46,32 +46,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>interfacemgr-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!--  TEST Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-       <dependency>
-       <groupId>org.mockito</groupId>
-       <artifactId>mockito-all</artifactId>
-       <scope>test</scope>
-    </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>
-            ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml
-          </configLocation>
-          <failsOnError>true</failsOnError>
-          <includes>**/*.java,**/*.xml,**/*.ini</includes>
-          <excludes>**/yang/</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 
 </project>