You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/09/10 21:22:20 UTC
svn commit: r574340 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/ resources/it0095/parent/
resources/it0095/sub1/src/test/verifier/
resources/it0128-distMgmtSiteUrlParentCalc/ resour...
Author: jdcasey
Date: Mon Sep 10 12:22:19 2007
New Revision: 574340
URL: http://svn.apache.org/viewvc?rev=574340&view=rev
Log:
- 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.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/parent/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java?rev=574340&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java Mon Sep 10 12:22:19 2007
@@ -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();
+
+ }
+}
+
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/parent/pom.xml?rev=574340&r1=574339&r2=574340&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/parent/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/parent/pom.xml Mon Sep 10 12:22:19 2007
@@ -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>
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml?rev=574340&r1=574339&r2=574340&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0095/sub1/src/test/verifier/verifications.xml Mon Sep 10 12:22:19 2007
@@ -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>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml?rev=574340&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml Mon Sep 10 12:22:19 2007
@@ -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>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml?rev=574340&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml Mon Sep 10 12:22:19 2007
@@ -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>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml?rev=574340&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml Mon Sep 10 12:22:19 2007
@@ -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>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml?rev=574340&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml Mon Sep 10 12:22:19 2007
@@ -0,0 +1,8 @@
+<verifications>
+ <files>
+ <file>
+ <location>target/effective-pom.xml</location>
+ <contains>scp://host/path/sub1</contains>
+ </file>
+ </files>
+</verifications>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0128-distMgmtSiteUrlParentCalc/sub1/src/test/verifier/verifications.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"