Migrate to using features-parent

odlparent gives us a convenience parent, so let's use it.

Change-Id: I57c20ce1d1ade81c7d6ae3b0c6fa82eff49ae44c
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 11aa75ddd07db1e64b837ffc58c18fa732560d96..3f35e92f460f6dc2bc782fbc717dbbef4df24b09 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -33,6 +33,11 @@
                 <artifactId>bgp-concepts</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bgp-flowspec</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>bgp-linkstate</artifactId>
@@ -114,12 +119,38 @@
                 <artifactId>bgp-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bgp-controller-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bgp-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bgp-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config-example</classifier>
+            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>data-change-counter</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>data-change-counter-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -214,6 +245,33 @@
                 <artifactId>pcep-tunnel-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-controller-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config-provider</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config-segment</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>programming-api</artifactId>
@@ -246,6 +304,19 @@
                 <artifactId>programming-tunnel-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-controller-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>rsvp-api</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 898c24bddccbecda42e275451fec296ca994b275..b1d5dfc5a8e6efbe34bfe06531db85846bbaa589 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,17 +11,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.bgpcep</groupId>
-        <artifactId>bgpcep-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
-    <artifactId>features-bgp</artifactId>
 
+    <groupId>org.opendaylight.bgpcep</groupId>
+    <artifactId>features-bgp</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
-        <features.file>features.xml</features.file>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
         <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
         <config.version>0.3.0-SNAPSHOT</config.version>
@@ -30,6 +31,58 @@
         <tcpmd5.version>1.1.0-SNAPSHOT</tcpmd5.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- TCP/MD5 support -->
+            <dependency>
+                <groupId>org.opendaylight.tcpmd5</groupId>
+                <artifactId>tcpmd5-artifacts</artifactId>
+                <version>${tcpmd5.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- YANG tools -->
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>${yangtools.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>${config.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>protocol-framework</artifactId>
+                <version>${protocol-framework.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <!-- Testing -->
     <dependencies>
         <dependency>
@@ -37,21 +90,24 @@
             <artifactId>features-yangtools</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-config</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <version>${config.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-config-netty</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -65,114 +121,94 @@
             <artifactId>features-tcpmd5</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <version>${tcpmd5.version}</version>
         </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-concepts</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-linkstate</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-flowspec</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-parser-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-parser-impl</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-parser-spi</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-rib-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-rib-impl</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-rib-spi</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-topology-provider</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>concepts</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>data-change-counter</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config-segment</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config-provider</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config-example</classifier>
       </dependency>
        <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>data-change-counter-controller-config</artifactId>
-          <version>${project.version}</version>
           <type>xml</type>
           <classifier>config</classifier>
       </dependency>
@@ -180,107 +216,86 @@
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-impl</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-segment-routing</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-spi</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-ietf-stateful02</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-ietf-stateful07</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-topology-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-topology-provider</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-topology-spi</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-tunnel-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-tunnel-provider</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-impl</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-spi</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-topology-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-tunnel-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>rsvp-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>topology-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>topology-segment-routing</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>topology-tunnel-api</artifactId>
-          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>util</artifactId>
-          <version>${project.version}</version>
       </dependency>
 
       <dependency>
@@ -297,86 +312,5 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
       </dependency>
-
-      <!-- test to validate features.xml -->
-      <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>features-test</artifactId>
-          <version>${yangtools.version}</version>
-      </dependency>
-
-      <!-- dependency for opendaylight-karaf-empty for use by testing -->
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>opendaylight-karaf-empty</artifactId>
-          <version>${commons.opendaylight.version}</version>
-          <type>zip</type>
-      </dependency>
   </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.yangtools:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
-        <tag>HEAD</tag>
-    </scm>
 </project>

diff --git a/features/src/main/resources/features.xml b/features/src/main/features/features.xml
similarity index 77%
rename from features/src/main/resources/features.xml
rename to features/src/main/features/features.xml
index 732248a288b8bf4a7262918e070d28ab9451602e..78352b38bcd24e5d3e76949f4a76a2d04996591a 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/features/features.xml
@@ -48,14 +48,14 @@
 
     <feature name='odl-bgpcep-dependencies' version='${project.version}'>
         <!--  concepts -->
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->
-        <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
+        <bundle>mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/util/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-data-change-counter' version='${project.version}'>
@@ -63,38 +63,38 @@
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${config.version}'>odl-config-api</feature>
         <configfile finalname="etc/opendaylight/karaf/50-topology-data-change-counter.xml">mvn:org.opendaylight.bgpcep/data-change-counter-controller-config/${project.version}/xml/config</configfile>
-        <bundle>mvn:org.opendaylight.bgpcep/data-change-counter/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/data-change-counter/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-parser' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/{{VERSION}}</bundle>
         <feature version='${config.version}'>odl-config-api</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-impl/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-spi/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-impl/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-rib' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/{{VERSION}}</bundle>
         <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-spi/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-spi/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-linkstate' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-flowspec' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-flowspec/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-flowspec/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-rib-impl' version='${project.version}'>
@@ -103,88 +103,89 @@
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-impl/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-impl/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-topology' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/topology-api/{{VERSION}}</bundle>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-topology-provider/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-topology-provider/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-pcep' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
         <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-spi/${project.version}</bundle>
+        <feature version='${config.version}'>odl-config-netty</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-spi/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/32-pcep.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config</configfile>
     </feature>
 
     <feature name='odl-bgpcep-pcep-impl' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep</feature>
         <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-impl/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-impl/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-programming' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
         <feature version='${config.version}'>odl-config-api</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-tunnel-api/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/30-programming.xml">mvn:org.opendaylight.bgpcep/programming-controller-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.bgpcep/topology-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-spi/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-tunnel-api/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-programming-impl' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-programming</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-impl/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-impl/{{VERSION}}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/30-programming.xml">mvn:org.opendaylight.bgpcep/programming-controller-config/${project.version}/xml/config</configfile>
     </feature>
 
     <feature name='odl-bgpcep-pcep-topology' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep</feature>
         <feature version='${project.version}'>odl-bgpcep-programming</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-spi/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-spi/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-pcep-stateful02' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-topology</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful02/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful02/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-pcep-stateful07' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-topology</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful07/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful07/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-pcep-topology-provider' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-stateful02</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-stateful07</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-provider/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-provider/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/39-pcep-provider.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config-provider</configfile>
     </feature>
 
     <feature name='odl-bgpcep-pcep-tunnel-provider' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-topology-provider</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-provider/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-provider/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-pcep-segment-routing' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-stateful07</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-segment-routing/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-segment-routing/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/33-pcep-segment-routing.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config-segment</configfile>
     </feature>
 </features>