From b5ce0c41c3e7998a3a035a76e9fe8d4f55d5201f Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Mon, 14 Jun 2004 23:22:47 +0000
Subject: [PATCH] o update plugins to take advantage of the new default values
 in the super   model provided by maven-core.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162757 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/maven/plugin/CompilerMojo.java   | 8 +-------
 .../java/org/apache/maven/plugin/TestCompilerMojo.java    | 3 +--
 .../main/java/org/apache/maven/plugin/jar/JarMojo.java    | 2 +-
 .../org/apache/maven/plugin/resources/ResourcesMojo.java  | 2 +-
 .../apache/maven/plugin/resources/TestResourcesMojo.java  | 3 +--
 5 files changed, 5 insertions(+), 13 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 c941bb6dc2..0019742573 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
@@ -25,7 +25,7 @@ import java.util.List;
  *  type="String"
  *  required="true"
  *  validator=""
- *  expression="#project.build.directory/classes"
+ *  expression="#project.build.output"
  *  description=""
  * @parameter
  *  name="classpathElements"
@@ -57,16 +57,10 @@ public class CompilerMojo
 
         String sourceDirectory = (String) request.getParameter( "sourceDirectory" );
 
-        System.out.println( "sourceDirectory = " + sourceDirectory );
-
         String outputDirectory = (String) request.getParameter( "outputDirectory" );
 
-        System.out.println( "outputDirectory = " + outputDirectory );
-
         String[] classpathElements = (String[]) request.getParameter( "classpathElements" );
 
-        String compilerId = (String) request.getParameter( "compiler" );
-
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
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 da44ddafaf..86ec2ed473 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
@@ -25,7 +25,7 @@ import java.util.List;
  *  type="String"
  *  required="true"
  *  validator=""
- *  expression="#project.build.directory/test-classes"
+ *  expression="#project.build.testOutput"
  *  description=""
  * @parameter
  *  name="classpathElements"
@@ -40,7 +40,6 @@ import java.util.List;
  * @todo use compile source roots and not the pom.build.sourceDirectory so that any
  *       sort of preprocessing and/or source generation can be taken into consideration.
  */
-
  public class TestCompilerMojo
     extends CompilerMojo
 {
diff --git a/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java b/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
index 1ff81c45a4..0ec74bfe36 100644
--- a/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
+++ b/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
@@ -57,7 +57,7 @@ import java.util.jar.Manifest;
  *  type="String"
  *  required="true"
  *  validator=""
- *  expression="#project.build.directory/classes"
+ *  expression="#project.build.output"
  *  description=""
  *
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
diff --git a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
index 41d337fa2d..843157fc3f 100644
--- a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
+++ b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
@@ -42,7 +42,7 @@ import java.util.List;
  *  type="String"
  *  required="true"
  *  validator=""
- *  expression="#project.build.directory/classes"
+ *  expression="#project.build.output"
  *  description=""
  * @parameter
  *  name="resources"
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 bdf1161e1f..c28245033a 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
@@ -17,7 +17,6 @@ package org.apache.maven.plugin.resources;
  * ====================================================================
  */
 
-
 import org.apache.maven.model.Resource;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -39,7 +38,7 @@ import java.util.List;
  *  type="String"
  *  required="true"
  *  validator=""
- *  expression="#project.build.directory/test-classes"
+ *  expression="#project.build.testOutput"
  *  description=""
  * @parameter
  *  name="resources"