Clean up Apache Commons features

We were missing the dependency-tracking files, and commons-text
depends on commons-lang3 which we need to represent in the feature.

Change-Id: I0ef952688f9589f2385ef919bed2e3d1410d831d
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/odl-akka-all/src/main/history/dependencies.xml b/features/odl-akka-all/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index bbdd831..0000000
--- a/features/odl-akka-all/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-all">
-    <feature version="0.0.0">
-        <feature prerequisite="false" dependency="false">odl-akka-clustering-2.4</feature>
-        <feature prerequisite="false" dependency="false">odl-akka-leveldb-0.7</feature>
-        <feature prerequisite="false" dependency="false">odl-akka-persistence-2.4</feature>
-        <feature prerequisite="false" dependency="false">odl-akka-scala-2.11</feature>
-        <feature prerequisite="false" dependency="false">odl-akka-system-2.4</feature>
-    </feature>
-</features>

diff --git a/features/odl-apache-commons-codec/src/main/history/dependencies.xml b/features/odl-apache-commons-codec/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..1cb9e4d
--- /dev/null
+++ b/features/odl-apache-commons-codec/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-codec">
+    <feature version="0.0.0">
+        <bundle>mvn:commons-codec/commons-codec/1.11</bundle>
+    </feature>
+</features>

diff --git a/features/odl-apache-commons-lang3/src/main/history/dependencies.xml b/features/odl-apache-commons-lang3/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..04d1991
--- /dev/null
+++ b/features/odl-apache-commons-lang3/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-lang3">
+    <feature version="0.0.0">
+        <bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
+    </feature>
+</features>

diff --git a/features/odl-apache-commons-net/src/main/history/dependencies.xml b/features/odl-apache-commons-net/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..b3d26cd
--- /dev/null
+++ b/features/odl-apache-commons-net/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-net">
+    <feature version="0.0.0">
+        <bundle>mvn:commons-net/commons-net/3.6</bundle>
+    </feature>
+</features>

diff --git a/features/odl-apache-commons-text/pom.xml b/features/odl-apache-commons-text/pom.xml
index 086ef346536f0e4a1f46f235ebfd9cee6b7f22b4..a3ec8685a1bbcea198ca9138a62ab67e257dda9d 100644 (file)
--- a/features/odl-apache-commons-text/pom.xml
+++ b/features/odl-apache-commons-text/pom.xml
@@ -31,6 +31,12 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-lang3</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>

diff --git a/features/odl-apache-commons-text/src/main/history/dependencies.xml b/features/odl-apache-commons-text/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..5faf707
--- /dev/null
+++ b/features/odl-apache-commons-text/src/main/history/dependencies.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-apache-commons-text">
+    <feature version="0.0.0">
+        <feature prerequisite="false" dependency="false">odl-apache-commons-lang3</feature>
+        <bundle>mvn:org.apache.commons/commons-text/1.1</bundle>
+    </feature>
+</features>