From 4948f63c702a9a738cebdacff8ac7fe2dde8f527 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Wed, 16 Jun 2004 02:51:37 +0000
Subject: [PATCH] o Ok, this set of changes has been tested against the
 integration tests in   maven-core-it and it is now a requirement that the
 integration tests be   done before checking in any changes. They are not
 super rigourous but   they do test the minimal functionality of compiling,
 processing resources   and testing.

  I'm going to make another release this week and things should now be
  in a stable enough form to actually use m2 for the basics.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162763 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/maven/plugin/CompilerMojo.java | 2 +-
 .../main/java/org/apache/maven/plugin/TestCompilerMojo.java | 2 +-
 .../org/apache/maven/plugin/plugin/JellyGeneratorMojo.java  | 6 +++---
 .../apache/maven/plugin/resources/TestResourcesMojo.java    | 2 +-
 .../src/main/java/org/apache/maven/test/SurefirePlugin.java | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
index d56a40fd1a..d2c288668d 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
+++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
@@ -11,7 +11,7 @@
 /**
  * @goal compile
  *
- * @requiresDependencyResolution
+ * @requiresDependencyResolutionXX
  *
  * @description Compiles application sources
  *
diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
index d713c60346..4ab62bc140 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
+++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- * @goal test:compile
+ * @goal testCompile
  *
  * @description Compiles test sources
  *
diff --git a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
index d8996ba4d5..9204b8d02a 100644
--- a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
+++ b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
@@ -13,21 +13,21 @@
  *  required="true"
  *  validator=""
  *  expression="#project.build.sourceDirectory"
- *  description=""
+ *  description="x"
  * @parameter
  *  name="outputDirectory"
  *  type="String"
  *  required="true" 
  *  validator=""
  *  expression="#project.build.output
- *  description=""
+ *  description="x"
  * @parameter
  *  name="pom"
  *  type="String"
  *  required="true"
  *  validator=""
  *  expression="#project.getFile().getPath()"
- *  description=""
+ *  description="x"
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
diff --git a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
index c28245033a..cf903ab513 100644
--- a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
+++ b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 /**
- * @goal test:resources
+ * @goal testResources
  *
  * @description copy test resources
  *
diff --git a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
index 55beffbbab..62645ee4f3 100644
--- a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
+++ b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
@@ -14,9 +14,9 @@
  * @description Run tests using surefire
  *
  * @prereq compiler:compile
- * @prereq compiler:test:compile
+ * @prereq compiler:testCompile
  * @prereq resources:resources
- * @prereq resources:test:resources
+ * @prereq resources:testResources
  *
  * @parameter
  *  name="mavenRepoLocal"