PR: MPJDIFF-2
Fix up class paths git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@267460 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e2d725baee
commit
c83e11be82
@ -136,16 +136,19 @@
|
|||||||
</j:otherwise>
|
</j:otherwise>
|
||||||
</j:choose>
|
</j:choose>
|
||||||
|
|
||||||
<ant:property name="maven.cp.sub" refid="maven-classpath"/>
|
|
||||||
<ant:property name="jdiff.jar" value="${plugin.getDependencyPath('jdiff')}"/>
|
|
||||||
<ant:property name="maven.cp" value="${maven.cp.sub};${jdiff.jar};${java.class.path}"/>
|
|
||||||
|
|
||||||
<ant:property name="baseuri" value="${plugin.dir}"/>
|
<ant:property name="baseuri" value="${plugin.dir}"/>
|
||||||
|
<ant:property name="jdiff.cp" value="${plugin.getDependencyPath('jdiff')};${plugin.getDependencyPath('xerces')}" />
|
||||||
|
|
||||||
|
<ant:path id="maven.cp">
|
||||||
|
<ant:pathelement location="${plugin.getDependencyPath('jdiff')}" />
|
||||||
|
<ant:path refid="maven.dependency.classpath" />
|
||||||
|
</ant:path>
|
||||||
|
|
||||||
<ant:javadoc
|
<ant:javadoc
|
||||||
|
classpathref="maven.cp"
|
||||||
sourcepath="${maven.jdiff.old.src}"
|
sourcepath="${maven.jdiff.old.src}"
|
||||||
packagenames="${pom.package}.*">
|
packagenames="${pom.package}.*">
|
||||||
<ant:doclet name="jdiff.JDiff" path="${maven.cp}">
|
<ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
|
||||||
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
|
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
|
||||||
<ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
|
<ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
|
||||||
<ant:param name="-baseURI" value="${baseuri}"/>
|
<ant:param name="-baseURI" value="${baseuri}"/>
|
||||||
@ -153,10 +156,10 @@
|
|||||||
</ant:javadoc>
|
</ant:javadoc>
|
||||||
|
|
||||||
<ant:javadoc
|
<ant:javadoc
|
||||||
|
classpathref="maven.cp"
|
||||||
packagenames="${pom.package}.*"
|
packagenames="${pom.package}.*"
|
||||||
sourcepath="${maven.jdiff.new.src}">
|
sourcepath="${maven.jdiff.new.src}">
|
||||||
|
<ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
|
||||||
<ant:doclet name="jdiff.JDiff" path="${maven.cp}">
|
|
||||||
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
|
<ant:param name="-apidir" value="${maven.jdiff.dir}"/>
|
||||||
<ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
|
<ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
|
||||||
<ant:param name="-baseURI" value="${baseuri}"/>
|
<ant:param name="-baseURI" value="${baseuri}"/>
|
||||||
@ -164,18 +167,19 @@
|
|||||||
</ant:javadoc>
|
</ant:javadoc>
|
||||||
|
|
||||||
<ant:javadoc
|
<ant:javadoc
|
||||||
|
classpathref="maven.cp"
|
||||||
private="yes"
|
private="yes"
|
||||||
destdir="${maven.jdiff.changes.dir}"
|
destdir="${maven.jdiff.changes.dir}"
|
||||||
packagenames="${pom.package}.*"
|
packagenames="${pom.package}.*"
|
||||||
sourcepath="${maven.jdiff.new.src}">
|
sourcepath="${maven.jdiff.new.src}">
|
||||||
|
<ant:doclet name="jdiff.JDiff" path="${jdiff.cp}">
|
||||||
<ant:doclet name="jdiff.JDiff" path="${maven.cp}">
|
|
||||||
<ant:param name="-stats"/>
|
<ant:param name="-stats"/>
|
||||||
<ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
<ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
||||||
|
<ant:param name="-oldapidir" value="${maven.jdiff.dir}"/>
|
||||||
<ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
<ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
||||||
|
<ant:param name="-newapidir" value="${maven.jdiff.dir}"/>
|
||||||
<ant:param name="-javadocnew" value="${javadocDestdir}/"/>
|
<ant:param name="-javadocnew" value="${javadocDestdir}/"/>
|
||||||
</ant:doclet>
|
</ant:doclet>
|
||||||
|
|
||||||
</ant:javadoc>
|
</ant:javadoc>
|
||||||
|
|
||||||
<ant:copy todir="${maven.jdiff.changes.dir}">
|
<ant:copy todir="${maven.jdiff.changes.dir}">
|
||||||
|
|||||||
@ -78,5 +78,10 @@
|
|||||||
<artifactId>jdiff</artifactId>
|
<artifactId>jdiff</artifactId>
|
||||||
<version>1.0.9</version>
|
<version>1.0.9</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>xerces</groupId>
|
||||||
|
<artifactId>xerces</artifactId>
|
||||||
|
<version>2.6.2</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
</properties>
|
</properties>
|
||||||
<body>
|
<body>
|
||||||
<release version="1.4.1-SNAPSHOT" date="in SVN">
|
<release version="1.4.1-SNAPSHOT" date="in SVN">
|
||||||
|
<action dev="brett" type="fix" issue="MPJDIFF-2">Add the classpath to the Javadoc tag to properly resolve classes</action>
|
||||||
<action dev="brett" type="update" issue="MPJDIFF-4">Store difference XML files in the <code>target/jdiff</code> directory</action>
|
<action dev="brett" type="update" issue="MPJDIFF-4">Store difference XML files in the <code>target/jdiff</code> directory</action>
|
||||||
<action dev="brett" type="update" due-to="Phil Steitz" issue="MPJDIFF-6">Utilise SCM plugin to support multiple SCMs (tested with CVS and Subversion)</action>
|
<action dev="brett" type="update" due-to="Phil Steitz" issue="MPJDIFF-6">Utilise SCM plugin to support multiple SCMs (tested with CVS and Subversion)</action>
|
||||||
<action dev="dion" type="add">Add basic homepage.</action>
|
<action dev="dion" type="add">Add basic homepage.</action>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user