BUG 4869: Unify lmax versions in ODL.

- added lmax disruptor to dependency management
- introduced odl-lmax feature

Change-Id: I631ef892d155c860d9afabfab0b4fe6c13f786b3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit f0ad6aab8182a3d67e9208269a9ca8f3e71e2bb2)

diff --git a/features-odlparent/pom.xml b/features-odlparent/pom.xml
index ce2efa585694fccd455f6c5f9bbddfc5f6533eb2..7aac84b979d3d0612a308c48a1ee9de32cd8c846 100644 (file)
--- a/features-odlparent/pom.xml
+++ b/features-odlparent/pom.xml
@@ -46,5 +46,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+
+        <!-- odl-lmax -->
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features-odlparent/src/main/features/features.xml b/features-odlparent/src/main/features/features.xml
index a4ba92428a7ee63e104c49694f2ab172c5c0d7bb..4d3651e60a8b60c8bfeca7724d1cda3dc45f5344 100644 (file)
--- a/features-odlparent/src/main/features/features.xml
+++ b/features-odlparent/src/main/features/features.xml
@@ -14,4 +14,7 @@
     <feature name="odl-guava" description="OpenDaylight :: Guava" version="${guava.version}">
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
     </feature>
+    <feature name="odl-lmax" description="OpenDaylight :: LMAX Disruptor" version="${lmax.version}">
+        <bundle>mvn:com.lmax/disruptor/{{VERSION}}</bundle>
+    </feature>
 </features>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ab1ce49dd4850b878112a8b1ad180dfecf02299a..a2ca20bbe42274b3f4a820f7ba1cf37f39ecd6d3 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -111,6 +111,8 @@
     <gson.version>2.3.1</gson.version>
     <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
     <guava.version>18.0</guava.version>
+    <!-- LMAX Disruptor version -->
+    <lmax.version>3.3.2</lmax.version>
     <!-- Used by lispflowmapping, sxp, vtn/manager -->
     <hamcrest.version>1.3</hamcrest.version>
     <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp -->
@@ -164,6 +166,15 @@
 
   <dependencyManagement>
     <dependencies>
+
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+
       <!-- Testing Dependencies -->
       <dependency>
         <groupId>junit</groupId>
@@ -883,6 +894,13 @@
         <version>1.2.1</version>
       </dependency>
 
+      <!-- LMAX Disruptor -->
+      <dependency>
+        <groupId>com.lmax</groupId>
+        <artifactId>disruptor</artifactId>
+        <version>${lmax.version}</version>
+      </dependency>
+
       <!-- Add Pax Exam -->
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>