Merge "Do not fork javadoc reports"

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

diff --git a/features-parent/pom.xml b/features-parent/pom.xml
index 37524e25da5a1a0db856fa1132e977e0cd073212..3b960cdec145f9e28770cf47ee8e2301e42caff0 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.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -135,20 +135,25 @@
                                             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 of the project.")
                                     }
 
                                     def updateMavenDependency = { dep ->
                                         def mvnUrl = dep.text()
+                                        def prefix = ""
+                                        if (mvnUrl.startsWith("wrap:")) {
+                                            prefix = "wrap:"
+                                            mvnUrl = mvnUrl.substring(5)
+                                        }
                                         if (mvnUrl.startsWith("mvn:")) {
                                             def components =  mvnUrl.substring(4).split("/")
-                                            if (components[2] == versionPlaceholder) {
-                                                dep.value = updatedURLFromProject(components)
-                                            }
-                                        } else if (mvnUrl.startsWith("wrap:mvn:")) {
-                                            def components =  mvnUrl.substring(9).split("/")
-                                            if (components[2] == versionPlaceholder) {
-                                                dep.value = "wrap:" + updatedURLFromProject(components)
+                                            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
                                             }
                                         }
                                     }
@@ -333,8 +338,24 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
-            <version>1.6.0-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
             <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>