Migrate odl-javassist-3 to template

Use a template instead of auto-generated feature.

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

diff --git a/features/odl-javassist-3/pom.xml b/features/odl-javassist-3/pom.xml
index 77999b74f6736d69c45a2497fe26a9fe85b61784..3cfd8207253e10f4a10aba31956b92953ee935b6 100644 (file)
--- a/features/odl-javassist-3/pom.xml
+++ b/features/odl-javassist-3/pom.xml
@@ -13,29 +13,21 @@
 
     <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-javassist-3</artifactId>
-    <version>13.0.11-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Javassist</name>
     <description>Javassist</description>
 
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
         </dependency>
     </dependencies>
-
 </project>

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

diff --git a/features/odl-javassist-3/src/main/history/dependencies.xml b/features/odl-javassist-3/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index 48617c2..0000000
--- a/features/odl-javassist-3/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-javassist-3">
-    <feature version="0.0.0">
-        <bundle>mvn:org.javassist/javassist/3.30.2-GA</bundle>
-    </feature>
-</features>