Roll back to context.getVariable to maintain m1.0 compatibility
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@349394 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8aec88688b
commit
1cc6484fbd
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
<!-- If from email address is empty, find the first non empty email
|
<!-- If from email address is empty, find the first non empty email
|
||||||
address from the POM. -->
|
address from the POM. -->
|
||||||
<j:if test="${maven.announcement.mail.from == null}">
|
<j:if test="${context.getVariable('maven.announcement.mail.from') == null}">
|
||||||
<j:forEach var="developer" items="${pom.developers}">
|
<j:forEach var="developer" items="${pom.developers}">
|
||||||
<j:if test="${not empty(developer.email)}">
|
<j:if test="${not empty(developer.email)}">
|
||||||
<j:set var="maven.announcement.mail.from" value="${developer.email}"/>
|
<j:set var="maven.announcement.mail.from" value="${developer.email}"/>
|
||||||
@ -214,7 +214,7 @@
|
|||||||
|
|
||||||
<!-- Resolve dynamic %% templates from maven.announcement.mail.subject -->
|
<!-- Resolve dynamic %% templates from maven.announcement.mail.subject -->
|
||||||
<j:set var="maven.announcement.mail.subject"
|
<j:set var="maven.announcement.mail.subject"
|
||||||
value="${stringUtils.replace(maven.announcement.mail.subject, '%VERSION%', versionVariable)}"/>
|
value="${stringUtils.replace(context.getVariable('maven.announcement.mail.subject'), '%VERSION%', versionVariable)}"/>
|
||||||
|
|
||||||
<echo>Sending mail using SMTP server "${maven.announcement.mail.server}", client ${maven.announcement.mail.client} and subject "${maven.announcement.mail.subject}"...</echo>
|
<echo>Sending mail using SMTP server "${maven.announcement.mail.server}", client ${maven.announcement.mail.client} and subject "${maven.announcement.mail.subject}"...</echo>
|
||||||
<echo>Sending from "${maven.announcement.mail.from}" to "${maven.announcement.mail.to}"...</echo>
|
<echo>Sending from "${maven.announcement.mail.from}" to "${maven.announcement.mail.to}"...</echo>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user