Merge "Bug 8502 related: Remove duplicated org.osgi.compendium"
authorMaxime Millette-Coulombe <mmcoulombe@inocybe.com>
Tue, 13 Jun 2017 15:20:31 +0000 (15:20 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 13 Jun 2017 15:20:31 +0000 (15:20 +0000)
1  2 
pom.xml

diff --cc pom.xml
index a6a5d1bb402ba51571083b505b829fb200778c51,49ccea8a4c04c32082ca573e5bccbcfb4ecbf9b4..dc9d0d401e0dcff2a6321f0bb7419f6e21a671f5
+++ b/pom.xml
@@@ -40,8 -43,8 +40,7 @@@
      <feature.dlux.version>0.6.0-SNAPSHOT</feature.dlux.version>
      <feature.flow.version>1.6.0-SNAPSHOT</feature.flow.version>
      <feature.yangtools.version>1.2.0-SNAPSHOT</feature.yangtools.version>
-     <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
      <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
 -    <karaf.empty.version>1.9.0-SNAPSHOT</karaf.empty.version>
    </properties>
  
    <modules>