X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fstatistics%2Fpom.xml;h=95410b0d3a34a4a879e0fde3f3ed00561c495992;hp=a40c201379fb2f464a319ae91c2de571a02d4c51;hb=0ae12c54560ef14cb8c08beef4553f7523d41578;hpb=29f7cfb54b580928c7feac63abce028a7014b0d5

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index a40c201379..95410b0d3a 100644
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -4,13 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  
-  <groupId>org.opendaylight.controller</groupId>
+  <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>
+
   <artifactId>statistics.northbound</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -22,54 +27,54 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>${sal.version}</version>
           </dependency>
         </dependencies>
-      </plugin>        
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
             <Export-Package>
             </Export-Package>
-            <Import-Package>
-			  org.opendaylight.controller.forwardingrulesmanager,
-			  org.opendaylight.controller.sal.action,
-			  org.opendaylight.controller.sal.core,
-			  org.opendaylight.controller.sal.flowprogrammer,
-			  org.opendaylight.controller.sal.match,
-			  org.opendaylight.controller.sal.packet,
-			  org.opendaylight.controller.sal.reader,
-			  org.opendaylight.controller.sal.utils,
-			  org.opendaylight.controller.containermanager,
-			  org.opendaylight.controller.statisticsmanager,
-			  org.opendaylight.controller.switchmanager,
-			  org.apache.commons.logging,
-              com.sun.jersey.spi.container.servlet,
-              org.opendaylight.controller.northbound.commons,
-              org.opendaylight.controller.northbound.commons.exception,
-              com.sun.jersey.spi.spring.container.servlet,
-              org.springframework.web.context,
-              org.springframework.web,
-              org.springframework.web.servlet,
-              org.springframework.web.filter,
-              org.springframework.security.config,
-              org.springframework.security.web.authentication,
-              org.springframework.security.web.authentication.www,
-              javax.ws.rs,
-              javax.ws.rs.core,
-              javax.xml.bind.annotation,
-              javax.xml.bind,
-              org.slf4j,
-              !org.codehaus.enunciate.jaxrs
-            </Import-Package>
+              <Import-Package>
+                org.opendaylight.controller.forwardingrulesmanager,
+                org.opendaylight.controller.sal.action,
+                org.opendaylight.controller.sal.core,
+                org.opendaylight.controller.sal.flowprogrammer,
+                org.opendaylight.controller.sal.match,
+                org.opendaylight.controller.sal.packet,
+                org.opendaylight.controller.sal.reader,
+                org.opendaylight.controller.sal.utils,
+                org.opendaylight.controller.containermanager,
+                org.opendaylight.controller.statisticsmanager,
+                org.opendaylight.controller.usermanager,
+                org.opendaylight.controller.switchmanager,
+                org.opendaylight.controller.sal.authorization,
+                org.apache.commons.logging,
+                com.sun.jersey.spi.container.servlet,
+                org.opendaylight.controller.northbound.commons,
+                org.opendaylight.controller.northbound.commons.exception,
+                org.opendaylight.controller.northbound.commons.utils,
+                javax.ws.rs,
+                javax.ws.rs.core,
+                javax.xml.bind.annotation,
+                javax.xml.bind,
+                org.slf4j,
+                org.apache.catalina.filters,
+                com.fasterxml.jackson.jaxrs.base,
+                com.fasterxml.jackson.jaxrs.json,
+                !org.codehaus.enunciate.jaxrs
+              </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/statistics</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/statistics</Web-ContextPath>
+            <Jaxrs-Resources>,${classes;ANNOTATION;javax.ws.rs.Path}</Jaxrs-Resources>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -78,58 +83,31 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>containermanager</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${containermanager.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>statisticsmanager</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${statisticsmanager.version}</version>
     </dependency>
-	<dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
-	</dependency> 
-	
-	<dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-      <version>1.17-SNAPSHOT</version>
+      <version>${sal.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>${commons.northbound.version}</version>
     </dependency>
-    
-	<dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>commons.northbound</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
-        
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>${spring.version}</version>
-		<scope>provided</scope>
-	</dependency>
-
-	<dependency>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-config</artifactId>
-		<version>${spring-security.version}</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-web</artifactId>
-		<version>${spring-security.version}</version>
-		<scope>provided</scope>
-	</dependency>
-        
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-	
-	
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>