Update features.xml with new neutron artifact names

Change-Id: Ie7ea03123a394dbd812ee021677a376e2333a0af
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>

diff --git a/features/pom.xml b/features/pom.xml
index 53f717a0c172304244a29be2b9d4e6f5fb1c2925..42f0934b4b8a83743e24c011054e271ed0900a8f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>features-neutron</artifactId>
-  <version>${networkconfig.neutron.version}</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -51,6 +51,7 @@
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>neutron-spi</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 246d9a4e4aae9a870ada62807c91813ac3d9f8c4..08f0782fef99fe637c745a4db3dee00f6dbca9a5 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<features name="odl-neutron-${networkconfig.neutron.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-neutron-${neutron.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.aaa/features-aaa/${aaa.version}/xml/features</repository>
-   <feature name='odl-neutron-service' version='${networkconfig.neutron.version}' description="OpenDaylight :: Neutron :: API">
-    <feature version='${networkconfig.neutron.version}'>odl-neutron-api</feature>
-    <feature version='${networkconfig.neutron.version}'>odl-neutron-northbound</feature>
-    <feature version='${networkconfig.neutron.version}'>odl-neutron-implementation</feature>
+   <feature name='odl-neutron-service' version='${neutron.version}' description="OpenDaylight :: Neutron :: API">
+    <feature version='${neutron.version}'>odl-neutron-spi</feature>
+    <feature version='${neutron.version}'>odl-neutron-northbound-api</feature>
+    <feature version='${neutron.version}'>odl-neutron-transcriber</feature>
   </feature>
-  <feature name='odl-neutron-northbound' version='${networkconfig.neutron.version}' description="OpenDaylight :: Neutron :: Northbound">
+  <feature name='odl-neutron-northbound-api' version='${neutron.version}' description="OpenDaylight :: Neutron :: Northbound">
     <feature version='${aaa.version}'>odl-aaa-authn</feature>
     <feature>war</feature>
-    <feature version='${networkconfig.neutron.version}'>odl-neutron-api</feature>
+    <feature version='${neutron.spi.version}'>odl-neutron-spi</feature>
     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version}</bundle>
     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version}</bundle>
     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipse.persistence.version}</bundle>
-    <bundle>mvn:org.opendaylight.neutron/networkconfig.neutron.northbound/${networkconfig.neutron.northbound.version}</bundle>
+    <bundle>mvn:org.opendaylight.neutron/northbound-api/${neutron.northbound.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
   </feature>
 
-  <feature name='odl-neutron-api' version='${networkconfig.neutron.version}' description="OpenDaylight :: Neutron :: API">
-    <bundle>mvn:org.opendaylight.neutron/networkconfig.neutron/${networkconfig.neutron.version}</bundle>
+  <feature name='odl-neutron-spi' version='${neutron.version}' description="OpenDaylight :: Neutron :: API">
+    <bundle>mvn:org.opendaylight.neutron/neutron-spi/${neutron.spi.version}</bundle>
     <bundle>mvn:commons-net/commons-net/${commons.net.version}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
   </feature>
-  <feature name='odl-neutron-implementation' version='${networkconfig.neutron.version}' description="OpenDaylight :: Neutron :: Implementation">
-    <feature version='${networkconfig.neutron.version}'>odl-neutron-api</feature>
+  <feature name='odl-neutron-transcriber' version='${neutron.version}' description="OpenDaylight :: Neutron :: Implementation">
+    <feature version='${neutron.spi.version}'>odl-neutron-spi</feature>
     <feature>war</feature>
-    <bundle>mvn:org.opendaylight.neutron/networkconfig.neutron.implementation/${networkconfig.neutron.implementation.version}</bundle>
+    <bundle>mvn:org.opendaylight.neutron/transcriber/${neutron.transcriber.version}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
   </feature>
 </features>

diff --git a/pom.xml b/pom.xml
index 1891a1a6be9daaaba74e59ec7f24b4925c8c8b53..434f07ae974c6c46af470e798291ec5fa76b0aa1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,5 +16,6 @@
     <module>neutron-spi</module>
     <module>northbound-api</module>
     <module>transcriber</module>
+    <module>features</module>
   </modules>
 </project>