Merge "Checkstyle enforcer"

[controller.git] / opendaylight / northbound / topology / pom.xml

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index 0cfa487f1c395ad7bcfb88975cb3e16c028101f8..726f7975f0f0f8c9441156cbf8a98886f9faf052 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>topology.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -40,11 +39,14 @@
               org.opendaylight.controller.containermanager,
               org.opendaylight.controller.northbound.commons,
               org.opendaylight.controller.northbound.commons.exception,
+              org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.authorization,
               org.opendaylight.controller.sal.packet.address,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.usermanager,
               org.opendaylight.controller.topologymanager,
               com.sun.jersey.spi.container.servlet,
               javax.ws.rs,
@@ -56,7 +58,8 @@
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
           </instructions>
-          </configuration>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -66,26 +69,26 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>containermanager</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal</artifactId>
-         <version>0.5.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>topologymanager</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>