Switch stable branch back to HEAD

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68

java/plugin.jelly

@@ -6,6 +6,27 @@
   xmlns:define="jelly:define"
   xmlns:maven="jelly:maven">
 
+  <j:choose>
+    <j:when test="${!pom.build.resources.includes.isEmpty()}">
+      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
+    </j:when>
+    <j:when test="${!pom.build.resources.excludes.isEmpty()}">
+      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
+    </j:when>
+    <j:otherwise>
+      <ant:property name="maven.has.jar.resource.patterns" value="false"/>
+    </j:otherwise>
+  </j:choose>
+
+  <ant:patternset id="maven.jar.resources.set">
+    <j:forEach var="res" items="${pom.build.resources.includes}">
+      <ant:include name="${res}"/>
+    </j:forEach>
+    <j:forEach var="res" items="${pom.build.resources.excludes}">
+      <ant:exclude name="${res}"/>
+    </j:forEach>
+  </ant:patternset>
+
   <!-- ================================================================== -->
   <!-- P R E P A R E  F I L E  S Y S T E M                                -->
   <!-- ================================================================== -->
@@ -22,27 +43,26 @@
   <goal name="java:compile"
         description="Compile the project"
         prereqs="java:prepare-filesystem">
-    <echo>Compiling to ${maven.build.dest}</echo>
+    <ant:echo>Compiling to ${maven.build.dest}</ant:echo>
     <j:choose>
-      <j:when test="${sourcesPresent}">
-        <ant:javac
+      <j:when test="${sourcesPresent == 'true'}">
+      	<ant:javac
           destdir="${maven.build.dest}"
           excludes="**/package.html"
-          debug="${plugins.java.compileDebug}"
-          deprecation="${plugins.java.compileDeprecation}"
-          target="${plugins.java.compileTarget}"
-          optimize="${plugins.java.compileOptimize}">
-          
-          <j:forEach var="path" items="${pom.compileSourceRootsList}">
-            <ant:src path="${path}"/>
-          </j:forEach>
-          
+          debug="${maven.compile.debug}"
+          deprecation="${maven.compile.deprecation}"
+          target="${maven.compile.target}"
+          optimize="${maven.compile.optimize}">
+          <ant:src>
+            <ant:path refid="maven.compile.src.set"/>
+          </ant:src>
+      
           <!--
            | 
            | Source Modifications.
            |
           -->
-          
+      
           <j:forEach var="sm" items="${pom.build.sourceModifications}">
             <ant:available property="classPresent" classname="${sm.className}"/>
             <j:if test="${classPresent != 'true'}">
@@ -94,7 +114,7 @@
   <goal name="java:jar"
         description="Create the deliverable jar file."
         prereqs="jar:jar">
-        <echo>java:jar is deprecated and will be removed. Please use jar:jar</echo>
+        <ant:echo>java:jar is deprecated and will be removed. Please use jar:jar</ant:echo>
   </goal>
 
   <!-- ================================================================== -->

java/plugin.properties

@@ -4,7 +4,4 @@
 
 maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
 maven.jar.mainclass = 
-compileTarget = 1.1
-compileDebug = on
-compileOptimize = off
-compileDeprecation = off
+maven.compile.target = 1.1