Replace deprecated maven:pluginVar by maven:get.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@413107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
467fa6f39a
commit
637f27850c
@ -103,18 +103,18 @@
|
||||
<!-- if they are not provided we will try use use multiproject settings -->
|
||||
<j:set var="multiprojectIncludes" value="${maven.idea.project.multiproject.includes}"/>
|
||||
<j:if test="${multiprojectIncludes == null or multiprojectIncludes.length() eq 0}">
|
||||
<maven:pluginVar var="multiprojectIncludes" plugin="maven-multiproject-plugin" property="maven.multiproject.includes"/>
|
||||
<maven:get var="multiprojectIncludes" plugin="maven-multiproject-plugin" property="maven.multiproject.includes"/>
|
||||
</j:if>
|
||||
|
||||
<j:set var="multiprojectExcludes" value="${maven.idea.project.multiproject.excludes}"/>
|
||||
<j:if test="${multiprojectExcludes == null or multiprojectExcludes.length() eq 0}">
|
||||
<maven:pluginVar var="multiprojectExcludes" plugin="maven-multiproject-plugin" property="maven.multiproject.excludes"/>
|
||||
<maven:get var="multiprojectExcludes" plugin="maven-multiproject-plugin" property="maven.multiproject.excludes"/>
|
||||
</j:if>
|
||||
|
||||
|
||||
<j:set var="multiprojectBasedir" value="${maven.idea.project.multiproject.basedir}"/>
|
||||
<j:if test="${multiprojectBasedir == null or multiprojectBasedir.length() eq 0}">
|
||||
<maven:pluginVar var="multiprojectBasedir" plugin="maven-multiproject-plugin" property="maven.multiproject.basedir"/>
|
||||
<maven:get var="multiprojectBasedir" plugin="maven-multiproject-plugin" property="maven.multiproject.basedir"/>
|
||||
</j:if>
|
||||
|
||||
<maven:reactor
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
|
||||
<goal name="touchstone:test-context-switch">
|
||||
<j:set var="touchstoneSourceDir" value="${pom.build.sourceDirectory}" />
|
||||
<maven:pluginVar var="var" plugin="maven-touchstone-partner-plugin" property="partnerSourceDir" />
|
||||
<maven:get var="var" plugin="maven-touchstone-partner-plugin" property="partnerSourceDir" />
|
||||
<j:if test="${var != touchstoneSourceDir}">
|
||||
<ant:fail>pom.build.sourceDirectory differs over plugin and partner plugin (touchstone = '${touchstoneSourceDir}'; partner = '${var}')</ant:fail>
|
||||
</j:if>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user