You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2004/04/30 16:24:31 UTC
cvs commit: maven-plugins/simian/xdocs changes.xml
vmassol 2004/04/30 07:24:31
Modified: simian project.xml plugin.jelly
simian/xdocs changes.xml
Log:
- Gracefully handle projects with no source
- Fixed <versions> tag in POM + added new version for 1.4 version in HEAD
Revision Changes Path
1.29 +21 -7 maven-plugins/simian/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/simian/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 27 Apr 2004 06:15:52 -0000 1.28
+++ project.xml 30 Apr 2004 14:24:31 -0000 1.29
@@ -34,6 +34,18 @@
<developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/simian/</developerConnection>
<url>http://cvs.apache.org/viewcvs/maven-plugins/simian/</url>
</repository>
+ <versions>
+ <version>
+ <id>1.3</id>
+ <name>1.3</name>
+ <tag>MAVEN_SIMIAN_1_3</tag>
+ </version>
+ <version>
+ <id>1.4</id>
+ <name>1.4</name>
+ <tag>HEAD</tag>
+ </version>
+ </versions>
<dependencies>
<dependency>
<groupId>redhill</groupId>
@@ -88,6 +100,15 @@
<role>Maven Plugin</role>
</roles>
</developer>
+ <developer>
+ <name>Vincent Massol</name>
+ <id>vmassol</id>
+ <email>vmassol@pivolis.com</email>
+ <organization>Pivolis</organization>
+ <roles>
+ <role>Maven Plugin</role>
+ </roles>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -105,11 +126,4 @@
<report>maven-javadoc-plugin</report>
<report>maven-clover-plugin</report>
</reports>
- <versions>
- <version>
- <id>1.3</id>
- <name>1.3</name>
- <tag>MAVEN_SIMIAN_1_3</tag>
- </version>
- </versions>
</project>
1.11 +26 -13 maven-plugins/simian/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/simian/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 30 Apr 2004 11:46:26 -0000 1.10
+++ plugin.jelly 30 Apr 2004 14:24:31 -0000 1.11
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
*/
-->
-
<!--
! Maven plugin for Simian
!
@@ -124,17 +124,23 @@
</goal>
- <goal name="maven-simian-plugin:report" prereqs="maven-simian-plugin:analyze">
- <simian:simianLog
- logFile="${maven.build.dir}/generated-xdocs/simian.log"
- jellyContext="${context}"
- sourceDirectory="${pom.build.sourceDirectory}"
- unitTestSourceDirectory="${pom.build.unitTestSourceDirectory}"
- />
- <j:set var="simLog" value="${context.getVariable('simianLog')}"/>
+ <goal name="maven-simian-plugin:report">
+
+ <j:choose>
+ <j:when test="${sourcesPresent}">
+
+ <attainGoal name="maven-simian-plugin:analyze"/>
+
+ <simian:simianLog
+ logFile="${maven.build.dir}/generated-xdocs/simian.log"
+ jellyContext="${context}"
+ sourceDirectory="${pom.build.sourceDirectory}"
+ unitTestSourceDirectory="${pom.build.unitTestSourceDirectory}"
+ />
+ <j:set var="simLog" value="${context.getVariable('simianLog')}"/>
- <j:file name="${maven.build.dir}/generated-xdocs/simian-report.xml" prettyPrint="true">
- <j:whitespace xmlns="dummy">
+ <j:file name="${maven.build.dir}/generated-xdocs/simian-report.xml" prettyPrint="true">
+ <j:whitespace xmlns="dummy">
<document>
<properties>
@@ -193,7 +199,14 @@
</body>
</document>
- </j:whitespace>
- </j:file>
+ </j:whitespace>
+ </j:file>
+
+ </j:when>
+ <j:otherwise>
+ <ant:echo>No sources to run Simian on</ant:echo>
+ </j:otherwise>
+ </j:choose>
+
</goal>
</project>
1.19 +4 -1 maven-plugins/simian/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/simian/xdocs/changes.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- changes.xml 27 Apr 2004 06:15:52 -0000 1.18
+++ changes.xml 30 Apr 2004 14:24:31 -0000 1.19
@@ -26,9 +26,12 @@
</properties>
<body>
<release version="1.4" date="in CVS">
+ <action dev="vmassol" type="fix">
+ Gracefully inform users when the plugin is executed on a project
+ with no source.
+ </action>
<action dev="dion" type="fix">Fix issues with DOM classes and jdk1.3</action>
</release>
-
<release version="1.3" date="2004-03-10">
<action dev="dion" type="fix">Apply MPSIMIAN-4. Fix HTML.</action>
<action dev="epugh" type="add">Allow classes to be included/excluded.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org