Merge "Bug 716: Errors on controller shutdown"

[controller.git] / opendaylight / containermanager / api / pom.xml

diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml
index 2b354752b3ee44de021ef055ed83ed2e37b1729c..a19e27189a2dfcd6e7b344fa0111454800e17607 100644 (file)
--- a/opendaylight/containermanager/api/pom.xml
+++ b/opendaylight/containermanager/api/pom.xml
@@ -1,51 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>containermanager</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.5.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
         <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-                 org.opendaylight.controller.sal.action,
-                 org.opendaylight.controller.sal.authorization,
-                 org.opendaylight.controller.sal.core,
-                 org.opendaylight.controller.sal.flowprogrammer,
-                 org.opendaylight.controller.sal.match,
-              org.opendaylight.controller.sal.reader,
+        <configuration>
+          <instructions>
+            <Import-Package>org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.authorization,
               org.opendaylight.controller.sal.utils,
-              org.apache.commons.lang3.builder
-           </Import-Package>
-           <Export-Package>
-              org.opendaylight.controller.containermanager
-           </Export-Package>
-         </instructions>
-       </configuration>
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.match,
+              org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.reader,
+              org.slf4j,
+              javax.xml.bind.annotation,
+              javax.xml.bind</Import-Package>
+            <Export-Package>org.opendaylight.controller.containermanager</Export-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
-  </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>