Clean up pom files.

- Add missing Copyright headers.
- Remove duplicated properties that are pulled from odlparent

Change-Id: Ia36dd455de988fb6be4f1a2d90cd7291878fe7d5
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index b88423ec5fec350a3df7f5cf2d25e7c70ec5671d..ccaf699e93e48ee94b94cdc139f0e39c08228820 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
+
   <artifactId>commons.integrationtest</artifactId>
-  <name>OVSDB Integration Test Parent POM</name>
+  <name>${project.artifactId}.parent</name>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -666,7 +677,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>plugin</artifactId>
+      <artifactId>northbound</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
@@ -674,15 +685,15 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>northbound</artifactId>
+      <artifactId>plugin</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.openvswitch</artifactId>
+      <artifactId>schema.hardwarevtep</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.hardwarevtep</artifactId>
+      <artifactId>schema.openvswitch</artifactId>
     </dependency>
 
     <!-- Add Pax Exam -->
@@ -715,7 +726,7 @@
               <properties>
                 <property>
                   <name>logback.configurationFile</name>
-                  <value>${project.parent.parent.basedir}/logback.xml</value>
+                  <!--<value>${project.parent.basedir}/logback.xml</value>-->
                 </property>
               </properties>
             </configuration>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 764232c964fdf0a94079c05fda47fa3b936a4fdc..a3b3b7afdc9547231be0a0df982968571666160c 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -1,83 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.odlparent</groupId>
     <artifactId>odlparent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath></relativePath>
   </parent>
 
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>commons</artifactId>
-  <name>OVSDB Parent POM</name>
+  <name>${project.artifactId}.parent</name>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
 
   <properties>
+    <checkstyle.rules.version>0.1.0-SNAPSHOT</checkstyle.rules.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <!-- ODL repository / plugin repository -->
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <!-- Surefire/Failsafe Arguments -->
     <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
-    <!-- OVSB Component Versions -->
-    <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
-    <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
-    <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
+    <!-- OVSDB Component Versions -->
     <openstack.netvirt.version>1.1.0-SNAPSHOT</openstack.netvirt.version>
     <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.version>
+    <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
     <ovsdb.northbound.version>0.7.0-SNAPSHOT</ovsdb.northbound.version>
-    <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
-    <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
+    <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
+    <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
+    <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
+    <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
     <utils.mdsal.openflow.version>1.1.0-SNAPSHOT</utils.mdsal.openflow.version>
-    <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <!-- Skip Coverage and IT by default -->
     <skip.coverage>true</skip.coverage>
+    <skip.distribution>false</skip.distribution>
     <skip.integrationtest>true</skip.integrationtest>
     <skip.karaf>false</skip.karaf>
-    <skip.distribution>false</skip.distribution>
-    <!-- The directory where maven was executed -->
+    <!-- The directory where maven was executed TODO see if this can be removed -->
     <root.directory>${env.PWD}</root.directory>
-    <!-- UT reports are per-module -->
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
     <!-- IT report is aggregated to enable PAX Exam coverage to be logged -->
     <sonar.jacoco.itReportPath>${root.directory}/target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <!-- Override the JaCoCo version in ODL Parent -->
-    <jacoco.version>0.6.4.201312101107</jacoco.version>
     <!-- ODL Dependency Versions -->
+    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
     <containermanager.version>0.6.0-SNAPSHOT</containermanager.version>
+    <controller.config.version>0.3.0-SNAPSHOT</controller.config.version>
     <forwardingrulesmanager.version>0.7.0-SNAPSHOT</forwardingrulesmanager.version>
-    <networkconfig.neutron.version>0.5.0-SNAPSHOT</networkconfig.neutron.version>
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
+    <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
+    <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <networkconfig.neutron.version>0.5.0-SNAPSHOT</networkconfig.neutron.version>
+    <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
+    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
+    <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
     <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
     <openflowjava-extension.version>0.1.0-SNAPSHOT</openflowjava-extension.version>
     <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-    <controller.config.version>0.3.0-SNAPSHOT</controller.config.version>
+    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
+    <sal.version>0.9.0-SNAPSHOT</sal.version>
     <switchmanager.api.version>0.8.0-SNAPSHOT</switchmanager.api.version>
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
-    <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
-    <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
-    <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
-    <checkstyle.rules.version>0.1.0-SNAPSHOT</checkstyle.rules.version>
     <!-- 3rd Pary Dependency Versions -->
     <commons.collection.version>1.0</commons.collection.version>
+    <httpcomponents.version>4.2.1</httpcomponents.version>
     <portlet.version>2.0</portlet.version>
     <powermock.version>1.5.2</powermock.version>
-    <httpcomponents.version>4.2.1</httpcomponents.version>
-    <karaf.shell.version>3.0.0</karaf.shell.version>
-    <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
   </properties>
 
   <dependencyManagement>
@@ -102,35 +106,20 @@
         <artifactId>httpcore-nio</artifactId>
         <version>${httpcomponents.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-core</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services</artifactId>
-        <version>${clustering.services.version}</version>
+        <artifactId>commons.northbound</artifactId>
+        <version>${northbound.commons.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>${sal.version}</version>
+        <artifactId>config-api</artifactId>
+        <version>${controller.config.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-common-api</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>clustering.services</artifactId>
+        <version>${clustering.services.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -147,6 +136,17 @@
         <artifactId>networkconfig.neutron</artifactId>
         <version>${networkconfig.neutron.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>opendaylight-karaf-empty</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <type>zip</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal</artifactId>
+        <version>${sal.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-binding-api</artifactId>
@@ -157,6 +157,11 @@
         <artifactId>sal-binding-config</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal-common-api</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-common-util</artifactId>
@@ -174,12 +179,12 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-flow-statistics</artifactId>
+        <artifactId>model-flow-service</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-flow-service</artifactId>
+        <artifactId>model-flow-statistics</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
       <dependency>
@@ -223,81 +228,65 @@
         <artifactId>ietf-yang-types-20130715</artifactId>
         <version>${ietf.yang.types.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>yang-ext</artifactId>
-        <version>${yang-ext.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>opendaylight-l2-types</artifactId>
         <version>${opendaylight-l2-types.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>opendaylight-karaf-empty</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
-        <type>zip</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.northbound</artifactId>
-        <version>${northbound.commons.version}</version>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>yang-ext</artifactId>
+        <version>${yang-ext.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-api</artifactId>
-          <version>${controller.config.version}</version>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflow-protocol-api</artifactId>
+        <version>${openflowjava.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-api</artifactId>
-          <version>${openflowjava.version}</version>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflow-protocol-impl</artifactId>
+        <version>${openflowjava.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-spi</artifactId>
-          <version>${openflowjava.version}</version>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflow-protocol-spi</artifactId>
+        <version>${openflowjava.version}</version>
       </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflow-protocol-impl</artifactId>
-            <version>${openflowjava.version}</version>
-        </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>util</artifactId>
-          <version>${openflowjava.version}</version>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>util</artifactId>
+        <version>${openflowjava.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowjava-extension-nicira-api</artifactId>
-          <version>${openflowjava-nicira.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin</artifactId>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowjava-extension-nicira</artifactId>
-          <version>${openflowjava-nicira.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowjava-extension-nicira</artifactId>
+        <version>${openflowjava-nicira.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-extension-api</artifactId>
-          <version>${openflowplugin.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowjava-extension-nicira-api</artifactId>
+        <version>${openflowjava-nicira.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-extension-nicira</artifactId>
-          <version>${openflowplugin.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-extension-api</artifactId>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-extension-nicira-config</artifactId>
-          <version>${openflowplugin.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-extension-nicira</artifactId>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin</artifactId>
-          <version>${openflowplugin.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-extension-nicira-config</artifactId>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
@@ -306,13 +295,8 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>plugin</artifactId>
-        <version>${ovsdb.plugin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>plugin-shell</artifactId>
-        <version>${plugin.shell.version}</version>
+        <artifactId>northbound</artifactId>
+        <version>${ovsdb.northbound.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
@@ -326,8 +310,18 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>northbound</artifactId>
-        <version>${ovsdb.northbound.version}</version>
+        <artifactId>plugin</artifactId>
+        <version>${ovsdb.plugin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>plugin-mdsal-adapter</artifactId>
+        <version>${ovsdb.plugin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>plugin-shell</artifactId>
+        <version>${plugin.shell.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
@@ -339,11 +333,6 @@
         <artifactId>schema.openvswitch</artifactId>
         <version>${schema.openvswitch.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>plugin-mdsal-adapter</artifactId>
-        <version>${ovsdb.plugin.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>utils.config</artifactId>
@@ -354,6 +343,21 @@
         <artifactId>utils.mdsal-openflow</artifactId>
         <version>${utils.mdsal.openflow.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-module-junit4</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-api-mockito</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-core</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -517,12 +521,10 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven.surefire.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${failsafe.version}</version>
           <executions>
             <execution>
               <id>failsafe-integration-tests</id>
@@ -594,7 +596,7 @@
       </plugins>
     </pluginManagement>
   </build>
-  <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
@@ -602,86 +604,6 @@
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <repositories>
-    <!-- Opendaylight public group -->
-    <repository>
-      <id>opendaylight-public</id>
-      <name>opendaylight-public</name>
-      <url>${nexusproxy}/groups/public/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-    </repository>
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <name>opendaylight-release</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <!-- Opendaylight public group -->
-    <pluginRepository>
-      <id>opendaylight-public</id>
-      <name>opendaylight-public</name>
-      <url>${nexusproxy}/groups/public/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-    </pluginRepository>
-    <!-- OpenDayLight Released artifact -->
-    <pluginRepository>
-      <id>opendaylight-release</id>
-      <name>opendaylight-release</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <pluginRepository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
   <profiles>
     <profile>
       <id>integrationtest</id>

diff --git a/distribution/opendaylight-karaf/pom.xml b/distribution/opendaylight-karaf/pom.xml
index b542ba71ac59bbe9d7b7008ec5033e89e8a6f096..7dc7a0b1c6c4f59994304da0d1ddbbe3d93bea8b 100644 (file)
--- a/distribution/opendaylight-karaf/pom.xml
+++ b/distribution/opendaylight-karaf/pom.xml
@@ -1,23 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent/</relativePath>
   </parent>
+
   <artifactId>distribution-karaf</artifactId>
   <groupId>org.opendaylight.ovsdb</groupId>
-  <name>OpenDaylight OVSDB Karaf Distribution</name>
   <packaging>pom</packaging>
+
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
+
   <properties>
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
     <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
   </properties>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index ac2e1d63f33549f45ac7f597bf3bcb0a33856129..978de63b05f9898a86e184d6342425ac027848da 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ /*
-  ~ * Copyright (C) 2014 Red Hat, Inc.
-  ~ *
-  ~ * 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
-  ~ *
-  ~ * Authors : Sam Hague
-  ~ */
-  -->
+Copyright (C) 2014 Red Hat, Inc. and others. All rights reserved.
 
-<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">
+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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
+
   <artifactId>features-ovs-sfc</artifactId>
-  <name>OpenDaylight OVSDB OVS Service Function Chaining Karaf Features</name>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
+
   <properties>
     <features.file>features.xml</features.file>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -37,6 +37,7 @@
       <type>zip</type>
     </dependency>
   </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -84,10 +85,4 @@
       </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-   </scm>
 </project>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index 519177104b0d25941b3cdcce165211c30e06e396..510184d3967f2436ab4c8a216cfd9881c535c4d0 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -1,19 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
+
   <artifactId>features-ovsdb</artifactId>
-  <name>OpenDaylight OVSDB Project Karaf Features</name>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
+
   <properties>
     <features.file>features.xml</features.file>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 740edb19d00de55f74c1cae611319d76281f0880..259c55f734053192a461194791e169224c8fb398 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons.integrationtest</artifactId>
@@ -13,7 +20,6 @@
 
   <artifactId>integrationtest</artifactId>
   <version>1.3.0-SNAPSHOT</version>
-  <name>OpenDaylight OVSDB Integration Tests</name>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/library/pom.xml b/library/pom.xml
index 1c74d6555cc860847ad76621339673ed8faeee1b..8f8067241a9bca8ddf446fb6895ce5d01b69a613 100755 (executable)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
@@ -10,7 +20,6 @@
 
   <artifactId>library</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OVSDB Library</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/northbound/pom.xml b/northbound/pom.xml
index 2e5b5d7eeda29d6c05a488407107f2da5a6b813b..594fd4cc583d6dca8b105d1b157c291c4254e3da 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
+
   <artifactId>northbound</artifactId>
   <version>0.7.0-SNAPSHOT</version>
-  <name>OpenDaylight OVSDB Northbound APIs</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -134,10 +144,12 @@
       </plugin>
     </plugins>
   </build>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
+
 </project>

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index e3974a13ad17abe9a2b2d8f27b5ad240a0517999..94db57b9a17f27ec05d264e5fd7de625d3294e47 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -1,164 +1,178 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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">
-    <parent>
-        <artifactId>commons</artifactId>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../../commons/parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../../commons/parent/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>openstack.net-virt-providers</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-flow-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-inventory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>opendaylight-l2-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>plugin</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>openstack.net-virt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.openvswitch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.mdsal-openflow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowjava-extension-nicira</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-extension-nicira</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
 
-    <artifactId>openstack.net-virt-providers</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <name>Opendaylight OVS Network Virtualization Providers</name>
-    <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.4.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.ovsdb.plugin.api,
+              org.opendaylight.ovsdb.lib.notation,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional",
+              org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional",
+              org.opendaylight.controller.sal.binding.api,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,
+              org.opendaylight.yangtools.yang.binding,
+              org.apache.felix.dm,
+              org.slf4j,
+              org.osgi.framework,
+              *
+            </Import-Package>
+            <Embed-Dependency>utils.config,utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.providers.Activator</Bundle-Activator>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.dependencymanager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>networkconfig.neutron</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>openstack.net-virt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>schema.openvswitch</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.ovsdb</groupId>
-          <artifactId>utils.mdsal-openflow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowjava-extension-nicira</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-extension-nicira</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>compile</scope>
-        </dependency>
-    </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+  </scm>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            org.opendaylight.controller.sal.core,
-                            org.opendaylight.controller.sal.utils,
-                            org.opendaylight.controller.sal.action,
-                            org.opendaylight.ovsdb.plugin.api,
-                            org.opendaylight.ovsdb.lib.notation,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional",
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional",
-                            org.opendaylight.controller.sal.binding.api,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,
-                            org.opendaylight.yangtools.yang.binding,
-                            org.apache.felix.dm,
-                            org.slf4j,
-                            org.osgi.framework,
-                            *
-                        </Import-Package>
-                        <Embed-Dependency>utils.config,utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.providers.Activator</Bundle-Activator>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml
index 67320d441936789a578c2eb154558d56cc16137e..291f3039d906d858388b6f8302caac08df2bcba5 100644 (file)
--- a/openstack/net-virt/pom.xml
+++ b/openstack/net-virt/pom.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
@@ -10,7 +20,6 @@
 
   <artifactId>openstack.net-virt</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>Opendaylight OVS Network Virtualization</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -115,4 +124,5 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
+
 </project>

diff --git a/ovs-sfc/pom.xml b/ovs-sfc/pom.xml
index b0b2842c0e5679f4f40961953cccfd4541269725..60a3e008b226922593f4c87981107fb8d32b8d42 100644 (file)
--- a/ovs-sfc/pom.xml
+++ b/ovs-sfc/pom.xml
@@ -1,198 +1,206 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
-        <artifactId>commons</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../commons/parent</relativePath>
-    </parent>
-    <artifactId>ovssfc</artifactId>
-    <name>OpenDaylight OVS Service Function Chaining</name>
-    <version>0.1.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+  <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <jmxGeneratorPath>target/generated-sources/config</jmxGeneratorPath>
-    </properties>
+  <parent>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <artifactId>commons</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../commons/parent</relativePath>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <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.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <dependency>
+  <artifactId>ovssfc</artifactId>
+  <version>0.1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <properties>
+    <jmxGeneratorPath>target/generated-sources/config</jmxGeneratorPath>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <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.controller</groupId>
+      <artifactId>config-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-flow-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-inventory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>plugin</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.openvswitch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.mdsal-openflow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sfc</groupId>
+      <artifactId>sfc-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>opendaylight-l2-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${bundle.plugin.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Include-Resource>
+              /OSGI-OPT/ovs-sfc/53-ovssfc-provider.xml=${project.basedir}/src/main/resources/initial/53-ovssfc-provider.xml,{maven-resources}
+            </Include-Resource>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>config</id>
+            <goals>
+              <goal>generate-sources</goal>
+            </goals>
+            <configuration>
+              <codeGenerators>
+                <generator>
+                  <codeGeneratorClass>
+                    org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+                  </codeGeneratorClass>
+                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                  <additionalConfiguration>
+                    <namespaceToPackage1>
+                      urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
+                    </namespaceToPackage1>
+                  </additionalConfiguration>
+                </generator>
+              </codeGenerators>
+              <inspectDependencies>true</inspectDependencies>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>schema.openvswitch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>utils.mdsal-openflow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>sfc-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>concepts</artifactId>
-        </dependency>
-        <dependency>
+            <artifactId>yang-jmx-generator-plugin</artifactId>
+            <version>${controller.config.version}</version>
+          </dependency>
+          <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Include-Resource>
-                            /OSGI-OPT/ovs-sfc/53-ovssfc-provider.xml=${project.basedir}/src/main/resources/initial/53-ovssfc-provider.xml,{maven-resources}
-                        </Include-Resource>
-                    </instructions>
-                    <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>config</id>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${controller.config.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+            <artifactId>maven-sal-api-gen-plugin</artifactId>
+            <version>${yangtools.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-    </scm>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+  </scm>
 </project>

diff --git a/plugin-mdsal-adapter/pom.xml b/plugin-mdsal-adapter/pom.xml
index ecd8374f0f4c6987e41e2fe36a13585fb40ce9c5..c17b035e94117d2e8178a0cca10ff51630328dd1 100644 (file)
--- a/plugin-mdsal-adapter/pom.xml
+++ b/plugin-mdsal-adapter/pom.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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>
-    <artifactId>commons</artifactId>
     <groupId>org.opendaylight.ovsdb</groupId>
+    <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent/pom.xml</relativePath>
+    <relativePath>../commons/parent</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>plugin-mdsal-adapter</artifactId>
-  <name>OpenDaylight OVSDB Plugin MD_SAL Adapter</name>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 

diff --git a/plugin-shell/pom.xml b/plugin-shell/pom.xml
index 7f3ec1d96fe044185233c687590e45d8f0948f15..3cd6a7290f2cf9b7323987f740a12bf25bf5f0dc 100644 (file)
--- a/plugin-shell/pom.xml
+++ b/plugin-shell/pom.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
@@ -10,7 +20,6 @@
 
   <artifactId>plugin-shell</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OpenDaylight OVSDB Plugin Shell</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -22,7 +31,7 @@
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.version}</version>
+      <version>${karaf.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 86b15e713956704b2ae64102c0c54d16c1aeeb94..ea28686db277bb4a55edea67355e7db1a53c70fe 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
@@ -10,7 +20,6 @@
 
   <artifactId>plugin</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OpenDaylight OVSDB Plugin</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index e3fa6285faa2a10e26ff8c6a1a75997844e9d632..f0de5661d90fdf19c3b4c5b5e2007a66c319fdfe 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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>
@@ -11,40 +20,48 @@
 
   <artifactId>ovsdb</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>ovsdb</name> <!-- Used by Sonar to set project name -->
+  <name>${project.artifactId}</name> <!-- Used by Sonar to set project name -->
   <packaging>pom</packaging>
 
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
 
   <modules>
     <!-- Parent POM files -->
     <module>commons/parent</module>
     <module>commons/integrationtest</module>
+    <module>distribution/opendaylight-karaf</module>
+    <module>features/ovsdb</module>
+    <module>features/ovs-sfc</module>
     <!-- OVSDB Components -->
     <module>library</module>
-    <module>schemas/openvswitch</module>
-    <module>schemas/hardwarevtep</module>
+    <module>northbound</module>
+    <module>openstack/net-virt</module>
+    <module>openstack/net-virt-providers</module>
     <module>plugin</module>
     <module>plugin-shell</module>
     <module>plugin-mdsal-adapter</module>
-    <module>northbound</module>
+    <module>schemas/hardwarevtep</module>
+    <module>schemas/openvswitch</module>
+    <module>southbound</module>
     <module>utils/config</module>
     <module>utils/mdsal-openflow</module>
-    <module>openstack/net-virt</module>
-    <module>openstack/net-virt-providers</module>
-    <module>southbound</module>
     <!-- Integration Tests -->
     <module>integrationtest</module>
-    <!-- Config Files -->
-    <!-- Karaf Distribution -->
-    <module>features/ovsdb</module>
-    <module>features/ovs-sfc</module>
-    <!-- OVSDB Distribution -->
-    <module>distribution/opendaylight-karaf</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>

diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml
index 3c0392aa0aa22aca13d3314c591bd402f2524758..e9b4d92cbe7880d1808a33ba57528156809fac3e 100755 (executable)
--- a/schemas/hardwarevtep/pom.xml
+++ b/schemas/hardwarevtep/pom.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
+
   <artifactId>schema.hardwarevtep</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OVSDB hardware_vtep Schema</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml
index 14f2292e77f692a0a0eb67f4ead58401f288585a..89b862c2de552e83769255023f41bb8d1f4cc37f 100755 (executable)
--- a/schemas/openvswitch/pom.xml
+++ b/schemas/openvswitch/pom.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
+
   <artifactId>schema.openvswitch</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OVSDB Open_vSwitch Schema</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -31,7 +39,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index b2c060ebe83c2d9702cc92efe47297478d995ae0..b8b64466145c2ccf628e961d24280ac8b99411a3 100644 (file)
--- a/southbound/southbound-features/pom.xml
+++ b/southbound/southbound-features/pom.xml
@@ -10,6 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
+    <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>southbound-features</artifactId>
@@ -62,12 +63,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <classifier>features</classifier>
     </dependency>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>southbound-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>southbound-api</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/utils/config/pom.xml b/utils/config/pom.xml
index 8cf6e1fba8cc34cc3294b9517e5878741c7cf790..349a1b7de5525d1e2eeae5e61b3babbecd152f2e 100644 (file)
--- a/utils/config/pom.xml
+++ b/utils/config/pom.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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>
     <artifactId>commons</artifactId>
     <groupId>org.opendaylight.ovsdb</groupId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent/pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>utils.config</artifactId>
-  <name>OpenDaylight OVS configuration utility</name>
+  <name>${project.artifactId}</name>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 

diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml
index fbf1fdd7a0729b1b8bfa05aa636ca0653907613d..29a4dcba9a7f313bd66028af96e255df46b9930e 100644 (file)
--- a/utils/mdsal-openflow/pom.xml
+++ b/utils/mdsal-openflow/pom.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 Red Hat, 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>
     <artifactId>commons</artifactId>
     <groupId>org.opendaylight.ovsdb</groupId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent/pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>utils.mdsal-openflow</artifactId>
-  <name>OpenDaylight OVS utility for md-sal based OpenFlow</name>
+  <name>${project.artifactId}</name>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>