BUG 4869: Remove lmax version declaration

 - use odl-lmax feature

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Change-Id: I8ce55c70c218441f0186f6089d2d4de51f5919e8

diff --git a/common/features/pom.xml b/common/features/pom.xml
index 9b6a15b3a974d260548d38c66a72aa2c341ad8ee..af330a8dbf8624435e88ad1ea3fbab793f902aef 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -46,6 +46,13 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-odlparent</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>features-yangtools</artifactId>

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index f45cf1ef2f0f3a5d8b53d269b3fe61fa650b6026..9d1c60b80e5245c5438e343cb7785d7837e12519 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -11,6 +11,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
+    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-mdsal-binding' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding'>
@@ -33,11 +34,11 @@
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-spi/{{VERSION}}</bundle>
     </feature>
-    
+
     <feature name='odl-mdsal-dom-broker' version='${project.version}' description='OpenDaylight :: MD-SAL :: DOM Broker'>
         <feature version='${yangtools.version}'>odl-yangtools-yang-parser</feature>
         <feature version='${project.version}'>odl-mdsal-dom-api</feature>
-        <bundle>mvn:com.lmax/disruptor/{{VERSION}}</bundle>
+        <feature version='${lmax.version}'>odl-lmax</feature>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-broker/{{VERSION}}</bundle>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index f40144db867b96f66c270988c1543cf44958d476..a0f15a13075ffddc1467c6af465fcf19f027fc5d 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -102,11 +102,6 @@
                 <artifactId>jersey-client</artifactId>
                 <version>2.0</version>
             </dependency>
-            <dependency>
-              <groupId>com.lmax</groupId>
-              <artifactId>disruptor</artifactId>
-              <version>3.3.2</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>