Bump versions by x.y.(z+1)

[odlparent.git] / features-parent / pom.xml

diff --git a/features-parent/pom.xml b/features-parent/pom.xml
index 2b411b350a407fa345b168b004b3f71297bff756..131b5d7ce1000246b13e0d9f2a4f2f8089bbcfea 100644 (file)
--- a/features-parent/pom.xml
+++ b/features-parent/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -137,7 +137,7 @@
                                             args[2] = dependencyVersion
                                             return "mvn:" + args.join("/")
                                         }
-                                        throw new IllegalArgumentException("Feature dependency $groupId:$artifactId is not a dependency of the project.")
+                                        throw new IllegalArgumentException("Feature dependency $groupId:$artifactId is not a dependency in the project pom.xml.")
                                     }
 
                                     def updateMavenDependency = { dep ->
@@ -147,7 +147,20 @@
                                             prefix = "wrap:"
                                             mvnUrl = mvnUrl.substring(5)
                                         }
-                                        if (mvnUrl.startsWith("mvn:")) {
+                                        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;
+                                                }
+                                            }
                                             def components =  mvnUrl.substring(4).split("/")
                                             if (components[2].startsWith(versionPlaceholder)) {
                                                 def suffix = "";
@@ -213,7 +226,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.9.1</version>
+                    <version>1.12</version>
                     <executions>
                         <execution>
                         <phase>generate-resources</phase>
@@ -247,7 +260,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>3.0.1</version>
                     <executions>
                         <execution>
                             <id>filter</id>
@@ -263,6 +276,12 @@
                     <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.5-SNAPSHOT</karaf.distro.version>
+                        </systemPropertyVariables>
                         <dependenciesToScan>
                             <dependency>org.opendaylight.odlparent:features-test</dependency>
                         </dependenciesToScan>
@@ -291,6 +310,7 @@
                         </pluginExecution>
                         <pluginExecution>
                           <pluginExecutionFilter>
+                            <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-dependency-plugin</artifactId>
                             <versionRange>[0.0,)</versionRange>
                             <goals>
@@ -309,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>
@@ -338,7 +364,15 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.8.5-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.5-SNAPSHOT</version>
+            <type>zip</type>
             <scope>test</scope>
         </dependency>
     </dependencies>