diff --git a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar b/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 b/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 deleted file mode 100644 index 66f7045df9cb..000000000000 --- a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d0907396ac6a770e05c81f6e8ed6348740f86a0 diff --git a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom b/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom deleted file mode 100644 index f74aea0ce484..000000000000 --- a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - 4.0.0 - - - maven-plugins - org.apache.maven.plugins - 19 - ../maven-plugins/pom.xml - - - maven-resources-plugin - 2.5 - maven-plugin - - Maven Resources Plugin - - The Resources Plugin handles the copying of project resources to the output - directory. There are two different kinds of resources: main resources and test resources. The - difference is that the main resources are the resources associated to the main - source code while the test resources are associated to the test source code. - Thus, this allows the separation of resources for the main source code and its - unit tests. - - 2001 - - - ${mavenVersion} - - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.5 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.5 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-resources-plugin-2.5 - - - JIRA - http://jira.codehaus.org/browse/MRESOURCES - - - - 1.0 - 2.0.6 - - - - - org.apache.maven - maven-plugin-api - ${mavenVersion} - - - org.apache.maven - maven-project - ${mavenVersion} - - - org.apache.maven - maven-core - ${mavenVersion} - - - org.apache.maven - maven-artifact - ${mavenVersion} - - - org.apache.maven - maven-settings - ${mavenVersion} - - - org.apache.maven - maven-model - ${mavenVersion} - - - org.apache.maven - maven-monitor - ${mavenVersion} - - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-9-stable-1 - - - - org.codehaus.plexus - plexus-utils - 2.0.5 - - - - org.apache.maven.shared - maven-filtering - ${mavenFilteringVersion} - - - - org.codehaus.plexus - plexus-interpolation - 1.13 - - - - org.apache.maven.shared - maven-plugin-testing-harness - 1.0-beta-1 - test - - - commons-io - commons-io - 1.4 - test - - - - - - run-its - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.codehaus.plexus - plexus-maven-plugin - - - - test-descriptor - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - true - src/it - - **/pom.xml - - verify - ${project.build.directory}/local-repo - - clean - process-test-resources - - src/it/settings.xml - ${project.build.directory}/it - - fromExecProps - - - - - integration-test - - install - run - - - - - - - - - diff --git a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 b/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 deleted file mode 100644 index ed141e784c90..000000000000 --- a/plugins/maven/src/test/data/plugins/org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -2d44c4a29ea56775c87002edb5aa23aab47e71ac diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenExtensionCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenExtensionCompletionAndResolutionTest.java index c0d3a9cee077..abb177cb9160 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenExtensionCompletionAndResolutionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenExtensionCompletionAndResolutionTest.java @@ -65,7 +65,7 @@ public class MavenExtensionCompletionAndResolutionTest extends MavenDomWithIndic " " + ""); - assertCompletionVariants(myProjectPom, "maven-compiler-plugin", "maven-war-plugin", "maven-eclipse-plugin", "maven-surefire-plugin", "maven-resources-plugin"); + assertCompletionVariants(myProjectPom, "maven-compiler-plugin", "maven-war-plugin", "maven-eclipse-plugin", "maven-surefire-plugin"); } public void testArtifactWithoutGroupCompletion() throws Exception { @@ -86,7 +86,6 @@ public class MavenExtensionCompletionAndResolutionTest extends MavenDomWithIndic "maven-war-plugin", "maven-surefire-plugin", "build-helper-maven-plugin", - "maven-resources-plugin", "maven-eclipse-plugin"); } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPluginCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPluginCompletionAndResolutionTest.java index b98768519a1e..eaea5c74b3c3 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPluginCompletionAndResolutionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPluginCompletionAndResolutionTest.java @@ -71,7 +71,7 @@ public class MavenPluginCompletionAndResolutionTest extends MavenDomWithIndicesT " " + ""); - assertCompletionVariants(myProjectPom, "maven-compiler-plugin", "maven-war-plugin", "maven-surefire-plugin", "maven-eclipse-plugin", "maven-resources-plugin"); + assertCompletionVariants(myProjectPom, "maven-compiler-plugin", "maven-war-plugin", "maven-surefire-plugin", "maven-eclipse-plugin"); } public void testArtifactWithoutGroupCompletion() throws Exception { @@ -92,7 +92,6 @@ public class MavenPluginCompletionAndResolutionTest extends MavenDomWithIndicesT "maven-war-plugin", "build-helper-maven-plugin", "maven-surefire-plugin", - "maven-resources-plugin", "maven-eclipse-plugin"); } @@ -903,59 +902,4 @@ public class MavenPluginCompletionAndResolutionTest extends MavenDomWithIndicesT assertCompletionVariants(myProjectPom); } - - public void testRequiringParameter() throws Throwable { - createProjectPom("test" + - "project" + - "1" + - - "" + - " " + - " \n" + - " maven-resources-plugin\n" + - " \n" + - " <outputDirectory/>\n" + - " \n" + - " \n" + - - " \n" + - " maven-resources-plugin\n" + - "" + - " \n" + - " aaa\n" + - " \n" + - " \n" + - - " \n" + - " maven-resources-plugin\n" + - "" + - " \n" + - " \n" + - " \n" + - - " \n" + - " maven-resources-plugin\n" + - " " + - " " + - " " + - " copy-resources" + - " resources" + - " " + - " <configuration>\n" + - " \n" + - " " + - " " + - " " + - "" + - " \n" + - " \n" + - " \n" + - - - " " + - ""); - - checkHighlighting(); - } - }