Code Review / netconf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Cleanup features
[netconf.git] / features / netconf / src / main / features / features.xml
diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/features/features.xml
similarity index 69%
rename from features/netconf/src/main/resources/features.xml
rename to features/netconf/src/main/features/features.xml
index bb5945068fa68a4be1c2c2085be2e2b93010b9e6..13ccf485d1ac6ac26f52906cc43355a4fecc23f5 100644 (file)
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -3,9 +3,9 @@
 <features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.controller/features-protocol-framework/${protocol-framework.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-config-persister/${config.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
   <!-- FIXME: This introduces cycle between projects, which makes version updates
               harder. Should be moved to different.
       -->
@@ -25,33 +25,33 @@
   <feature name='odl-netconf-api' version='${project.version}' description="OpenDaylight :: Netconf :: API">
     <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
     <!-- FIXME: Reference YANGTools via feateure instead of bundles -->
-    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${yangtools.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-util/${config.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/netconf-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/netconf-auth/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/ietf-netconf/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-notifications/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring-extension/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.mdsal.model/ietf-inet-types/${ietf-inet-types.version}</bundle>
-    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types/${ietf-yang-types.version}</bundle>
+    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-util/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/ietf-netconf/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-notifications/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring-extension/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-inet-types/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types-20130715/2013.07.15.8-SNAPSHOT</bundle>
   </feature>
 
   <feature name='odl-netconf-mapping-api' version='${project.version}' description="OpenDaylight :: Netconf :: Mapping API">
     <feature version='${project.version}'>odl-netconf-api</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-mapping-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-mapping-api/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-util' version='${project.version}'>
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
-    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${yangtools.version}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools/yang-data-api/${yangtools.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/netconf-util/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-util/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-impl' version='${project.version}' description="OpenDaylight :: Netconf :: Impl">
-    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/${config.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}}</bundle>
     <feature version='${project.version}'>odl-netconf-api</feature>
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
     <feature version='${project.version}'>odl-netconf-util</feature>
@@ -59,62 +59,62 @@
     <!-- Netconf server without config connector is just an empty shell -->
     <feature version='${project.version}'>odl-config-netconf-connector</feature>
     <!-- Netconf will not provide schemas without monitoring -->
-    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/${config.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}}</bundle>
     <feature version='${project.version}'>odl-netconf-monitoring</feature>
     <feature version='${project.version}'>odl-netconf-notifications-impl</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-impl/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-impl/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-config-netconf-connector' version='${project.version}' description="OpenDaylight :: Netconf :: Connector">
-    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/${config.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/${config.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}}</bundle>
     <feature version='${config.version}'>odl-config-manager</feature>
     <feature version='${project.version}'>odl-netconf-netty-util</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-impl/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-impl/{{VERSION}}</bundle>
     <feature version='${project.version}'>odl-netconf-notifications-api</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-impl/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/config-netconf-connector/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-impl/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/config-netconf-connector/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-netty-util' version='${project.version}' description="OpenDaylight :: Netconf :: Netty Util">
     <feature version='${project.version}'>odl-netconf-api</feature>
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
     <feature version='${project.version}'>odl-netconf-util</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-netty-util/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-netty-util/{{VERSION}}</bundle>
     <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
     <bundle>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
-    <bundle>mvn:org.apache.sshd/sshd-core/${sshd-core.version}</bundle>
-    <bundle>mvn:openexi/nagasena/${exi.nagasena.version}</bundle>
-    <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
+    <bundle>mvn:org.apache.sshd/sshd-core/{{VERSION}}</bundle>
+    <bundle>mvn:openexi/nagasena/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-codec/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-transport/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-client' version='${project.version}' description="OpenDaylight :: Netconf :: Client">
     <feature version='${config.version}'>odl-config-all</feature>
     <feature version='${project.version}'>odl-netconf-netty-util</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-client/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/netconf-config-dispatcher/${project.version}</bundle>
-    <configfile finalname='${config.configfile.directory}/${config.netconf.client.configfile}'>mvn:org.opendaylight.netconf/netconf-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.netconf/netconf-client/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-config-dispatcher/{{VERSION}}</bundle>
+    <configfile finalname='${config.configfile.directory}/${config.netconf.client.configfile}'>mvn:org.opendaylight.netconf/netconf-config/{{VERSION}}/xml/config</configfile>
   </feature>
 
   <feature name='odl-netconf-monitoring' version='${project.version}' description="OpenDaylight :: Netconf :: Monitoring">
     <feature version='${project.version}'>odl-netconf-util</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-monitoring/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-monitoring/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-notifications-api' version='${project.version}' description="OpenDaylight :: Netconf :: Notification :: Api">
     <feature version='${config.version}'>odl-config-manager-facade-xml</feature>
     <feature version='${project.version}'>odl-netconf-api</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-api/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-notifications-impl' version='${project.version}' description="OpenDaylight :: Netconf :: Monitoring :: Impl">
     <feature version='${project.version}'>odl-netconf-notifications-api</feature>
     <feature version='${project.version}'>odl-netconf-util</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-impl/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-notifications-impl/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-ssh' version='${project.version}' description="OpenDaylight :: Netconf Connector :: SSH">
@@ -123,43 +123,43 @@
                 harder. Should be moved to different.
     -->
     <feature version='${project.version}'>odl-aaa-netconf-plugin</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-ssh/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-ssh/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-netconf-tcp' version='${project.version}' description="OpenDaylight :: Netconf Connector :: TCP">
     <feature version='${project.version}'>odl-netconf-impl</feature>
     <feature version='${config.version}'>odl-config-netty</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-tcp/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-tcp/{{VERSION}}</bundle>
   </feature>
 
-  <feature name='odl-netconf-mdsal' version='${controller.mdsal.version}' description="OpenDaylight :: Netconf :: Mdsal">
+  <feature name='odl-netconf-mdsal' version='${project.version}' description="OpenDaylight :: Netconf :: Mdsal">
     <feature version='${config.version}'>odl-config-all</feature>
     <feature version='${config.version}'>odl-config-netty</feature>
     <feature version='${project.version}'>odl-netconf-all</feature>
     <feature version='${project.version}'>odl-netconf-tcp</feature>
     <feature version='${project.version}'>odl-netconf-ssh</feature>
     <feature version='${project.version}'>odl-netconf-client</feature>
-    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-notification/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-connector/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-monitoring/${project.version}</bundle>
-    <configfile finalname='${config.configfile.directory}/${config.netconf.mdsal.configfile}'>mvn:org.opendaylight.netconf/netconf-mdsal-config/${project.version}/xml/config</configfile>
+    <feature version='${controller.sal.version}'>odl-mdsal-broker</feature>
+    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-notification/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-connector/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-monitoring/{{VERSION}}</bundle>
+    <configfile finalname='${config.configfile.directory}/${config.netconf.mdsal.configfile}'>mvn:org.opendaylight.netconf/netconf-mdsal-config/{{VERSION}}/xml/config</configfile>
   </feature>
 
   <feature name='odl-aaa-netconf-plugin' description='OpenDaylight :: AAA :: ODL NETCONF Plugin'
            version='${project.version}'>
     <feature version='${config.version}'>odl-config-api</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-auth/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
     <feature version='${aaa.version}'>odl-aaa-authn</feature>
-    <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-aaa-netconf-plugin-no-cluster'
            description='OpenDaylight :: AAA :: ODL NETCONF Plugin - NO CLUSTER'
            version='${project.version}'>
     <feature version='${config.version}'>odl-config-api</feature>
-    <bundle>mvn:org.opendaylight.netconf/netconf-auth/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
     <feature version='${aaa.version}'>odl-aaa-authn-no-cluster</feature>
-    <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/{{VERSION}}</bundle>
   </feature>
 </features>
Netconf