BUG-4869: use odl-lmax feature 22/33822/2
authorRobert Varga <rovarga@cisco.com>
Sun, 31 Jan 2016 00:43:58 +0000 (01:43 +0100)
committerRobert Varga <rovarga@cisco.com>
Sun, 31 Jan 2016 07:37:53 +0000 (08:37 +0100)
Removes direct declaration of lmax version, pulling in odl-feature from
odlparent instead.

Change-Id: I52ca9433e25efc42159ee8929837f1b0d6f7292b
Signed-off-by: Robert Varga <rovarga@cisco.com>
features/mdsal/pom.xml
features/mdsal/src/main/features/features.xml
opendaylight/commons/opendaylight/pom.xml

index a60d8a4..8c56885 100644 (file)
 
   <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>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
   <dependencies>
 
     <!-- Required features repositories -->
+    <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>
index ebfdad9..e8821f2 100644 (file)
@@ -4,6 +4,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>
 
     <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
@@ -35,9 +36,9 @@
         <feature version='${project.version}'>odl-mdsal-common</feature>
         <feature version='${config.version}'>odl-config-startup</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
+        <feature version='[3.3.0,4.0.0)'>odl-lmax</feature>
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
-        <bundle>mvn:com.lmax/disruptor/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-core-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-core-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-broker-impl/{{VERSION}}</bundle>
index 0dc9ba5..d87e8ee 100644 (file)
         <version>${codahale.metrics.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.lmax</groupId>
-        <artifactId>disruptor</artifactId>
-        <version>3.3.0</version>
-      </dependency>
-
       <!-- 3rd party dependencies needed by config-->
       <dependency>
         <groupId>org.apache.maven</groupId>