Convert odl-apache-commons-text to a template feature

Rather than generating this feature, lock it in as a template.

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

diff --git a/features/odl-apache-commons-text/pom.xml b/features/odl-apache-commons-text/pom.xml
index fc4b49e1bee2dc9becd5ca5bb4ced3dc887ebf45..6cefae6074a5df424ac1eea53c11727d4d6c1fce 100644 (file)
--- a/features/odl-apache-commons-text/pom.xml
+++ b/features/odl-apache-commons-text/pom.xml
@@ -13,24 +13,17 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.0.11-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
+        <relativePath>../../template-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odl-apache-commons-text</artifactId>
-    <version>13.0.11-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Apache Commons Text</name>
     <description>Apache commons-text</description>
 
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>

diff --git a/features/odl-apache-commons-text/src/main/feature/template.xml b/features/odl-apache-commons-text/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..9eb43b4
--- /dev/null
+++ b/features/odl-apache-commons-text/src/main/feature/template.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-apache-commons-text">
+    <repository>mvn:org.opendaylight.odlparent/odl-apache-commons-lang3/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-apache-commons-text">
+        <feature version="{{semVerRange}}">odl-apache-commons-lang3</feature>
+        <bundle>mvn:org.apache.commons/commons-text/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

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