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 cb4bd9ee0b..4020f3c50b 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 @@ -79,7 +79,6 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // Tests that don't run stable and need to be fixed // ------------------------------------------------------------------------------------------------------------- - // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 suite.addTestSuite( MavenITmng4745PluginVersionUpdateTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java deleted file mode 100644 index dacec64289..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java +++ /dev/null @@ -1,140 +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.FileUtils; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * Test to verify that a release can be updated. - */ -public class MavenIT0109ReleaseUpdateTest - extends AbstractMavenIntegrationTestCase -{ - public MavenIT0109ReleaseUpdateTest() - { - super( ALL_MAVEN_VERSIONS ); - } - - private static final String GROUPID = "org.apache.maven.it"; - - private static final String ARTIFACTID = "maven-it-release-update"; - - private static final String TYPE = "jar"; - - private static final String POM_TYPE = "pom"; - - private static final String OLD_VERSION = "1.0"; - - private static final String NEW_VERSION = "1.1"; - - public void testReleaseUpdated() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0109" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, POM_TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, NEW_VERSION, POM_TYPE ); - - writeMetadata( new File( verifier.localRepo ), "maven-metadata-it.releases.xml", OLD_VERSION, - "20051230031110" ); - - // create a repository (TODO: into verifier) - File repository = new File( testDir, "repo" ); - repository.mkdirs(); - - // create artifact in repository (TODO: into verifier) - writeArtifact( repository, OLD_VERSION ); - writeArtifact( repository, NEW_VERSION ); - - writeMetadata( repository, "maven-metadata.xml", NEW_VERSION, "20061230031110" ); - - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - - Map m = new HashMap(); -/* - m.put( "MAVEN_OPTS", - "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" ); -*/ - verifier.executeGoal( "package", m ); - - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.assertArtifactPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } - - private static void writeMetadata( File repository, String fileName, String version, String timestamp ) - throws IOException - { - File metadata = new File( repository, GROUPID.replace( '.', '/' ) + "/" + ARTIFACTID + "/" + fileName ); - metadata.getParentFile().mkdirs(); - - StringBuffer content = new StringBuffer(); - content.append( "\n" ); - content.append( " " + GROUPID + "\n" ); - content.append( " " + ARTIFACTID + "\n" ); - content.append( " \n" ); - content.append( " " + version + "\n" ); - content.append( " " + version + "\n" ); - content.append( " \n" ); - content.append( " " + OLD_VERSION + "\n" ); - content.append( " " + NEW_VERSION + "\n" ); - content.append( " \n" ); - content.append( " " + timestamp + "\n" ); - content.append( " \n" ); - content.append( "" ); - - FileUtils.fileWrite( metadata.getAbsolutePath(), content.toString() ); - } - - private static void writeArtifact( File repository, String version ) - throws IOException - { -/* - File artifact = new File( repository, GROUPID.replace( '.', '/' ) + "/" + ARTIFACTID + "/" + version + "/" + - ARTIFACTID + "-" + version + "." + TYPE ); - artifact.getParentFile().mkdirs(); - FileUtils.fileWrite( artifact.getAbsolutePath(), version ); - - StringBuffer content = new StringBuffer(); - content.append( "\n" ); - content.append( " 4.0.0\n" ); - content.append( " " + GROUPID + "\n" ); - content.append( " " + ARTIFACTID + "\n" ); - content.append( " " + version + "\n" ); - content.append( " maven-plugin\n" ); - content.append( "" ); - - artifact = new File( artifact.getParentFile(), ARTIFACTID + "-" + version + "." + POM_TYPE ); - FileUtils.fileWrite( artifact.getAbsolutePath(), content.toString() ); -*/ - } -} diff --git a/its/core-it-suite/src/test/resources/it0109/pom.xml b/its/core-it-suite/src/test/resources/it0109/pom.xml deleted file mode 100644 index c0b79545f4..0000000000 --- a/its/core-it-suite/src/test/resources/it0109/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - Maven Integration Test :: releaseUpdate - org.apache.maven.its.releaseUpdate - maven-it-release-update - 1.0 - - Test to verify that a plugin can be successfully updated to the latest release. See MNG-1908. - - - - - org.apache.maven.it - maven-it-release-update - - - - - - it.releases - file:///${basedir}/repo - - always - - - - diff --git a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar b/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar deleted file mode 100644 index ddb569a83a..0000000000 Binary files a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar b/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar deleted file mode 100644 index d229c2a0ac..0000000000 Binary files a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar and /dev/null differ