X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=8c3b412ab7fba44f343f50e82c23ac69dfffac35;hb=3b8a0b31dbe283fe37218dae2b997dd293283752;hp=68cc4e8099dc59b4bcc4a04959fb2435be550120;hpb=379a7a67d4754c4b11d8e1fac77cb2a4c17bd587;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 68cc4e809..8c3b412ab 100644
--- 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>
@@ -88,10 +87,6 @@
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
     <bouncycastle.version>1.54</bouncycastle.version>
-    <!-- To upgrade to 2.6.0, we need to ensure all downstreams pull in javax.validation first
-         http://stackoverflow.com/questions/28568154/how-to-get-eclipselink-2-6-0-m3-working-with-jersey-1-18-3 -->
-    <!-- Used by neutron -->
-    <eclipse.persistence.version>2.5.2</eclipse.persistence.version>
     <!-- Used by persistence, snmp4sdn; see also didm -->
     <guava.version>18.0</guava.version>
     <!-- Used by alto; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp -->
@@ -124,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>
@@ -614,6 +609,14 @@
         <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>
+      </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>jsr311-api</artifactId>
@@ -768,20 +771,23 @@
         <artifactId>servlet</artifactId>
         <version>1.0.0-v20070606</version>
       </dependency>
+      <!-- To upgrade org.eclipse.persistence dependencies to 2.6.0+, we need to ensure all downstreams consumers
+         pull in javax.validation first:
+         http://stackoverflow.com/questions/28568154/how-to-get-eclipselink-2-6-0-m3-working-with-jersey-1-18-3 -->
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.antlr</artifactId>
-        <version>${eclipse.persistence.version}</version>
+        <version>2.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.core</artifactId>
-        <version>${eclipse.persistence.version}</version>
+        <version>2.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.moxy</artifactId>
-        <version>${eclipse.persistence.version}</version>
+        <version>2.5.2</version>
       </dependency>
       <dependency>
         <groupId>javax.validation</groupId>
@@ -1107,6 +1113,7 @@
               <phase>process-sources</phase>
               <configuration>
                 <configLocation>check-license.xml</configLocation>
+                <headerLocation>EPL-LICENSE.regexp.txt</headerLocation>
                 <includeResources>false</includeResources>
                 <includeTestResources>false</includeTestResources>
                 <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
@@ -1346,6 +1353,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>
@@ -1481,6 +1502,16 @@
           </reportSet>
         </reportSets>
       </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>http://doc.akka.io/japi/akka/${akka.version}/</link>
+            <link>https://google.github.io/guava/releases/${guava.version}/api/docs/</link>
+            <link>http://netty.io/4.0/api/</link>
+          </links>
+        </configuration>
+      </plugin>
     </plugins>
   </reporting>