Do not repackage jung2

odlparent provides a feature packaging jung2, take advantage
of that instead of repackaging the bundles here.

Change-Id: Idfea505490702a6c5f3fa6538369b56d2f426d27
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/nemo-features/odl-nemo-engine/pom.xml b/nemo-features/odl-nemo-engine/pom.xml
index 3e8cc78d78c91a7fd73346c6d044086a6eb0d3c0..041186be3e54c087e63288ca294f5776bb2de6eb 100644 (file)
--- a/nemo-features/odl-nemo-engine/pom.xml
+++ b/nemo-features/odl-nemo-engine/pom.xml
@@ -26,6 +26,12 @@
     <name>OpenDaylight :: NEMO :: Engine</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-jung-2.1</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>

diff --git a/nemo-features/odl-nemo-engine/src/main/feature/feature.xml b/nemo-features/odl-nemo-engine/src/main/feature/feature.xml
index 23bbb3c0b0ccf7fd6bbb1175dbad8bd03bccecbb..b3030cec3e262f153737776736b849840d04bde2 100644 (file)
--- a/nemo-features/odl-nemo-engine/src/main/feature/feature.xml
+++ b/nemo-features/odl-nemo-engine/src/main/feature/feature.xml
@@ -6,7 +6,8 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<features name="odl-nemo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="odl-nemo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
     <feature name="odl-nemo-engine" version="${project.version}">
+        <feature version="[3.0.0,4)">odl-jung-2.1</feature>
     </feature>
 </features>