Code Review / controller.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug 2002 Importing javax.ws.rs.ext explicitly which helps in some cases.
[controller.git] / opendaylight / northbound / networkconfiguration / neutron / pom.xml
diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index e3b572aea409e88292551c5984df24f58ab21af3..19bcfe44ec5b18835b328a3f291b15eecb192c06 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@ -1,125 +1,110 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    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
-    <properties>\r
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
-        <enunciate.version>1.26.2</enunciate.version>\r
-    </properties>\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
-    <distributionManagement>\r
-        <!-- OpenDayLight Released artifact -->\r
-        <repository>\r
-            <id>opendaylight-release</id>\r
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
-        </repository>\r
-        <!-- OpenDayLight Snapshot artifact -->\r
-        <snapshotRepository>\r
-            <id>opendaylight-snapshot</id>\r
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
-        </snapshotRepository>\r
-        <!-- Site deployment -->\r
-        <site>\r
-            <id>website</id>\r
-            <url>${sitedeploy}</url>\r
-        </site>\r
-    </distributionManagement>\r
-    <groupId>org.opendaylight.controller</groupId>\r
-    <artifactId>networkconfig.neutron.northbound</artifactId>\r
-    <version>0.4.0-SNAPSHOT</version>\r
-    <packaging>bundle</packaging>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.enunciate</groupId>\r
-                <artifactId>maven-enunciate-plugin</artifactId>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>2.3.6</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Import-Package>\r
-                            org.opendaylight.controller.sal.utils,\r
-                            org.opendaylight.controller.containermanager,\r
-                            org.opendaylight.controller.northbound.commons,\r
-                            org.opendaylight.controller.northbound.commons.exception,\r
-                            org.opendaylight.controller.northbound.commons.utils,\r
-                            org.opendaylight.controller.networkconfig.neutron,\r
-                            org.eclipse.persistence.jaxb.rs,\r
-                            com.sun.jersey.spi.container.servlet,\r
-                            javax.ws.rs,\r
-                            javax.ws.rs.core,\r
-                            javax.xml.bind.annotation,\r
-                            javax.xml.bind,\r
-                            org.slf4j,\r
-                            !org.codehaus.enunciate.jaxrs\r
-                        </Import-Package>\r
-                        <Web-ContextPath>/controller/nb/v2/neutron</Web-ContextPath>\r
-                    </instructions>\r
-                    <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller.thirdparty</groupId>\r
-            <artifactId>com.sun.jersey.jersey-servlet</artifactId>\r
-            <version>1.17-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>containermanager</artifactId>\r
-            <version>0.4.0-SNAPSHOT</version>\r
-        </dependency>\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>org.opendaylight.controller</groupId>\r
-            <artifactId>commons.northbound</artifactId>\r
-            <version>0.4.0-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>networkconfig.neutron</artifactId>\r
-            <version>0.4.0-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.codehaus.enunciate</groupId>\r
-            <artifactId>enunciate-core-annotations</artifactId>\r
-            <version>${enunciate.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.persistence</groupId>\r
-            <artifactId>org.eclipse.persistence.moxy</artifactId>\r
-            <version>2.5.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.persistence</groupId>\r
-            <artifactId>org.eclipse.persistence.core</artifactId>\r
-            <version>2.5.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.persistence</groupId>\r
-            <artifactId>org.eclipse.persistence.antlr</artifactId>\r
-            <version>2.5.0</version>\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.4.2-SNAPSHOT</version>
+    <relativePath>../../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>networkconfig.neutron.northbound</artifactId>
+  <version>0.4.2-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.enunciate</groupId>
+      <artifactId>enunciate-core-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.antlr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.moxy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron</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.opendaylight.controller.sal.utils,
+                            org.opendaylight.controller.containermanager,
+                            org.opendaylight.controller.northbound.commons,
+                            org.opendaylight.controller.northbound.commons.exception,
+                            org.opendaylight.controller.northbound.commons.utils,
+                            org.opendaylight.controller.networkconfig.neutron,
+                            org.eclipse.persistence.jaxb.rs,
+                            com.sun.jersey.spi.container.servlet,
+                            javax.ws.rs,
+                            javax.ws.rs.ext,
+                            javax.ws.rs.core,
+                            javax.xml.bind.annotation,
+                            javax.xml.bind,
+                            org.slf4j,
+                            !org.codehaus.enunciate.jaxrs</Import-Package>
+            <Web-ContextPath>/controller/nb/v2/neutron</Web-ContextPath>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.enunciate</groupId>
+        <artifactId>maven-enunciate-plugin</artifactId>
+      </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>
+
+  <distributionManagement>
+    <!-- OpenDayLight Released artifact -->
+    <repository>
+      <id>opendaylight-release</id>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>
+    </repository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <snapshotRepository>
+      <id>opendaylight-snapshot</id>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
+    </snapshotRepository>
+    <!-- Site deployment -->
+    <site>
+      <id>website</id>
+      <url>${sitedeploy}</url>
+    </site>
+  </distributionManagement>
+</project>
OpenDaylight controller