Migrate odl-woodstox to template

Use a template instead of auto-generated feature.

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

diff --git a/features/odl-woodstox/pom.xml b/features/odl-woodstox/pom.xml
index d990d8139194fac51b7de3e5848edf5df0ec213d..21a086e5a7732c3b093ecf772fbe91d530919d9e 100644 (file)
--- a/features/odl-woodstox/pom.xml
+++ b/features/odl-woodstox/pom.xml
@@ -13,27 +13,20 @@
 
     <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-woodstox</artifactId>
-    <version>13.0.11-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Woodstox</name>
     <description>Woodstox StAX</description>
 
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-stax2-api</artifactId>
             <classifier>features</classifier>
             <type>xml</type>

diff --git a/features/odl-woodstox/src/main/feature/template.xml b/features/odl-woodstox/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..d9de29f
--- /dev/null
+++ b/features/odl-woodstox/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-woodstox">
+    <repository>mvn:org.opendaylight.odlparent/odl-stax2-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-woodstox">
+        <feature version="{{semVerRange}}">odl-stax2-api</feature>
+        <bundle>mvn:com.fasterxml.woodstox/woodstox-core/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-woodstox/src/main/history/dependencies.xml b/features/odl-woodstox/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index b80a3ff..0000000
--- a/features/odl-woodstox/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-woodstox">
-    <feature version="0.0.0">
-        <feature>odl-stax2-api</feature>
-        <bundle>mvn:com.fasterxml.woodstox/woodstox-core/6.6.0</bundle>
-    </feature>
-</features>