Skip to content

Commit

Permalink
change plantuml version to fix javadoc-uml
Browse files Browse the repository at this point in the history
  • Loading branch information
bobjacobsen committed Jun 10, 2020
1 parent c4e2c27 commit b244194
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
8 changes: 5 additions & 3 deletions build.xml
Expand Up @@ -1768,7 +1768,7 @@

<target name="javadoc" depends="init, jjdoc, compile-generated-source, plantuml" description="create Javadocs">
<javadoc packagenames="jmri.*, apps.*"
maxmemory="512m"
maxmemory="1536m"
overview="${source}/jmri/overview.html"
destdir="${doctarget}"
additionalparam="-breakiterator"
Expand Down Expand Up @@ -1869,7 +1869,7 @@
<target name="javadoc-uml" depends="check-java-version-requirement, init, jjdoc, compile-generated-source, plantuml"
description="create Javadocs with UML, requires Java 11">
<javadoc packagenames="jmri.*, apps.*"
maxmemory="512m"
maxmemory="1536m"
overview="${source}/jmri/overview.html"
destdir="${doctarget}"
additionalparam="-breakiterator"
Expand Down Expand Up @@ -1906,7 +1906,7 @@
<tag name="navassoc" enabled="false"/>

<doclet name="nl.talsmasoftware.umldoclet.UMLDoclet"
path="${libdir}/umldoclet-2.0.9.jar">
path="${libdir}/plantuml.jar:${libdir}/umldoclet-2.0.9.jar">
<param name="-package"/>
<param name="--show-members=package"/>
<param name="-linksource"/>
Expand Down Expand Up @@ -1959,6 +1959,7 @@

</javadoc>

<!--
<apply executable="dot" dest="${doctarget}" parallel="false">
<arg value="-Tpng"/>
<arg value="-o"/>
Expand All @@ -1967,6 +1968,7 @@
<fileset dir="${doctarget}" includes="*.dot"/>
<mapper type="glob" from="*.dot" to="*.png"/>
</apply>
-->
</target>

<taskdef name="plantuml" classname="net.sourceforge.plantuml.ant.PlantUmlTask" classpath="${libdir}/plantuml.jar" />
Expand Down
3 changes: 2 additions & 1 deletion lib/README.md
Expand Up @@ -288,7 +288,8 @@ NOTE: joal.jar is currently replaced by an own-built version with modifications

##### PlantUML
- plantuml.jar
from plantuml.org
was from plantuml.org, now from https://github.com/plantuml/plantuml.git
backdated to v1.2019.8 to resolve state error in umldoclet
- umldoclet-2.0.9.jar
from https://github.com/talsma-ict/umldoclet

Expand Down
Binary file modified lib/plantuml.jar
Binary file not shown.

0 comments on commit b244194

Please sign in to comment.