Cleanup usage of other plugins' properties
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112768 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
006fd84133
commit
ccb6c05cb5
@ -6,9 +6,7 @@
|
|||||||
<!-- P R O J E C T D O C U M E N T A T I O N -->
|
<!-- P R O J E C T D O C U M E N T A T I O N -->
|
||||||
<!-- ================================================================== -->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
<goal
|
<goal name="jdiff" prereqs="xdoc:init"
|
||||||
name="jdiff"
|
|
||||||
prereqs="xdoc:init"
|
|
||||||
description="generate an api difference report between versions">
|
description="generate an api difference report between versions">
|
||||||
|
|
||||||
<property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
|
<property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
|
||||||
@ -16,6 +14,9 @@
|
|||||||
|
|
||||||
<j:set var="docsDest"
|
<j:set var="docsDest"
|
||||||
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
|
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
|
||||||
|
<j:set var="javadocDestdir"
|
||||||
|
value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
|
||||||
|
|
||||||
<property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>
|
<property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>
|
||||||
<mkdir dir="${maven.jdiff.changes.dir}"/>
|
<mkdir dir="${maven.jdiff.changes.dir}"/>
|
||||||
|
|
||||||
@ -112,7 +113,7 @@
|
|||||||
<param name="-stats"/>
|
<param name="-stats"/>
|
||||||
<param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
<param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
||||||
<param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
<param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
||||||
<param name="-javadocnew" value="${maven.javadoc.destdir}/"/>
|
<param name="-javadocnew" value="${javadocDestdir}/"/>
|
||||||
</doclet>
|
</doclet>
|
||||||
|
|
||||||
</javadoc>
|
</javadoc>
|
||||||
|
|||||||
@ -18,11 +18,14 @@
|
|||||||
<attainGoal name="test:test"/>
|
<attainGoal name="test:test"/>
|
||||||
<j:set var="maven.test.failure.ignore" scope="parent"/>
|
<j:set var="maven.test.failure.ignore" scope="parent"/>
|
||||||
|
|
||||||
<mkdir dir="${maven.test.reportsDirectory}"/>
|
<j:set var="testReportsDirectory"
|
||||||
|
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.reportsDirectory')}"/>
|
||||||
|
|
||||||
|
<mkdir dir="${testReportsDirectory}"/>
|
||||||
|
|
||||||
<!-- Consolidate the reports into a single -->
|
<!-- Consolidate the reports into a single -->
|
||||||
<junitreport todir="${maven.build.dir}">
|
<junitreport todir="${maven.build.dir}">
|
||||||
<fileset dir="${maven.test.reportsDirectory}">
|
<fileset dir="${testReportsDirectory}">
|
||||||
<include name="TEST-*.xml"/>
|
<include name="TEST-*.xml"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</junitreport>
|
</junitreport>
|
||||||
|
|||||||
@ -3,20 +3,3 @@
|
|||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
# JUnit report plugin.
|
# JUnit report plugin.
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
maven.src.dir = ${basedir}/src
|
|
||||||
maven.conf.dir = ${basedir}/conf
|
|
||||||
maven.build.dir = ${basedir}/target
|
|
||||||
maven.build.src = ${maven.build.dir}/src
|
|
||||||
maven.build.dest = ${maven.build.dir}/classes
|
|
||||||
|
|
||||||
maven.docs.src = ${basedir}/xdocs
|
|
||||||
maven.docs.dest = ${maven.build.dir}/docs
|
|
||||||
maven.docs.outputencoding = ISO-8859-1
|
|
||||||
maven.gen.docs = ${maven.build.dir}/generated-xdocs
|
|
||||||
|
|
||||||
maven.junit.fork = no
|
|
||||||
maven.junit.dir = ${basedir}
|
|
||||||
maven.junit.usefile = true
|
|
||||||
maven.test.dest = ${maven.build.dir}/test-classes
|
|
||||||
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
|
|
||||||
|
|||||||
@ -37,14 +37,6 @@
|
|||||||
<code>${maven.build.dir}/generated-xdocs</code>.</p>
|
<code>${maven.build.dir}/generated-xdocs</code>.</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>maven.junit.fork</td>
|
|
||||||
<td>Yes</td>
|
|
||||||
<td>
|
|
||||||
<p>Default value is
|
|
||||||
<code>no</code>.</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>maven.build.dest</td>
|
<td>maven.build.dest</td>
|
||||||
<td>Yes</td>
|
<td>Yes</td>
|
||||||
@ -93,14 +85,6 @@
|
|||||||
<code>${basedir}/target</code>.</p>
|
<code>${basedir}/target</code>.</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>maven.junit.dir</td>
|
|
||||||
<td>Yes</td>
|
|
||||||
<td>
|
|
||||||
<p>Default value is
|
|
||||||
<code>${basedir}</code>.</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>maven.docs.dest</td>
|
<td>maven.docs.dest</td>
|
||||||
<td>Yes</td>
|
<td>Yes</td>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user