Migrate odl-servlet-api to template

Use a template instead of auto-generated feature.

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

diff --git a/features/odl-servlet-api/pom.xml b/features/odl-servlet-api/pom.xml
index 871efc14b6cd1c5791c558937880aa801bb44aa2..f6ef6b3cdd5dc96035239ae1bb70eee3e5347d4f 100644 (file)
--- a/features/odl-servlet-api/pom.xml
+++ b/features/odl-servlet-api/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-servlet-api</artifactId>
-    <version>13.0.11-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Servlet API</name>
     <description>Java servlet API 3.1.x</description>
 
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/features/odl-servlet-api/src/main/feature/template.xml b/features/odl-servlet-api/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..de43fb8
--- /dev/null
+++ b/features/odl-servlet-api/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-servlet-api">
+    <feature name="odl-servlet-api">
+        <bundle>mvn:javax.servlet/javax.servlet-api/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-servlet-api/src/main/history/dependencies.xml b/features/odl-servlet-api/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index 14f9aea..0000000
--- a/features/odl-servlet-api/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-servlet-api">
-    <feature version="0.0.0">
-        <bundle>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
-    </feature>
-</features>