mirror of https://github.com/apache/maven.git
o Deleted IT mng-3134 which is now superceded by the more complete test mng-2006
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@718319 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f820c1badc
commit
9562268dbf
|
@ -151,7 +151,6 @@ public class IntegrationTestSuite
|
|||
suite.addTestSuite( MavenITmng3268MultipleDashPCommandLineTest.class );
|
||||
suite.addTestSuite( MavenITmng3259DepsDroppedInMultiModuleBuildTest.class );
|
||||
suite.addTestSuite( MavenITmng3220ImportScopeTest.class );
|
||||
suite.addTestSuite( MavenITmng3134DistMgmtSiteUrlParentCalculationTest.class );
|
||||
suite.addTestSuite( MavenITmng3106ProfileMultipleActivatorsTest.class );
|
||||
suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPomTest.class );
|
||||
suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
|
||||
|
|
|
@ -1,61 +0,0 @@
|
|||
package org.apache.maven.it;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import org.apache.maven.it.Verifier;
|
||||
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>.
|
||||
*
|
||||
* @author John Casey
|
||||
* @version $Id$
|
||||
*/
|
||||
public class MavenITmng3134DistMgmtSiteUrlParentCalculationTest
|
||||
extends AbstractMavenIntegrationTestCase
|
||||
{
|
||||
|
||||
public MavenITmng3134DistMgmtSiteUrlParentCalculationTest()
|
||||
{
|
||||
super( "(2.0.7,)" );
|
||||
}
|
||||
|
||||
/**
|
||||
* Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent.
|
||||
*/
|
||||
public void testitMNG3134()
|
||||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3134" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
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" ) );
|
||||
}
|
||||
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
<?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.mng3134</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<distributionManagement>
|
||||
<site>
|
||||
<id>website</id>
|
||||
<url>scp://host/path/parent</url>
|
||||
</site>
|
||||
</distributionManagement>
|
||||
|
||||
<modules>
|
||||
<module>../sub1</module>
|
||||
</modules>
|
||||
</project>
|
|
@ -1,18 +0,0 @@
|
|||
<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>
|
|
@ -1,58 +0,0 @@
|
|||
<?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.mng3134</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1</version>
|
||||
<relativePath>../parent</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>sub1</artifactId>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.its.plugins</groupId>
|
||||
<artifactId>maven-it-plugin-expression</artifactId>
|
||||
<version>2.1-SNAPSHOT</version>
|
||||
<configuration>
|
||||
<outputFile>${project.build.directory}/site.properties</outputFile>
|
||||
<expressions>
|
||||
<expression>project/distributionManagement/site/url</expression>
|
||||
</expressions>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>test</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
<goal>eval</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
Loading…
Reference in New Issue