You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sh...@apache.org on 2006/09/07 03:33:13 UTC
svn commit: r440930 - in /maven/maven-1/plugins/trunk/ejb: plugin.jelly
xdocs/changes.xml
Author: shinobu
Date: Wed Sep 6 18:33:12 2006
New Revision: 440930
URL: http://svn.apache.org/viewvc?view=rev&rev=440930
Log:
MPEJB-23: Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.
Modified:
maven/maven-1/plugins/trunk/ejb/plugin.jelly
maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/ejb/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/ejb/plugin.jelly?view=diff&rev=440930&r1=440929&r2=440930
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/ejb/plugin.jelly Wed Sep 6 18:33:12 2006
@@ -46,7 +46,15 @@
<j:choose>
<j:when test="${sourcesPresent == 'true'}">
- <attainGoal name="test:test"/>
+ <j:choose>
+ <j:when test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
+ <attainGoal name="test:test"/>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="java:compile"/>
+ <attainGoal name="java:jar-resources"/>
+ </j:otherwise>
+ </j:choose>
</j:when>
<j:otherwise>
<!-- Make sure we always copy the resources whether there are sources or
Modified: maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml?view=diff&rev=440930&r1=440929&r2=440930
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml Wed Sep 6 18:33:12 2006
@@ -27,6 +27,7 @@
<release version="1.7.3-SNAPSHOT" date="In SVN">
</release>
<release version="1.7.2" date="2006-03-05">
+ <action dev="shinobu" type="fix" issue="MPEJB-23">Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.3 -> v1.0.4</li>