X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-parent%2Fpom.xml;h=91af1708f9a06418001c61f6ba108ef79f31478f;hb=35925e1d9f7dbcd5f4d4667ffe6fdd98aef79954;hp=37524e25da5a1a0db856fa1132e977e0cd073212;hpb=1abbf5d0cfacb2f052143e2b4352849234c03501;p=odlparent.git

diff --git a/features-parent/pom.xml b/features-parent/pom.xml
index 37524e25d..91af1708f 100644
--- a/features-parent/pom.xml
+++ b/features-parent/pom.xml
@@ -23,12 +23,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
     <artifactId>features-parent</artifactId>
     <packaging>pom</packaging>
+    <name>ODL :: odlparent :: ${project.artifactId}</name>
 
     <properties>
         <features.file>features.xml</features.file>
@@ -48,6 +49,7 @@
                 <!-- generate dependencies versions -->
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.10</version>
                       <executions>
                           <execution>
                               <phase>generate-resources</phase>
@@ -135,20 +137,38 @@
                                             args[2] = dependencyVersion
                                             return "mvn:" + args.join("/")
                                         }
-                                        throw new IllegalArgumentException("Feature dependency $groupId:$artifactId is not dependecy of project.")
+                                        throw new IllegalArgumentException("Feature dependency $groupId:$artifactId is not a dependency in the project pom.xml.")
                                     }
 
                                     def updateMavenDependency = { dep ->
                                         def mvnUrl = dep.text()
-                                        if (mvnUrl.startsWith("mvn:")) {
-                                            def components =  mvnUrl.substring(4).split("/")
-                                            if (components[2] == versionPlaceholder) {
-                                                dep.value = updatedURLFromProject(components)
+                                        def prefix = ""
+                                        if (mvnUrl.startsWith("wrap:")) {
+                                            prefix = "wrap:"
+                                            mvnUrl = mvnUrl.substring(5)
+                                        }
+                                        if (mvnUrl.startsWith("mvn:") &amp;&amp; mvnUrl.indexOf(versionPlaceholder) >= 0) {
+                                            // Process property place-holders
+                                            def dollarIndex;
+                                            while ((dollarIndex = mvnUrl.indexOf("\${")) >= 0) {
+                                                def closingBrace = mvnUrl.indexOf("}", dollarIndex);
+                                                if (closingBrace > dollarIndex) {
+                                                    def propKey = mvnUrl.substring(dollarIndex + 2, closingBrace);
+                                                    def propVal = project.properties[propKey];
+                                                    mvnUrl = mvnUrl.replace("\${${propKey}}", propVal);
+                                                } else {
+                                                    println "[WARN] Malformed Maven URL: ${mvnUrl}";
+                                                    break;
+                                                }
                                             }
-                                        } else if (mvnUrl.startsWith("wrap:mvn:")) {
-                                            def components =  mvnUrl.substring(9).split("/")
-                                            if (components[2] == versionPlaceholder) {
-                                                dep.value = "wrap:" + updatedURLFromProject(components)
+                                            def components =  mvnUrl.substring(4).split("/")
+                                            if (components[2].startsWith(versionPlaceholder)) {
+                                                def suffix = "";
+                                                if (components[2].length() > versionPlaceholder.length()) {
+                                                    suffix = components[2].substring(versionPlaceholder.length())
+                                                    components[2] = versionPlaceholder
+                                                }
+                                                dep.value = prefix + updatedURLFromProject(components) + suffix
                                             }
                                         }
                                     }
@@ -206,6 +226,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.12</version>
                     <executions>
                         <execution>
                         <phase>generate-resources</phase>
@@ -238,8 +259,8 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.0.1</version>
                     <executions>
                         <execution>
                             <id>filter</id>
@@ -251,10 +272,16 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven.surefire.version}</version>
                     <configuration>
                         <skip>${skip.karaf.featureTest}</skip>
+                        <systemPropertyVariables>
+                            <!-- Remove these properties when a better fix to Bug 6523 appears. -->
+                            <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
+                            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+                            <karaf.distro.version>1.8.0-SNAPSHOT</karaf.distro.version>
+                        </systemPropertyVariables>
                         <dependenciesToScan>
                             <dependency>org.opendaylight.odlparent:features-test</dependency>
                         </dependenciesToScan>
@@ -302,6 +329,12 @@
         </pluginManagement>
 
         <plugins>
+            <plugin>
+                <!-- This generates the META-INF/maven/dependencies.properties file
+                        which is required by the versionAsInProject() used in SingleFeatureTest -->
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
             </plugin>
@@ -318,11 +351,9 @@
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
@@ -333,8 +364,32 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
-            <version>1.6.0-SNAPSHOT</version>
+            <version>1.8.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- Remove this dependency when a better fix for Bug 6523 appears. -->
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>opendaylight-karaf-empty</artifactId>
+            <version>1.8.0-SNAPSHOT</version>
+            <type>zip</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <!--
+    Maven Site Configuration
+
+    The following configuration is necessary for maven-site-plugin to
+    correctly identify the correct deployment path for OpenDaylight Maven
+    sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
 </project>