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 bad86b7beb..534f2f33e1 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 @@ -166,7 +166,6 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenIT0114ExtensionThatProvidesResources.class ); suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class ); suite.addTestSuite( MavenIT0112ExtensionsThatDragDependencies.class ); - suite.addTestSuite( MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.class ); suite.addTestSuite( MavenIT0110PluginDependenciesComeFromPluginReposTest.class ); suite.addTestSuite( MavenIT0107Test.class ); suite.addTestSuite( MavenIT0106Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java deleted file mode 100644 index 128287b6c6..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java +++ /dev/null @@ -1,68 +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 java.io.File; -import java.util.List; -import java.util.ArrayList; - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -public class MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest - extends AbstractMavenIntegrationTestCase -{ - public MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest() - { - super( "(,2.99.99)" ); - } - - public void testit0111() - throws Exception - { - File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/it0111-pluginThatRequiresResourceFromAnExtension" ); - - Verifier verifier; - - // Install the parent POM - verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.it0111", "parent", "1.0", "pom" ); - verifier.deleteArtifact( "org.apache.maven.its.it0111", "checkstyle-test", "1.0", "jar" ); - verifier.deleteArtifact( "org.apache.maven.its.it0111", "checkstyle-assembly", "1.0", "jar" ); - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoal( "install" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - // Install the extension with the resources required for the test - verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() ); - verifier.executeGoal( "install" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - // Run the whole test - verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() ); - verifier.executeGoal( "install" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } -} diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/pom.xml b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/pom.xml deleted file mode 100644 index 2cd7dd06de..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.apache.maven.its.it0111 - parent - 1 - - STC Checkstyle - checkstyle-assembly - 1.0 - diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/LICENSE.txt b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/LICENSE.txt deleted file mode 100644 index 872d99cbd5..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/LICENSE.txt +++ /dev/null @@ -1 +0,0 @@ -This is the license diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/rule_set.xml b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/rule_set.xml deleted file mode 100644 index fc5f45486e..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/rule_set.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - This ruleset checks EPHS code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/stc_checks.xml b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/stc_checks.xml deleted file mode 100644 index 02aa309a5c..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-assembly/src/main/resources/stc_checks.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/pom.xml b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/pom.xml deleted file mode 100644 index 4cad7a859d..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - - org.apache.maven.its.it0111 - parent - 1 - - checkstyle-test - Checkstyle Test - - - - - org.apache.maven.its.it0111 - checkstyle-assembly - 1.0 - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.1 - true - - - STC Checks - verify - - checkstyle - - - stc_checks.xml - true - ${project.build.directory}/checkstyle-cachefile - true - - - - - - - - diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/src/main/java/Class.java b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/src/main/java/Class.java deleted file mode 100644 index 244f1e5605..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/checkstyle-test/src/main/java/Class.java +++ /dev/null @@ -1,9 +0,0 @@ -public class Class -{ - -public static void main(String[] args) -{ - System.out.println("hello"); - } - -} \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/pom.xml b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/pom.xml deleted file mode 100644 index 353b74339c..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - org.apache.maven.its.it0111 - parent - pom - 1 - Checkstyle - - diff --git a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt b/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt deleted file mode 100644 index 91e732c336..0000000000 --- a/its/core-it-suite/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This test is disabled and replaced with it0114. This test uses checkstyle directly and doesn't completely reproduce all issues with extensions.