mirror of https://github.com/apache/maven.git
Trim trailing whitespace
This commit is contained in:
parent
103f9c0b41
commit
6b0efd992c
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-598">MNG-598</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-598">MNG-598</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-598">MNG-598</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-598">MNG-598</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,10 +28,10 @@ public class MavenIT0051ReleaseProfileTest
|
||||||
extends AbstractMavenIntegrationTestCase
|
extends AbstractMavenIntegrationTestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
public MavenIT0051ReleaseProfileTest()
|
public MavenIT0051ReleaseProfileTest()
|
||||||
{
|
{
|
||||||
super( "(2.0.2,)" );
|
super( "(2.0.2,)" );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test source attachment when -DperformRelease=true is specified.
|
* Test source attachment when -DperformRelease=true is specified.
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class MavenIT0063SystemScopeDependencyTest
|
||||||
|
|
||||||
List<String> lines = verifier.loadLines( "target/compile.txt", "UTF-8" );
|
List<String> lines = verifier.loadLines( "target/compile.txt", "UTF-8" );
|
||||||
assertEquals( 2, lines.size() );
|
assertEquals( 2, lines.size() );
|
||||||
assertEquals( new File( testDir, "jdk/lib/tools.jar").getCanonicalFile(),
|
assertEquals( new File( testDir, "jdk/lib/tools.jar").getCanonicalFile(),
|
||||||
new File( (String) lines.get(1) ).getCanonicalFile() );
|
new File( (String) lines.get(1) ).getCanonicalFile() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-885">MNG-885</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-885">MNG-885</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-885">MNG-885</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-885">MNG-885</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -53,7 +53,7 @@ public class MavenIT0139InterpolationWithProjectPrefixTest
|
||||||
verifier.executeGoal( "initialize" );
|
verifier.executeGoal( "initialize" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
Properties props = verifier.loadProperties( "target/interpolated.properties" );
|
Properties props = verifier.loadProperties( "target/interpolated.properties" );
|
||||||
String prefix = "project.properties.";
|
String prefix = "project.properties.";
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -53,7 +53,7 @@ public class MavenIT0140InterpolationWithPomPrefixTest
|
||||||
verifier.executeGoal( "initialize" );
|
verifier.executeGoal( "initialize" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
Properties props = verifier.loadProperties( "target/interpolated.properties" );
|
Properties props = verifier.loadProperties( "target/interpolated.properties" );
|
||||||
String prefix = "project.properties.";
|
String prefix = "project.properties.";
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenIT0145ReactorWithIncludesExcludesTest
|
public class MavenIT0145ReactorWithIncludesExcludesTest
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-95">MNG-95</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-95">MNG-95</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-249">MNG-249</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-249">MNG-249</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-282">MNG-282</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-282">MNG-282</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-294">MNG-294</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-294">MNG-294</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-377">MNG-377</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-377">MNG-377</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-449">MNG-449</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-449">MNG-449</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-461">MNG-461</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-461">MNG-461</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng0461TolerateMissingDependencyPomTest
|
public class MavenITmng0461TolerateMissingDependencyPomTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-469">MNG-469</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-469">MNG-469</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-471">MNG-471</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-471">MNG-471</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-479">MNG-479</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-479">MNG-479</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-496">MNG-496</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-496">MNG-496</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-505">MNG-505</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-505">MNG-505</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -35,7 +35,7 @@ public class MavenITmng0505VersionRangeTest
|
||||||
extends AbstractMavenIntegrationTestCase
|
extends AbstractMavenIntegrationTestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Oleg 2009.04.30: the same functionality but simpler - no multiple ranges - syntax
|
* Oleg 2009.04.30: the same functionality but simpler - no multiple ranges - syntax
|
||||||
* is tested in MNG-4150
|
* is tested in MNG-4150
|
||||||
*/
|
*/
|
||||||
public MavenITmng0505VersionRangeTest()
|
public MavenITmng0505VersionRangeTest()
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-507">MNG-507</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-507">MNG-507</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-522">MNG-522</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-522">MNG-522</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -44,7 +44,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-553">MNG-553</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-553">MNG-553</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng0553SettingsAuthzEncryptionTest
|
public class MavenITmng0553SettingsAuthzEncryptionTest
|
||||||
|
@ -164,7 +164,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
||||||
verifier.filterFile( "security-template.xml", "settings~security.xml", "UTF-8", filterProps );
|
verifier.filterFile( "security-template.xml", "settings~security.xml", "UTF-8", filterProps );
|
||||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
|
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
|
||||||
|
|
||||||
verifier.getSystemProperties().setProperty( "settings.security",
|
verifier.getSystemProperties().setProperty( "settings.security",
|
||||||
new File( testDir, "settings~security.xml" ).getAbsolutePath() );
|
new File( testDir, "settings~security.xml" ).getAbsolutePath() );
|
||||||
verifier.addCliOption( "--settings" );
|
verifier.addCliOption( "--settings" );
|
||||||
verifier.addCliOption( "settings.xml" );
|
verifier.addCliOption( "settings.xml" );
|
||||||
|
@ -222,7 +222,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
||||||
return line;
|
return line;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-557">MNG-557</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-557">MNG-557</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-612">MNG-612</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-612">MNG-612</a>.
|
||||||
*
|
*
|
||||||
* @author Mark Hobson
|
* @author Mark Hobson
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-666">MNG-666</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-666">MNG-666</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.Properties;
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-674">MNG-674</a> and
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-674">MNG-674</a> and
|
||||||
* <a href="https://issues.apache.org/jira/browse/MNG-4997">MNG-4997</a>.
|
* <a href="https://issues.apache.org/jira/browse/MNG-4997">MNG-4997</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-680">MNG-680</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-680">MNG-680</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-731">MNG-731</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-731">MNG-731</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-761">MNG-761</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-761">MNG-761</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -38,7 +38,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-768">MNG-768</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-768">MNG-768</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-773">MNG-773</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-773">MNG-773</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-781">MNG-781</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-781">MNG-781</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-786">MNG-786</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-786">MNG-786</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-814">MNG-814</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-814">MNG-814</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.Collections;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-818">MNG-818</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-818">MNG-818</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-820">MNG-820</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-820">MNG-820</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-823">MNG-823</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-823">MNG-823</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-836">MNG-836</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-836">MNG-836</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-848">MNG-848</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-848">MNG-848</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.Properties;
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-866">MNG-866</a> and
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-866">MNG-866</a> and
|
||||||
* <a href="https://issues.apache.org/jira/browse/MNG-160">MNG-160</a>.
|
* <a href="https://issues.apache.org/jira/browse/MNG-160">MNG-160</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-870">MNG-870</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-870">MNG-870</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-956">MNG-956</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-956">MNG-956</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-985">MNG-985</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-985">MNG-985</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1052">MNG-1052</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1052">MNG-1052</a>.
|
||||||
*
|
*
|
||||||
* @author John Casey
|
* @author John Casey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1073">MNG-1073</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1073">MNG-1073</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1073AggregatorForksReactorTest
|
public class MavenITmng1073AggregatorForksReactorTest
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1088">MNG-1088</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1088">MNG-1088</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1142">MNG-1142</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1142">MNG-1142</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1142VersionRangeIntersectionTest
|
public class MavenITmng1142VersionRangeIntersectionTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Collections;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1144">MNG-1144</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1144">MNG-1144</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1144MultipleDefaultGoalsTest
|
public class MavenITmng1144MultipleDefaultGoalsTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1233">MNG-1233</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1233">MNG-1233</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -59,15 +59,15 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
Collection<String> compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
|
Collection<String> compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
|
||||||
assertTrue( compileArtifacts.toString(),
|
assertTrue( compileArtifacts.toString(),
|
||||||
compileArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) );
|
compileArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) );
|
||||||
assertTrue( compileArtifacts.toString(),
|
assertTrue( compileArtifacts.toString(),
|
||||||
compileArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) );
|
compileArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) );
|
||||||
|
|
||||||
Collection<String> runtimeArtifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" );
|
Collection<String> runtimeArtifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" );
|
||||||
assertTrue( runtimeArtifacts.toString(),
|
assertTrue( runtimeArtifacts.toString(),
|
||||||
runtimeArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) );
|
runtimeArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) );
|
||||||
assertFalse( runtimeArtifacts.toString(),
|
assertFalse( runtimeArtifacts.toString(),
|
||||||
runtimeArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) );
|
runtimeArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1323">MNG-1323</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1323">MNG-1323</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -59,7 +59,7 @@ public class MavenITmng1323AntrunDependenciesTest
|
||||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
|
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
|
||||||
verifier.addCliOption( "--settings" );
|
verifier.addCliOption( "--settings" );
|
||||||
verifier.addCliOption( "settings.xml" );
|
verifier.addCliOption( "settings.xml" );
|
||||||
verifier.executeGoal( "validate" );
|
verifier.executeGoal( "validate" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1349">MNG-1349</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1349">MNG-1349</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1415">MNG-1415</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1415">MNG-1415</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1415QuotedSystemPropertiesTest
|
public class MavenITmng1415QuotedSystemPropertiesTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1491">MNG-1491</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1491">MNG-1491</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1491ReactorArtifactIdCollisionTest
|
public class MavenITmng1491ReactorArtifactIdCollisionTest
|
||||||
|
|
|
@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1493">MNG-1493</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1493">MNG-1493</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1493NonStandardModulePomNamesTest
|
public class MavenITmng1493NonStandardModulePomNamesTest
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class MavenITmng1701DuplicatePluginTest
|
||||||
verifier.executeGoal( "validate" );
|
verifier.executeGoal( "validate" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
List<String> lines = verifier.loadLines( verifier.getLogFileName(), "UTF-8" );
|
List<String> lines = verifier.loadLines( verifier.getLogFileName(), "UTF-8" );
|
||||||
boolean foundWarning = false;
|
boolean foundWarning = false;
|
||||||
for ( String line : lines )
|
for ( String line : lines )
|
||||||
|
@ -62,7 +62,7 @@ public class MavenITmng1701DuplicatePluginTest
|
||||||
foundWarning = true;
|
foundWarning = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
assertTrue( "Duplicate plugin warning wasn't generated.", foundWarning );
|
assertTrue( "Duplicate plugin warning wasn't generated.", foundWarning );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1703">MNG-1703</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1703">MNG-1703</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1830">MNG-1830</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1830">MNG-1830</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
* @version $Id: ba3c28edf533dba3dfa60e384a670575e0cd6901 $
|
* @version $Id: ba3c28edf533dba3dfa60e384a670575e0cd6901 $
|
||||||
*/
|
*/
|
||||||
|
@ -60,8 +60,8 @@ public class MavenITmng1830ShowVersionTest
|
||||||
List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
|
List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
|
||||||
for( String line : lines )
|
for( String line : lines )
|
||||||
{
|
{
|
||||||
if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" )
|
if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" )
|
||||||
|| line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" )
|
|| line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" )
|
||||||
|| line.matches( "^Apache Maven (.*?) \\([0-9a-z]{5,41}; .*\\)$" ) )
|
|| line.matches( "^Apache Maven (.*?) \\([0-9a-z]{5,41}; .*\\)$" ) )
|
||||||
{
|
{
|
||||||
apacheVersionInTheRightFormatWasFound = true;
|
apacheVersionInTheRightFormatWasFound = true;
|
||||||
|
@ -73,7 +73,7 @@ public class MavenITmng1830ShowVersionTest
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
assertTrue( apacheVersionInTheRightFormatWasFound );
|
assertTrue( apacheVersionInTheRightFormatWasFound );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1895">MNG-1895</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1895">MNG-1895</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng1895ScopeConflictResolutionTest
|
public class MavenITmng1895ScopeConflictResolutionTest
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1908">MNG-1908</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1908">MNG-1908</a>.
|
||||||
*
|
*
|
||||||
* @author Brett Porter
|
* @author Brett Porter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -39,7 +39,7 @@ public class MavenITmng1908LegacySnapshotUpdateTest
|
||||||
// legacy layout no longer supported in Maven 3.x (see MNG-4204)
|
// legacy layout no longer supported in Maven 3.x (see MNG-4204)
|
||||||
super( "[2.0,3.0-alpha-3)" );
|
super( "[2.0,3.0-alpha-3)" );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that legacy repositories with legacy snapshots (i.e. without metadata) download correctly.
|
* Test that legacy repositories with legacy snapshots (i.e. without metadata) download correctly.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1957">MNG-1957</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1957">MNG-1957</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1992">MNG-1992</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1992">MNG-1992</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1995">MNG-1995</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1995">MNG-1995</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1999">MNG-1999</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1999">MNG-1999</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2006">MNG-2006</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2006">MNG-2006</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,15 +27,15 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2045">MNG-2045</a>:
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2045">MNG-2045</a>:
|
||||||
* Simple IT test invoking maven in a reactor with 2 projects --
|
* Simple IT test invoking maven in a reactor with 2 projects --
|
||||||
* first project produces a test-jar, which is required to
|
* first project produces a test-jar, which is required to
|
||||||
* compile second project.
|
* compile second project.
|
||||||
*
|
*
|
||||||
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
|
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
|
||||||
* @author mikko.koponen@ri.fi
|
* @author mikko.koponen@ri.fi
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2045testJarDependenciesBrokenInReactorTest
|
public class MavenITmng2045testJarDependenciesBrokenInReactorTest
|
||||||
extends AbstractMavenIntegrationTestCase
|
extends AbstractMavenIntegrationTestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
public MavenITmng2045testJarDependenciesBrokenInReactorTest()
|
public MavenITmng2045testJarDependenciesBrokenInReactorTest()
|
||||||
|
@ -75,7 +75,7 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest
|
||||||
* Different Maven versions use the test-classes directory or the assembled test JAR but all that matters here
|
* Different Maven versions use the test-classes directory or the assembled test JAR but all that matters here
|
||||||
* is merely that we have the test classes on the classpath.
|
* is merely that we have the test classes on the classpath.
|
||||||
*/
|
*/
|
||||||
assertTrue( "test classes missing in " + classpath,
|
assertTrue( "test classes missing in " + classpath,
|
||||||
classpath.contains( "test" ) || classpath.contains( "test.jar" )
|
classpath.contains( "test" ) || classpath.contains( "test.jar" )
|
||||||
|| classpath.contains( "test-jar-0.1-SNAPSHOT-tests.jar" ) );
|
|| classpath.contains( "test-jar-0.1-SNAPSHOT-tests.jar" ) );
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest
|
||||||
private void assertNotMainClasses( List<String> classpath )
|
private void assertNotMainClasses( List<String> classpath )
|
||||||
{
|
{
|
||||||
// When depending on the test JAR of some module, we shouldn't get its main classes
|
// When depending on the test JAR of some module, we shouldn't get its main classes
|
||||||
assertFalse( "main classes present in " + classpath,
|
assertFalse( "main classes present in " + classpath,
|
||||||
classpath.contains( "main" ) );
|
classpath.contains( "main" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2052">MNG-2052</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2052">MNG-2052</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
|
public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.Arrays;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2054">MNG-2054</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2054">MNG-2054</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2054PluginExecutionInheritanceTest
|
public class MavenITmng2054PluginExecutionInheritanceTest
|
||||||
|
|
|
@ -30,9 +30,9 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
* Verify that a multimodule build, built from the middle node in an inheritance hierarchy,
|
* Verify that a multimodule build, built from the middle node in an inheritance hierarchy,
|
||||||
* can find all parent POMs necessary to build each project in the reactor using ONLY the
|
* can find all parent POMs necessary to build each project in the reactor using ONLY the
|
||||||
* relativePath from the parent specification (in this case, the implied one of '../pom.xml').
|
* relativePath from the parent specification (in this case, the implied one of '../pom.xml').
|
||||||
*
|
*
|
||||||
* @author jdcasey
|
* @author jdcasey
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2068ReactorRelativeParentsTest
|
public class MavenITmng2068ReactorRelativeParentsTest
|
||||||
extends AbstractMavenIntegrationTestCase
|
extends AbstractMavenIntegrationTestCase
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2098">MNG-2098</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2098">MNG-2098</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
|
public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
|
||||||
|
|
|
@ -28,7 +28,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2103">MNG-2103</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2103">MNG-2103</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2103PluginExecutionInheritanceTest
|
public class MavenITmng2103PluginExecutionInheritanceTest
|
||||||
|
|
|
@ -31,12 +31,12 @@ import org.apache.maven.it.util.ResourceExtractor;
|
||||||
public class MavenITmng2123VersionRangeDependencyTest
|
public class MavenITmng2123VersionRangeDependencyTest
|
||||||
extends AbstractMavenIntegrationTestCase
|
extends AbstractMavenIntegrationTestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
public MavenITmng2123VersionRangeDependencyTest()
|
public MavenITmng2123VersionRangeDependencyTest()
|
||||||
{
|
{
|
||||||
super( "(2.0.8,)" );
|
super( "(2.0.8,)" );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testitMNG2123()
|
public void testitMNG2123()
|
||||||
throws Exception
|
throws Exception
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class MavenITmng2124PomInterpolationWithParentValuesTest
|
||||||
verifier.executeGoal( "initialize" );
|
verifier.executeGoal( "initialize" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
Properties props = verifier.loadProperties( "target/parent.properties" );
|
Properties props = verifier.loadProperties( "target/parent.properties" );
|
||||||
assertEquals( "parent, child, parent, child", props.getProperty( "project.description" ) );
|
assertEquals( "parent, child, parent, child", props.getProperty( "project.description" ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2135">MNG-2135</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2135">MNG-2135</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2135PluginBuildInReactorTest
|
public class MavenITmng2135PluginBuildInReactorTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2136">MNG-2136</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2136">MNG-2136</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2136ActiveByDefaultProfileTest
|
public class MavenITmng2136ActiveByDefaultProfileTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2140">MNG-2140</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2140">MNG-2140</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest
|
public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2174">MNG-2174</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2174">MNG-2174</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2201">MNG-2201</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2201">MNG-2201</a>.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2201PluginConfigInterpolationTest
|
public class MavenITmng2201PluginConfigInterpolationTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2222">MNG-2222</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2222">MNG-2222</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*/
|
*/
|
||||||
public class MavenITmng2222OutputDirectoryReactorResolutionTest
|
public class MavenITmng2222OutputDirectoryReactorResolutionTest
|
||||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2228">MNG-2228</a>.
|
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2228">MNG-2228</a>.
|
||||||
*
|
*
|
||||||
* @author Benjamin Bentmann
|
* @author Benjamin Bentmann
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue