Exclude jsr305 from guava-testlib

[odlparent.git] / odlparent-artifacts / pom.xml

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 315fb326315ccf54758ef1cef69c7932c4bd82ee..8b11b59f9a86da593ae85dfda61a700ac1b56827 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../odlparent-lite/pom.xml</relativePath>
     </parent>
 
@@ -30,6 +30,12 @@
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>opendaylight-karaf-empty</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
@@ -54,7 +60,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-akka-clustering-2.4</artifactId>
+                <artifactId>odl-akka-clustering-2.5</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -68,7 +74,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-akka-persistence-2.4</artifactId>
+                <artifactId>odl-akka-persistence-2.5</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -82,35 +88,42 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-akka-system-2.4</artifactId>
+                <artifactId>odl-akka-system-2.5</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-guava-22</artifactId>
+                <artifactId>odl-guava-23</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-lmax-3</artifactId>
+                <artifactId>odl-javassist-3</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-netty-4</artifactId>
+                <artifactId>odl-jung-2.1</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-lmax-3</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-triemap-0.2</artifactId>
+                <artifactId>odl-netty-4</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -150,10 +163,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.1</version>
-                </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.0.2</version>
@@ -162,10 +171,6 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.0.1</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>