Use GuicedEE for javax.inject

[openflowplugin.git] / applications / arbitratorreconciliation / impl / pom.xml

diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index 35bac9f93c4caaa1448f8e6663e76144daf773bf..ea35f72b4775ecdc3769a883e3d03a8b757062b1 100644 (file)
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>applications</artifactId>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.13.0-SNAPSHOT</version>
+        <relativePath>../../../parent</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>arbitratorreconciliation-impl</artifactId>
@@ -18,26 +16,39 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>arbitratorreconciliation-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>upgrade</artifactId>
-            <version>${serviceutils.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-maven-plugin-annotation</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <!-- 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>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>blueprint-maven-plugin</artifactId>
                 <configuration>
-                    <failOnError>false</failOnError>
+                    <scanPaths>
+                        <scanPath>org.opendaylight.openflowplugin.applications.arbitratorreconciliation</scanPath>
+                    </scanPaths>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
-</project>
\ No newline at end of file
+</project>