Switch to features-parent

This allows some properties to be removed (in particular
${guava.version}).

Change-Id: Icee156eef39ae85c7701c66b1be6fc20326d3224
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/pom.xml b/features/pom.xml
index 0235b7c5f2a817292c8fc0fc3effa75db70128b6..83c038f79932412ad35f374fddc0b64d60a63fec 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -2,29 +2,32 @@
 <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.dlux</groupId>
-    <artifactId>dlux-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+  <groupId>org.opendaylight.dlux</groupId>
   <artifactId>features-dlux</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <name>DLUX - Features </name>
   <packaging>jar</packaging>
 
   <properties>
     <features.file>features.xml</features.file>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>
       <dependency>
          <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>features-test</artifactId>
-         <version>${feature.test.version}</version>
+         <version>1.6.0-SNAPSHOT</version>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>opendaylight-karaf-empty</artifactId>
-         <version>${commons.opendaylight.version}</version>
+         <version>1.6.0-SNAPSHOT</version>
          <type>zip</type>
       </dependency>
       <dependency>
@@ -114,64 +117,4 @@
           <type>xml</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.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 60%
rename from features/src/main/resources/features.xml
rename to features/src/main/features/features.xml
index 45c426a835775cb11fee8cd7fc6a4fecffd5b374..25b0eb5cdc2621fea87f1cb774ec5b23a8beceef 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/features/features.xml
@@ -4,7 +4,7 @@
    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.netconf/features-restconf/${restconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <feature name='odl-dlux-all' version='${project.version}' description="Opendaylight dlux all features">
        <feature>odl-dlux-core</feature>
         <feature>odl-dlux-node</feature>
@@ -15,38 +15,38 @@
     <feature name='odl-dlux-core' version='${project.version}' description="Opendaylight dlux minimal feature">
         <feature>http</feature>
         <feature version="${restconf.version}">odl-restconf</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/loader/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/loader.implementation/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.core/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.login/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.authentication/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.navigation/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.topbar/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.general/${project.version}</bundle>
-        <bundle start-level="90">mvn:org.opendaylight.dlux/dlux.common.layout/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.topology/${project.version}</bundle>
+        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/loader/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/loader.implementation/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.core/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.login/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.authentication/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.navigation/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.topbar/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.general/{{VERSION}}</bundle>
+        <bundle start-level="90">mvn:org.opendaylight.dlux/dlux.common.layout/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.topology/{{VERSION}}</bundle>
     </feature>
 
 
     <feature name="odl-dlux-node" version='${project.version}' description="Enable nodes in Opendaylight dlux">
         <feature>odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dlux/dlux.node/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.node/{{VERSION}}</bundle>
     </feature>
 
     <feature name="odl-dlux-yangui" version='${project.version}' description="Enable Yang UI in Opendaylight dlux">
         <feature>odl-dlux-core</feature>
         <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-        <bundle>mvn:org.opendaylight.dlux/dlux.yangui/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.yangutils/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.sigmatopology/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.yangui/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.yangutils/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.sigmatopology/{{VERSION}}</bundle>
     </feature>
 
        <feature name="odl-dlux-yangvisualizer" version='${project.version}' description="Enable Yang visualizer in Opendaylight dlux">
         <feature>odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dlux/dlux.yangvisualizer/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.yangutils/${project.version}</bundle>
-               <bundle>mvn:org.opendaylight.dlux/dlux.common.sigmatopology/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.yangvisualizer/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.dlux/dlux.common.yangutils/{{VERSION}}</bundle>
+               <bundle>mvn:org.opendaylight.dlux/dlux.common.sigmatopology/{{VERSION}}</bundle>
     </feature>
 
 </features>