epugh 2004/07/05 14:26:29
Modified: jbuilder plugin.jelly
Log:
use maven:pluginVar to retrieve reference to junit
Revision Changes Path
1.24 +4 -9 maven-plugins/jbuilder/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jbuilder/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 13 May 2004 19:50:32 -0000 1.23
+++ plugin.jelly 5 Jul 2004 21:26:29 -0000 1.24
@@ -437,15 +437,10 @@
<!-- Finally, if there are unit tests and we still do not have a specific
dependency on jUnit, use the version from the test plugin. -->
<j:if test="${unitTestSourcesPresent and junitArtifact == null}" >
- <!-- This goal forces the test plugin to be loaded.
- TODO: In Maven beta 9, use the special test:eclipse tag instead. -->
- <attainGoal name="test:prepare-filesystem" />
- <j:set var="testPluginProject"
value="${pom.getPluginContext('maven-test-plugin').getVariable('plugin')}"/>
- <j:forEach var="testPluginArtifact" items="${testPluginProject.artifacts}">
- <j:if test="${testPluginArtifact.dependency.artifactId == 'junit'}">
- <j:set var="junitArtifact" value="${testPluginArtifact}"/>
- </j:if>
- </j:forEach>
+
+ <maven:pluginVar var="testPlugin" plugin='maven-test-plugin'
property='plugin' />
+ <j:set var="junitArtifact">${testPlugin.getDependency('junit')}</j:set>
+
<jbuilder:generateArtifactLibrary
artifact="${junitArtifact}"
userHome="${jbUserHome}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
