diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 74efa55178..76f62ae9d1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -111,11 +111,11 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng4459InMemorySettingsKeptEncryptedTest.class ); suite.addTestSuite( MavenITmng4453PluginVersionFromLifecycleMappingTest.class ); suite.addTestSuite( MavenITmng4450StubModelForMissingDependencyPomTest.class ); - suite.addTestSuite( MavenITmng4448FollowHttpRedirectTest.class ); suite.addTestSuite( MavenITmng4436SingletonComponentLookupTest.class ); suite.addTestSuite( MavenITmng4433ForceParentSnapshotUpdateTest.class ); suite.addTestSuite( MavenITmng4430DistributionManagementStatusTest.class ); suite.addTestSuite( MavenITmng4429CompRequirementOnNonDefaultImplTest.class ); + suite.addTestSuite( MavenITmng4428FollowHttpRedirectTest.class ); suite.addTestSuite( MavenITmng4423SessionDataFromPluginParameterExpressionTest.class ); suite.addTestSuite( MavenITmng4422PluginExecutionPhaseInterpolationTest.class ); suite.addTestSuite( MavenITmng4421DeprecatedPomInterpolationExpressionsTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java similarity index 97% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index e1b127c7da..8e915bba52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -39,16 +39,16 @@ import org.mortbay.jetty.handler.AbstractHandler; import org.mortbay.jetty.security.SslSocketConnector; /** - * This is a test set for MNG-4448. + * This is a test set for MNG-4428. * * @author Benjamin Bentmann * @version $Id$ */ -public class MavenITmng4448FollowHttpRedirectTest +public class MavenITmng4428FollowHttpRedirectTest extends AbstractMavenIntegrationTestCase { - public MavenITmng4448FollowHttpRedirectTest() + public MavenITmng4428FollowHttpRedirectTest() { super( "[2.0.3,3.0-alpha-1),(3.0-alpha-1,)" ); } @@ -96,7 +96,7 @@ public class MavenITmng4448FollowHttpRedirectTest private void testit( boolean fromHttp, boolean toHttp ) throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4448" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4428" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); @@ -116,7 +116,7 @@ public class MavenITmng4448FollowHttpRedirectTest try { verifier.setAutoclean( false ); - verifier.deleteArtifacts( "org.apache.maven.its.mng4448" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4428" ); verifier.deleteDirectory( "target" ); Properties filterProps = verifier.newDefaultFilterProperties(); filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https" ); @@ -189,7 +189,7 @@ public class MavenITmng4448FollowHttpRedirectTest { writer.println( "" ); writer.println( " 4.0.0" ); - writer.println( " org.apache.maven.its.mng4448" ); + writer.println( " org.apache.maven.its.mng4428" ); writer.println( " dep" ); writer.println( " 0.1" ); writer.println( "" ); diff --git a/its/core-it-suite/src/test/resources/mng-4448/keystore b/its/core-it-suite/src/test/resources/mng-4428/keystore similarity index 100% rename from its/core-it-suite/src/test/resources/mng-4448/keystore rename to its/core-it-suite/src/test/resources/mng-4428/keystore diff --git a/its/core-it-suite/src/test/resources/mng-4448/pom.xml b/its/core-it-suite/src/test/resources/mng-4428/pom.xml similarity index 92% rename from its/core-it-suite/src/test/resources/mng-4448/pom.xml rename to its/core-it-suite/src/test/resources/mng-4428/pom.xml index 0dea05d255..d9accfd7e3 100644 --- a/its/core-it-suite/src/test/resources/mng-4448/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4428/pom.xml @@ -22,18 +22,18 @@ under the License. 4.0.0 - org.apache.maven.its.mng4448 + org.apache.maven.its.mng4428 test 0.1-SNAPSHOT - Maven Integration Test :: MNG-4448 + Maven Integration Test :: MNG-4428 Verify that HTTP redirects are getting followed. - org.apache.maven.its.mng4448 + org.apache.maven.its.mng4428 dep 0.1 diff --git a/its/core-it-suite/src/test/resources/mng-4448/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4428/settings-template.xml similarity index 100% rename from its/core-it-suite/src/test/resources/mng-4448/settings-template.xml rename to its/core-it-suite/src/test/resources/mng-4428/settings-template.xml