Migrate to features-parent

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

diff --git a/features/pom.xml b/features/pom.xml
index 7e7644bbd8b9e77e841335efe4203b8711c37f80..c1cb3d88192817c202408539d349ca08b13e7cfa 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -2,21 +2,39 @@
 <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.l2switch</groupId>
-    <artifactId>l2switch-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
+  <groupId>org.opendaylight.l2switch</groupId>
   <artifactId>features-l2switch</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
   <description> <!-- Provide a Description it will be visible in the shell CLI--> </description>
+
   <properties>
-    <features.file>features.xml</features.file>
+    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <openflow.plugin.version>0.2.0-SNAPSHOT</openflow.plugin.version>
   </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.l2switch</groupId>
+        <artifactId>l2switch-parent</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
@@ -48,168 +66,78 @@
     <dependency>
       <groupId>org.opendaylight.l2switch.packethandler</groupId>
       <artifactId>packethandler-model</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.packethandler</groupId>
       <artifactId>packethandler-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.packethandler</groupId>
       <artifactId>packethandler-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.addresstracker</groupId>
       <artifactId>addresstracker-model</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.addresstracker</groupId>
       <artifactId>addresstracker-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.addresstracker</groupId>
       <artifactId>addresstracker-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.loopremover</groupId>
       <artifactId>loopremover-model</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.loopremover</groupId>
       <artifactId>loopremover-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.loopremover</groupId>
       <artifactId>loopremover-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.hosttracker</groupId>
       <artifactId>hosttracker-model</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.hosttracker</groupId>
       <artifactId>hosttracker-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.hosttracker</groupId>
       <artifactId>hosttracker-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.main</groupId>
       <artifactId>main-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.main</groupId>
       <artifactId>main-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.arphandler</groupId>
       <artifactId>arphandler-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.arphandler</groupId>
       <artifactId>arphandler-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
-
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
-    </dependency>
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.6.0-SNAPSHOT</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>
-        <version>2.16</version>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>1.6.0-SNAPSHOT</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

diff --git a/features/src/main/resources/features.xml b/features/src/main/features/features.xml
similarity index 83%
rename from features/src/main/resources/features.xml
rename to features/src/main/features/features.xml
index 9cd132a89697a8331d75343f5c83526adabd97d5..4bed47affee8c0982c199a98cc9d6fc03e86e3e4 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/features/features.xml
@@ -10,8 +10,8 @@
   </feature>
   <feature name='odl-l2switch-switch' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-hosttracker</feature>
-    <bundle>mvn:org.opendaylight.l2switch.main/main-impl/${project.version}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.l2switchmain.configfile}">mvn:org.opendaylight.l2switch.main/main-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.l2switch.main/main-impl/{{VERSION}}</bundle>
+    <configfile finalname="${config.configfile.directory}/${config.l2switchmain.configfile}">mvn:org.opendaylight.l2switch.main/main-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-switch-rest' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
@@ -25,34 +25,34 @@
   </feature>
   <feature name='odl-l2switch-hosttracker' description="OpenDaylight :: L2Switch :: HostTracker" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-addresstracker</feature>
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-model/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-impl/${project.version}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.hosttracker.configfile}">mvn:org.opendaylight.l2switch.hosttracker/hosttracker-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-model/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-impl/{{VERSION}}</bundle>
+    <configfile finalname="${config.configfile.directory}/${config.hosttracker.configfile}">mvn:org.opendaylight.l2switch.hosttracker/hosttracker-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-addresstracker' description="OpenDaylight :: L2Switch :: AddressTracker" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-arphandler</feature>
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-impl/${project.version}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.addresstracker.configfile}">mvn:org.opendaylight.l2switch.addresstracker/addresstracker-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-impl/{{VERSION}}</bundle>
+    <configfile finalname="${config.configfile.directory}/${config.addresstracker.configfile}">mvn:org.opendaylight.l2switch.addresstracker/addresstracker-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-arphandler' description="OpenDaylight :: L2Switch :: ArpHandler" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-packethandler</feature>
     <feature version="${project.version}">odl-l2switch-loopremover</feature>
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.arphandler/arphandler-impl/${project.version}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.arphandler.configfile}">mvn:org.opendaylight.l2switch.arphandler/arphandler-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.arphandler/arphandler-impl/{{VERSION}}</bundle>
+    <configfile finalname="${config.configfile.directory}/${config.arphandler.configfile}">mvn:org.opendaylight.l2switch.arphandler/arphandler-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-loopremover' description="OpenDaylight :: L2Switch :: LoopRemover" version='${project.version}'>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-flow-services</feature>
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-model/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-impl/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-model/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.controller.thirdparty/net.sf.jung2/2.0.1</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.loopremover.configfile}">mvn:org.opendaylight.l2switch.loopremover/loopremover-config/${project.version}/xml/config</configfile>
+    <configfile finalname="${config.configfile.directory}/${config.loopremover.configfile}">mvn:org.opendaylight.l2switch.loopremover/loopremover-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-packethandler' description="OpenDaylight :: L2Switch :: PacketHandler" version='${project.version}'>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-southbound</feature>
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-model/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-impl/${project.version}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.packethandler.configfile}">mvn:org.opendaylight.l2switch.packethandler/packethandler-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-model/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-impl/{{VERSION}}</bundle>
+    <configfile finalname="${config.configfile.directory}/${config.packethandler.configfile}">mvn:org.opendaylight.l2switch.packethandler/packethandler-config/{{VERSION}}/xml/config</configfile>
   </feature>
 </features>