Merge "Correct NshNpCodec serializer key"

[openflowplugin.git] / test-provider / pom.xml

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index 2df62717b5e616a45de103265830ec5347d67564..4eaa0aa661a099505235a8361e59f9d4ecd5e986 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -3,8 +3,8 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>0.7.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>test-provider</artifactId>
     <packaging>bundle</packaging>
@@ -22,35 +22,27 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
-        </dependency>    
-           <dependency>
-             <groupId>org.opendaylight.controller.model</groupId>
-             <artifactId>model-flow-base</artifactId>
-           </dependency>
-          <dependency>
-             <groupId>org.opendaylight.controller.model</groupId>
-             <artifactId>model-flow-management</artifactId>
-           </dependency>    
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
-               <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
-        </dependency>   
+        </dependency>
         <dependency>
-            <groupId>org.eclipse.xtend</groupId>
-            <artifactId>org.eclipse.xtend.lib</artifactId>
-            <version>${xtend.version}</version>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.10.101.v20150820-1432</version>
         </dependency>
-         <dependency>
-               <groupId>equinoxSDK381</groupId>
-               <artifactId>org.eclipse.osgi</artifactId>
-             </dependency>
-             <dependency>
+        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
           </dependency>
@@ -61,19 +53,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Activator>org.opendaylight.openflowplugin.test.OpenflowpluginTestActivator</Bundle-Activator>
-                        <Embed-Dependency>commons-lang</Embed-Dependency>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>