Bump MRI projects

[netvirt.git] / elanmanager / impl / pom.xml

diff --git a/elanmanager/impl/pom.xml b/elanmanager/impl/pom.xml
index d056ca09fd9f7238aeb0a38311587fad68937ab0..aff891b80c4bb3a32e12d1170aa92cc21a7b8ffe 100644 (file)
--- a/elanmanager/impl/pom.xml
+++ b/elanmanager/impl/pom.xml
@@ -6,13 +6,12 @@ All rights reserved. This program and the accompanying materials are made
 available under the terms of the Eclipse Public License v1.0 which accompanies
 this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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">
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../../commons/binding-parent</relativePath>
     </parent>
 
@@ -21,12 +20,26 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>4.2.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>elanmanager-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>interfacemanager-api</artifactId>
@@ -38,9 +51,8 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.genius</groupId>
+            <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>${genius.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -48,14 +60,12 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.genius</groupId>
+            <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>srm-api</artifactId>
-            <version>${genius.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>diagstatus-api</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
@@ -63,20 +73,11 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.cdi</groupId>
-            <artifactId>pax-cdi-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>neutronvpn-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>hwvtepsouthbound-api</artifactId>
@@ -120,17 +121,29 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-nicira</artifactId>
-            <version>${openflowplugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>${openflowplugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
-            <version>${openflowplugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-maven-plugin-annotation</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>inject</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <!-- Only for unit-test -->
@@ -152,16 +165,9 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -184,26 +190,20 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>metrics-impl-test</artifactId>
-            <version>${infrautils.version}</version>
+            <version>1.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>${infrautils.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-testutils</artifactId>
-            <version>${infrautils.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.infrautils</groupId>
           <artifactId>caches-test</artifactId>
-          <version>${infrautils.version}</version>
-          <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -272,15 +272,14 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-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>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <failOnError>false</failOnError>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>