From: Tony Tkacik <ttkacik@cisco.com>
Date: Thu, 12 Feb 2015 17:36:39 +0000 (+0000)
Subject: Merge "Do not duplicate OSGi dependencyManagement"
X-Git-Tag: release/lithium~549^2~15
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=83dfe301bf2a2b1eff6883a2af3282c95d5a752e;hp=-c

Merge "Do not duplicate OSGi dependencyManagement"
---

83dfe301bf2a2b1eff6883a2af3282c95d5a752e
diff --combined opendaylight/commons/opendaylight/pom.xml
index 6a9b4bef2a,b20afb8e79..6cc363b96f
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -144,6 -144,7 +144,6 @@@
      <northbound.jolokia.version>1.5.0-SNAPSHOT</northbound.jolokia.version>
      <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
      <osgi-brandfragment.web.version>0.1.0-SNAPSHOT</osgi-brandfragment.web.version>
 -    <pax.exam.version>4.0.0</pax.exam.version>
      <parboiled.version>1.1.6</parboiled.version>
      <parboiled.scala.version>1.1.6</parboiled.scala.version>
      <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
@@@ -207,7 -208,6 +207,7 @@@
      <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
      <sshd-core.version>0.12.0</sshd-core.version>
      <jmh.version>0.9.7</jmh.version>
 +    <lmax.version>3.3.0</lmax.version>
    </properties>
  
    <dependencyManagement>
@@@ -317,12 -317,6 +317,12 @@@
          <artifactId>guava</artifactId>
          <version>${guava.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>com.lmax</groupId>
 +        <artifactId>disruptor</artifactId>
 +        <version>${lmax.version}</version>
 +      </dependency>
 +
        <!-- 3rd party dependencies needed by config-->
        <dependency>
          <groupId>com.jcabi</groupId>
@@@ -1259,16 -1253,6 +1259,6 @@@
          <artifactId>nagasena-rta</artifactId>
          <version>${exi.nagasena.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.compendium</artifactId>
-         <version>${osgi.compendium.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.core</artifactId>
-         <version>${osgi.core.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.reflections</groupId>
          <artifactId>reflections</artifactId>