- Correcting it0095 to reflect what was actually fixed in MNG-2006, i.e. scm URLs and POM url, -NOT- distributionManagement URL.

- Adding it0128 which tests the fix for MNG-3134, i.e. the parent-based calculation of DistributionManagement Site URL.



git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@574340 13f79535-47bb-0310-9956-ffa450edef68

its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java

@@ -0,0 +1,26 @@
+package org.apache.maven.integrationtests;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+public class MavenIT0128DistMgmtSiteUrlParentCalculationTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    /**
+     * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent. (MNG-3134)
+     */
+    public void testit0128()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "integration-test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+    }
+}
+

its/core-integration-tests/src/test/resources/it0095/parent/pom.xml

@@ -4,15 +4,12 @@
   <artifactId>parent</artifactId>
   <version>1</version>
   <packaging>pom</packaging>
+  <url>http://host/path/parent</url>
   <scm>
     <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/parent</connection>
+    <developerConnection>scm:svn:https://dev.svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/parent</developerConnection>
+    <url>http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/parent</url>
   </scm>
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>scp://host/path/parent</url>
-    </site>
-  </distributionManagement>
   <modules>
     <module>../sub1</module>
   </modules>

its/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml

@@ -2,11 +2,19 @@
   <files>
     <file>
       <location>target/effective-pom.xml</location>
-      <contains>scp://host/path/parent/sub1</contains>
+      <contains>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/sub1</contains>
     </file>
     <file>
       <location>target/effective-pom.xml</location>
-      <contains>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/sub1</contains>
+      <contains>scm:svn:https://dev.svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/sub1</contains>
+    </file>
+    <file>
+      <location>target/effective-pom.xml</location>
+      <contains>http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/sub1</contains>
+    </file>
+    <file>
+      <location>target/effective-pom.xml</location>
+      <contains>http://host/path/sub1</contains>
     </file>
   </files>
 </verifications>

its/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml

@@ -0,0 +1,19 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.its.it0095</groupId>
+  <artifactId>parent</artifactId>
+  <version>1</version>
+  <packaging>pom</packaging>
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it/it0095/parent</connection>
+  </scm>
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>scp://host/path/parent</url>
+    </site>
+  </distributionManagement>
+  <modules>
+    <module>../sub1</module>
+  </modules>
+</project>

its/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml

@@ -0,0 +1,18 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <name>Maven Integration Test :: it0095</name> 
+  <groupId>org.apache.maven.its.it0095</groupId>
+  <artifactId>maven-it-it0128</artifactId>
+  <description>Test DistributionManagement/Site URL calculation when modules are sibling dirs of parent. (MNG-3134)</description>
+  <version>1</version>
+
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>parent</module>
+  </modules>
+
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+  </build>
+</project>

its/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml

@@ -0,0 +1,41 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.its.it0095</groupId>
+    <artifactId>parent</artifactId>
+    <version>1</version>
+    <relativePath>../parent</relativePath>
+  </parent>
+  <artifactId>sub1</artifactId>
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-help-plugin</artifactId>
+        <configuration>
+          <output>${project.build.directory}/effective-pom.xml</output>
+        </configuration>
+        <executions>
+          <execution>
+            <id>effective-pom</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>effective-pom</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-verifier-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

its/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml

@@ -0,0 +1,8 @@
+<verifications>
+  <files>
+    <file>
+      <location>target/effective-pom.xml</location>
+      <contains>scp://host/path/sub1</contains>
+    </file>
+  </files>
+</verifications>