Merge "Split message aggregators"

[controller.git] / third-party / jersey-servlet / pom.xml

diff --git a/third-party/jersey-servlet/pom.xml b/third-party/jersey-servlet/pom.xml
index dfb8968a5e4390dcedcbcd72d72c6dccf89bdd16..7e944c15da41cf46ebaf14a4b7aa2e2ca7046ab6 100644 (file)
--- a/third-party/jersey-servlet/pom.xml
+++ b/third-party/jersey-servlet/pom.xml
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <!-- Get some common settings for the project we are using it in -->
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+    <tag>HEAD</tag>
+  </scm>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller.thirdparty</groupId>
   <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-  <version>1.17-SNAPSHOT</version>
+  <version>1.18-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -61,6 +68,7 @@
               *;resolution:=optional
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>