Convert features to template-feature-parent

We are getting warnings from maven-install-plugin for our feature
artifacts. Migrate them to template-feature-parent, which does not have
this problem.

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

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index 642826357b0373fd4204cabb77f44fc1899e96d1..00e6d2fe7bf4bbab13a3910ec69e2c4ee07bbb72 100644 (file)
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 2317ded..0000000
--- a/features/odl-yangtools-codec/src/main/feature/feature.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.4.0" name="odl-yangtools-codec">
-    <feature name="odl-yangtools-codec">
-        <feature version="[12,14)">odl-gson</feature>
-        <feature version="[12,14)">odl-stax2-api</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-codec/src/main/feature/template.xml b/features/odl-yangtools-codec/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..b1be1d1
--- /dev/null
+++ b/features/odl-yangtools-codec/src/main/feature/template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-codec">
+    <repository>mvn:org.opendaylight.odlparent/odl-gson/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.odlparent/odl-stax2-api/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-data/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-codec">
+        <feature version="[12,14)">odl-gson</feature>
+        <feature version="[12,14)">odl-stax2-api</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-data</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-binfmt/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-xml/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 3b232e773b5eab73138c27a8e86b7ffe39e2b204..bf526eed9fd0ff31bddd4e2d0031fdd85b1a9f35 100644 (file)
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-common/src/main/feature/template.xml b/features/odl-yangtools-common/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..6af9533
--- /dev/null
+++ b/features/odl-yangtools-common/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-yangtools-common">
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-util/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-common">
+        <feature version="{{semVerRange}}">odl-yangtools-util</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-common/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index faab412ae42369f067821ed25b68a9155a8b6ced..9e531dd4b278f443b56abb0b7fca9c315178681d 100644 (file)
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-data-api/src/main/feature/template.xml b/features/odl-yangtools-data-api/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..c23435a
--- /dev/null
+++ b/features/odl-yangtools-data-api/src/main/feature/template.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-data-api">
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-parser-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-data-api">
+        <feature version="{{semVerRange}}">odl-yangtools-parser-api</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-spi/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-tree-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-tree-spi/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-util/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 2628dc397268515e5af7788c21ca9e5d5584053e..3ddccc493d0634029ae8e301967975e43d753b77 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 1fa8f7d..0000000
--- a/features/odl-yangtools-data/src/main/feature/feature.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.4.0" name="odl-yangtools-data">
-    <feature name="odl-yangtools-data">
-        <feature version="[12,14)">odl-antlr4</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-data/src/main/feature/template.xml b/features/odl-yangtools-data/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..cefe282
--- /dev/null
+++ b/features/odl-yangtools-data/src/main/feature/template.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-data">
+    <repository>mvn:org.opendaylight.odlparent/odl-antlr4/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-data-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-data">
+        <feature version="[12,14)">odl-antlr4</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-data-api</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-tree-ri/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-transform/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 6466a679a6c7b1d7412c784b678521cbc28a8907..40c1eb4ee931f65debb5d0b21cf9861d43814784 100644 (file)
--- a/features/odl-yangtools-export/pom.xml
+++ b/features/odl-yangtools-export/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-export/src/main/feature/template.xml b/features/odl-yangtools-export/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..e8aa3c4
--- /dev/null
+++ b/features/odl-yangtools-export/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-yangtools-export">
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-parser-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-export">
+        <feature version="{{semVerRange}}">odl-yangtools-parser-api</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-export/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index eb7dd2a15f3d1a8c39a73da54a9312b0953df351..aad09ff493066d2d4acc1247459b5f8b623e9773 100644 (file)
--- a/features/odl-yangtools-netty/pom.xml
+++ b/features/odl-yangtools-netty/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-netty/src/main/feature/feature.xml b/features/odl-yangtools-netty/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 17da355..0000000
--- a/features/odl-yangtools-netty/src/main/feature/feature.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.4.0" name="odl-yangtools-netty">
-    <feature name="odl-yangtools-netty">
-        <feature version="[12,14)">odl-netty-4</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-netty/src/main/feature/template.xml b/features/odl-yangtools-netty/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..e28d191
--- /dev/null
+++ b/features/odl-yangtools-netty/src/main/feature/template.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-netty">
+    <repository>mvn:org.opendaylight.odlparent/odl-netty-4/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-common/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-netty">
+        <feature version="[12,14)">odl-netty-4</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-common</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-common-netty/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 39642bf0436c175af3000c66f76176c361f3679f..08e12ff806bdb77831b4ad39b4fb625db83999de 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>
@@ -88,6 +88,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc8819-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-ir</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>

diff --git a/features/odl-yangtools-parser-api/src/main/feature/template.xml b/features/odl-yangtools-parser-api/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..7f82572
--- /dev/null
+++ b/features/odl-yangtools-parser-api/src/main/feature/template.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-parser-api">
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-common/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-xpath-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-parser-api">
+        <feature version="{{semVerRange}}">odl-yangtools-common</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-xpath-api</feature>
+        <bundle>mvn:org.opendaylight.yangtools/odlext-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/openconfig-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6241-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6536-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6643-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc7952-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8040-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8528-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8639-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8819-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-spi/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-ir/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-util/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-repo-api/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-repo-spi/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 7cdf7d8e83f85f25aa4075097c9cc37091562b52..6ec511478f1126b4a6332543c294e8d851219dc9 100644 (file)
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>
@@ -94,6 +94,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc8639-parser-support</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>rfc8819-parser-support</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>

diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 5a3a90f..0000000
--- a/features/odl-yangtools-parser/src/main/feature/feature.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.4.0" name="odl-yangtools-parser">
-    <feature name="odl-yangtools-parser">
-        <feature version="[12,14)">odl-antlr4</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-parser/src/main/feature/template.xml b/features/odl-yangtools-parser/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..b8553d7
--- /dev/null
+++ b/features/odl-yangtools-parser/src/main/feature/template.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-parser">
+    <repository>mvn:org.opendaylight.odlparent/odl-antlr4/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-parser-api/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-xpath/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-parser">
+        <feature version="[12,14)">odl-antlr4</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-parser-api</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-xpath</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-ri/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/odlext-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/openconfig-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6241-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6536-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc6643-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc7952-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8040-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8528-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8639-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-impl/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/rfc8819-parser-support/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-reactor/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-rfc7950/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-spi/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-repo-fs/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index fa43a7f47cc11bb81f14969bd2d15d72048fa6d0..6b01f54e1dde2f1c2f4400ff76bfe886111ac37c 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml
deleted file mode 100644 (file)
index c360bb2..0000000
--- a/features/odl-yangtools-util/src/main/feature/feature.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.4.0" name="odl-yangtools-util">
-    <feature name="odl-yangtools-util">
-        <feature version="[13,14)">odl-guava</feature>
-        <feature version="[1,2)">pt-triemap</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-util/src/main/feature/template.xml b/features/odl-yangtools-util/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..d9d0792
--- /dev/null
+++ b/features/odl-yangtools-util/src/main/feature/template.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-util">
+    <repository>mvn:org.opendaylight.odlparent/odl-guava/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:tech.pantheon.triemap/pt-triemap/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-util">
+        <feature version="[13,14)">odl-guava</feature>
+        <feature version="[1,2)">pt-triemap</feature>
+        <bundle>mvn:org.opendaylight.yangtools/concepts/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/util/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index 9aa0b949f5d2c0d019cb0654fe023c63485ae5ce..b35588d059bd52f40a65ac045fff80b24cd4dd75 100644 (file)
--- a/features/odl-yangtools-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-xpath-api/src/main/feature/template.xml b/features/odl-yangtools-xpath-api/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..e089887
--- /dev/null
+++ b/features/odl-yangtools-xpath-api/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-yangtools-xpath-api">
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-common/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-xpath-api">
+        <feature version="{{semVerRange}}">odl-yangtools-common</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-xpath-api/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 9b2a69342a86fa38144ff9bc8fe615b837fdf94d..40e333b0d40354552211631fea63fea390d8d924 100644 (file)
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>template-feature-parent</artifactId>
         <version>13.1.2</version>
         <relativePath/>
     </parent>

diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 5905dc0..0000000
--- a/features/odl-yangtools-xpath/src/main/feature/feature.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.4.0" name="odl-yangtools-xpath">
-    <feature name="odl-yangtools-xpath">
-        <feature version="[12,14)">odl-antlr4</feature>
-    </feature>
-</features>

diff --git a/features/odl-yangtools-xpath/src/main/feature/template.xml b/features/odl-yangtools-xpath/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..aa275fc
--- /dev/null
+++ b/features/odl-yangtools-xpath/src/main/feature/template.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-yangtools-xpath">
+    <repository>mvn:org.opendaylight.odlparent/odl-antlr4/{{versionAsInProject}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/odl-yangtools-xpath-api/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-yangtools-xpath">
+        <feature version="[12,14)">odl-antlr4</feature>
+        <feature version="{{semVerRange}}">odl-yangtools-xpath-api</feature>
+        <bundle>mvn:org.opendaylight.yangtools/yang-xpath-impl/{{versionAsInProject}}</bundle>
+    </feature>
+</features>