dion 2003/10/01 18:20:11
Modified: src/plugins-build/xdoc/xdocs changes.xml
src/plugins-build/xdoc/src/plugin-resources navigation.jelly
src/plugins-build/xdoc project.xml
Log:
Fixed source repository and issue tracking url's being added to nav even if the
elements in the pom were empty
Revision Changes Path
1.18 +7 -0 maven/src/plugins-build/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changes.xml 29 Sep 2003 06:27:58 -0000 1.17
+++ changes.xml 2 Oct 2003 01:20:11 -0000 1.18
@@ -6,6 +6,13 @@
</properties>
<body>
+ <release version="1.5" date="in CVS">
+ <action dev="dion" type="fix">
+ Fixed empty scm repository and issue tracking URL still being added
+ to the project nav
+ </action>
+ </relase>
+
<release version="1.4" date="2003-09-29">
<action dev="dion" type="fix">
Applied Maven-756. cvs-usage.xml breaks on non-cvs scm URL
1.3 +4 -2
maven/src/plugins-build/xdoc/src/plugin-resources/navigation.jelly
Index: navigation.jelly
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/navigation.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.jelly 24 Jul 2003 06:31:48 -0000 1.2
+++ navigation.jelly 2 Oct 2003 01:20:11 -0000 1.3
@@ -16,11 +16,13 @@
<item name="Project Team" href="/team-list.html"/>
<item name="Dependencies" href="/dependencies.html"/>
- <j:if test="${!empty(pom.repository.url)}">
+ <j:set var="url" value="${pom.repository.url}"/>
+ <j:if test="${!empty(url)}">
<item name="Source Repository" href="/cvs-usage.html"/>
</j:if>
- <j:if test="${!empty(pom.issueTrackingUrl)}">
+ <j:set var="url" value="${pom.issueTrackingUrl}"/>
+ <j:if test="${!empty(url)}">
<item name="Issue Tracking" href="/issue-tracking.html"/>
</j:if>
</item>
1.30 +1 -1 maven/src/plugins-build/xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 29 Sep 2003 05:19:14 -0000 1.29
+++ project.xml 2 Oct 2003 01:20:11 -0000 1.30
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-xdoc-plugin</id>
<name>Maven XDoc Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<shortDescription>Convert xdocs into HTML</shortDescription>
<url>http://maven.apache.org/reference/plugins/xdoc/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
