Replace Empty.getInstance() with Empty.value()

[openflowplugin.git] / extension / openflowplugin-extension-nicira / pom.xml

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 0663b55a9ab8d2e4a8bdad4cc9ba2b9d871df9c3..e56befc73e5819bc45ac576e6caa4e95c5f9079b 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -4,29 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-extension-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.14.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-extension-nicira</artifactId>
     <packaging>bundle</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
@@ -53,7 +39,7 @@
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
         <!-- OpenFlowJava-API models -->
@@ -62,16 +48,6 @@
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>