Replace deprecated maven:pluginVar by maven:get
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@374462 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
21c3e10b72
commit
9b897fbf7f
6
dist/plugin.jelly
vendored
6
dist/plugin.jelly
vendored
@ -355,19 +355,19 @@
|
|||||||
|
|
||||||
<j:set var="multiprojectIncludes" value="${maven.dist.multiproject.includes}"/>
|
<j:set var="multiprojectIncludes" value="${maven.dist.multiproject.includes}"/>
|
||||||
<j:if test="${multiprojectIncludes == null or multiprojectIncludes.length() eq 0}">
|
<j:if test="${multiprojectIncludes == null or multiprojectIncludes.length() eq 0}">
|
||||||
<maven:pluginVar var="multiprojectIncludes" plugin="maven-multiproject-plugin"
|
<maven:get var="multiprojectIncludes" plugin="maven-multiproject-plugin"
|
||||||
property="maven.multiproject.includes"/>
|
property="maven.multiproject.includes"/>
|
||||||
</j:if>
|
</j:if>
|
||||||
|
|
||||||
<j:set var="multiprojectExcludes" value="${maven.dist.multiproject.excludes}"/>
|
<j:set var="multiprojectExcludes" value="${maven.dist.multiproject.excludes}"/>
|
||||||
<j:if test="${multiprojectExcludes == null or multiprojectExcludes.length() eq 0}">
|
<j:if test="${multiprojectExcludes == null or multiprojectExcludes.length() eq 0}">
|
||||||
<maven:pluginVar var="multiprojectExcludes" plugin="maven-multiproject-plugin"
|
<maven:get var="multiprojectExcludes" plugin="maven-multiproject-plugin"
|
||||||
property="maven.multiproject.excludes"/>
|
property="maven.multiproject.excludes"/>
|
||||||
</j:if>
|
</j:if>
|
||||||
|
|
||||||
<j:set var="multiprojectBasedir" value="${maven.idea.project.multiproject.basedir}"/>
|
<j:set var="multiprojectBasedir" value="${maven.idea.project.multiproject.basedir}"/>
|
||||||
<j:if test="${multiprojectBasedir == null or multiprojectBasedir.length() eq 0}">
|
<j:if test="${multiprojectBasedir == null or multiprojectBasedir.length() eq 0}">
|
||||||
<maven:pluginVar var="multiprojectBasedir" plugin="maven-multiproject-plugin"
|
<maven:get var="multiprojectBasedir" plugin="maven-multiproject-plugin"
|
||||||
property="maven.multiproject.basedir"/>
|
property="maven.multiproject.basedir"/>
|
||||||
</j:if>
|
</j:if>
|
||||||
|
|
||||||
|
|||||||
@ -63,7 +63,7 @@
|
|||||||
<j:set var="maven.test.failure.ignore" scope="parent"
|
<j:set var="maven.test.failure.ignore" scope="parent"
|
||||||
value="${ignoreTestFailureOld}"/>
|
value="${ignoreTestFailureOld}"/>
|
||||||
|
|
||||||
<maven:pluginVar var="testReportsDirectory" plugin='maven-test-plugin' property='maven.test.reportsDirectory'/>
|
<maven:get var="testReportsDirectory" plugin="maven-test-plugin" property="maven.test.reportsDirectory"/>
|
||||||
|
|
||||||
<ant:mkdir dir="${testReportsDirectory}"/>
|
<ant:mkdir dir="${testReportsDirectory}"/>
|
||||||
|
|
||||||
|
|||||||
@ -41,7 +41,7 @@
|
|||||||
</goal>
|
</goal>
|
||||||
|
|
||||||
<goal name="site:run-reports" prereqs="xdoc:register-reports">
|
<goal name="site:run-reports" prereqs="xdoc:register-reports">
|
||||||
<maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
|
<maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
|
||||||
|
|
||||||
<j:forEach var="report" items="${reports}">
|
<j:forEach var="report" items="${reports}">
|
||||||
<j:set var="reportName" value="${report.get('pluginName')}"/>
|
<j:set var="reportName" value="${report.get('pluginName')}"/>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user