Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 447214b5d551948863d33fc5cc1629580f9cd0db..6c0c2cfbe2f602a0e29d056d9ebfea943132c565 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -17,7 +17,6 @@
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.odlparent</groupId>
   <artifactId>odlparent</artifactId>
   <packaging>pom</packaging>
   <name>ODL :: odlparent :: ${project.artifactId}</name>
@@ -120,7 +119,7 @@
     <!-- Used by persistence, snmp4sdn; see also affinity, toolkit -->
     <slf4j.version>1.7.12</slf4j.version>
 
-    <akka.version>2.4.3</akka.version>
+    <akka.version>2.4.4</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>8</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
@@ -284,12 +283,12 @@
       <dependency>
         <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
         <artifactId>jersey-guava</artifactId>
-        <version>2.8</version>
+        <version>2.22.2</version>
       </dependency>
       <dependency>
         <groupId>com.eclipsesource.jaxrs</groupId>
         <artifactId>jersey-all</artifactId>
-        <version>2.8</version>
+        <version>2.22.2</version>
       </dependency>
 
       <!-- servlet 3.x support -->
@@ -610,11 +609,13 @@
         <artifactId>netty-transport</artifactId>
         <version>4.0.36.Final</version>
       </dependency>
+      <!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
+      platform and we can't require the build platform to have an implementation (e.g. OS X) -->
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
+        <classifier>linux-x86_64</classifier>
         <version>4.0.36.Final</version>
-        <classifier>${os.detected.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -731,6 +732,11 @@
         <artifactId>org.apache.felix.fileinstall</artifactId>
         <version>3.1.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.metatype</artifactId>
+        <version>1.1.2</version>
+      </dependency>
       <!-- felix webconsole -->
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -1067,14 +1073,6 @@
   </dependencyManagement>
 
   <build>
-    <extensions>
-      <extension>
-        <groupId>kr.motd.maven</groupId>
-        <artifactId>os-maven-plugin</artifactId>
-        <version>1.5.0.Final</version>
-      </extension>
-    </extensions>
-
     <pluginManagement>
       <plugins>
         <!-- Official maven plugins, alpha-sorted by artifactId.
@@ -1359,6 +1357,20 @@
                     <execute/>
                   </action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <versionRange>[0.7.0,)</versionRange>
+                    <goals>
+                      <goal>prepare-agent</goal>
+                      <goal>report</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>