Merge "Make applications/pom.xml an aggregator"

[openflowplugin.git] / applications / forwardingrules-sync / pom.xml

diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml
index 3f298c95e08a182585958bbd94147b09e34efbf5..1c3705c497a125d3a1796687b6b3c967dbf52c6e 100644 (file)
--- a/applications/forwardingrules-sync/pom.xml
+++ b/applications/forwardingrules-sync/pom.xml
@@ -3,22 +3,25 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>forwardingrules-sync</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-api</artifactId>
         </dependency>
 
         <dependency>
@@ -41,11 +44,6 @@
             <artifactId>concepts</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-singleton-common-api</artifactId>
@@ -62,29 +60,18 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -112,14 +99,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
-            <!-- TODO Remove this when we upgrade to odlparent with a fix for ODLPARENT-146 -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <configuration>
-                    <failOnError>false</failOnError>
-                </configuration>
-            </plugin>
         </plugins>
     </build>