You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/04 23:30:05 UTC
svn commit: r711451 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3134/parent/
resources/mng-3134/sub1/ resources/mng-3134/sub1/src/
Author: bentmann
Date: Tue Nov 4 14:30:04 2008
New Revision: 711451
URL: http://svn.apache.org/viewvc?rev=711451&view=rev
Log:
o Decoupled IT for MNG-3134 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/parent/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java?rev=711451&r1=711450&r2=711451&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java Tue Nov 4 14:30:04 2008
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3134">MNG-3134</a>.
@@ -47,10 +48,14 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3134" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "integration-test" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "sub1/target" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Properties props = verifier.loadProperties( "sub1/target/site.properties" );
+ assertEquals( "scp://host/path/sub1", props.getProperty( "project.distributionManagement.site.url" ) );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/parent/pom.xml?rev=711451&r1=711450&r2=711451&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/parent/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/parent/pom.xml Tue Nov 4 14:30:04 2008
@@ -1,18 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0095</groupId>
+
+ <groupId>org.apache.maven.its.mng3134</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>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml?rev=711451&r1=711450&r2=711451&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml Tue Nov 4 14:30:04 2008
@@ -1,37 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0095</groupId>
+ <groupId>org.apache.maven.its.mng3134</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>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
<configuration>
- <output>${project.build.directory}/effective-pom.xml</output>
+ <outputFile>${project.build.directory}/site.properties</outputFile>
+ <expressions>
+ <expression>project/distributionManagement/site/url</expression>
+ </expressions>
</configuration>
<executions>
<execution>
- <id>effective-pom</id>
- <phase>generate-resources</phase>
+ <id>test</id>
+ <phase>validate</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>
+ <goal>eval</goal>
</goals>
</execution>
</executions>