You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/08/17 20:15:50 UTC
svn commit: r432314 - in /maven/maven-1/plugins/trunk/war: plugin.jelly
xdocs/changes.xml
Author: ltheussl
Date: Thu Aug 17 11:15:49 2006
New Revision: 432314
URL: http://svn.apache.org/viewvc?rev=432314&view=rev
Log:
PR: MPWAR-62
Submitted by: Nicolas de Loof
Thanks to: Shinobu Kawai
Another patch that fixes missing resources.
Modified:
maven/maven-1/plugins/trunk/war/plugin.jelly
maven/maven-1/plugins/trunk/war/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/war/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=432314&r1=432313&r2=432314&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Thu Aug 17 11:15:49 2006
@@ -182,8 +182,9 @@
<!-- If maven.test.skip != true, java:compile is attained in test:test -->
<maven:get var="testsSkipped" plugin="maven-test-plugin" property="maven.test.skip"/>
- <j:if test="${testsSkipped}">
- <attainGoal name="java:compile"/>
+ <j:if test="${unitTestSourcesPresent != 'true' or testsSkipped == 'true'}">
+ <attainGoal name="java:compile"/>
+ <attainGoal name="java:jar-resources"/>
</j:if>
<ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=432314&r1=432313&r2=432314&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Thu Aug 17 11:15:49 2006
@@ -24,7 +24,12 @@
</properties>
<body>
<release version="1.6.3-SNAPSHOT" date="in SVN">
- <action dev="ltheussl" type="fix" issue="MPWAR-62">Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</action>
+ <action dev="ltheussl" type="fix">
+ <description>Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</description>
+ <fixes issue="MPWAR-62"/>
+ <dueto name="Nicolas de Loof"/>
+ <dueto name="Shinobu Kawai"/>
+ </action>
</release>
<release version="1.6.2" date="2006-06-18">
<action dev="snicoll" type="fix" issue="MPWAR-58">Manifest file is now generated properly.</action>