[Maven-plugins-cvs] cvs commit: maven-plugins/javaapp plugin.jelly

[Lukas T. <luk...@us...>]

lukas_theussl    07/05/13 11:49:02

  Modified:    javaapp/xdocs changes.xml
               javaapp  plugin.jelly
  Log:
  Apply fix to work around MPTEST-66, it should now be compatible with Maven 1.1 and test-plugin-1.8.
  
  Revision  Changes    Path
  1.11      +3 -0      maven-plugins/javaapp/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/xdocs/changes.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- changes.xml	30 Jul 2006 03:45:05 -0000	1.10
  +++ changes.xml	13 May 2007 18:49:01 -0000	1.11
  @@ -16,6 +16,9 @@
         <action dev="jeffjensen" type="fix" issue="1436490" due-to="Daniel Schulz">
           EJB jars are not bundled
         </action>
  +      <action dev="lukas_theussl" type="update">
  +        Make it compatible with Maven 1.1 and test-plugin-1.8.
  +      </action>
       </release>
       <release version="1.3.1" date="2005-08-25">
         <action dev="joehni" type="fix" due-to="Eric Hartmann">
  
  
  
  1.16      +7 -1      maven-plugins/javaapp/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- plugin.jelly	30 Jul 2006 03:44:11 -0000	1.15
  +++ plugin.jelly	13 May 2007 18:49:02 -0000	1.16
  @@ -119,7 +119,13 @@
     <goal name="javaapp:jar"
           description="Packs all dependent JARs into an executable JAR"
           prereqs="javaapp:prereq,test:test,javaapp:copy-deps,javaapp:jar-resources">  
  -        
  +
  +    <!-- required for maven 1.1 and test-plugin-1.8, see http://jira.codehaus.org/browse/MPTEST-66 -->
  +    <j:if test="${unitTestSourcesPresent != 'true' or context.getVariable('maven.test.skip') == 'true'}">
  +      <attainGoal name="java:compile"/>
  +      <attainGoal name="java:jar-resources"/>
  +    </j:if>
  +
       <!-- unzip all JARS -->
   
       <ant:fileScanner var="jarFileList">