Merge "BUG 1839 - HTTP delete of non existing data"

[controller.git] / opendaylight / sal / connection / api / pom.xml

diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml
index 00fda77e69938fe82cc04820fecb74a4acef6426..780631791d64e9fa96c5e0313fcd762147b368a6 100644 (file)
--- a/opendaylight/sal/connection/api/pom.xml
+++ b/opendaylight/sal/connection/api/pom.xml
@@ -1,61 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <parent>\r
-    <groupId>org.opendaylight.controller</groupId>\r
-    <artifactId>commons.opendaylight</artifactId>\r
-    <version>1.4.0-SNAPSHOT</version>\r
-    <relativePath>../../../commons/opendaylight</relativePath>\r
-  </parent>\r
-  <scm>\r
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
-  </scm>\r
-\r
-  <artifactId>sal.connection</artifactId>\r
-  <version>0.1.0-SNAPSHOT</version>\r
-  <packaging>bundle</packaging>\r
-\r
-  <build>\r
-    <plugins>\r
-      <plugin>\r
-        <groupId>org.apache.felix</groupId>\r
-        <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>${bundle.plugin.version}</version>\r
-        <extensions>true</extensions>\r
-        <configuration>\r
-          <instructions>\r
-            <Import-Package>\r
-              org.slf4j,\r
-              org.osgi.framework,\r
-              org.apache.felix.dm,\r
-              org.apache.commons.lang3.tuple,\r
-              javax.xml.bind.annotation,\r
-              javax.xml.bind.annotation.adapters,\r
-              org.opendaylight.controller.sal.core,\r
-              org.opendaylight.controller.sal.utils\r
-            </Import-Package>\r
-            <Export-Package>\r
-              org.opendaylight.controller.sal.connection\r
-             </Export-Package>\r
-          </instructions>\r
-          <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
-        </configuration>\r
-      </plugin>\r
-    </plugins>\r
-  </build>\r
-  <dependencies>\r
-    <dependency>\r
-      <groupId>org.opendaylight.controller</groupId>\r
-      <artifactId>sal</artifactId>\r
-      <version>0.5.0-SNAPSHOT</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>junit</groupId>\r
-      <artifactId>junit</artifactId>\r
-      <version>4.8.1</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-  </dependencies>\r
-</project>\r
+<?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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath>../../../commons/opendaylight</relativePath>
+  </parent>
+
+  <artifactId>sal.connection</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>org.slf4j,
+              org.osgi.framework,
+              org.apache.felix.dm,
+              org.apache.commons.lang3.tuple,
+              javax.xml.bind.annotation,
+              javax.xml.bind.annotation.adapters,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils</Import-Package>
+            <Export-Package>org.opendaylight.controller.sal.connection</Export-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <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>