Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPSITE-40: Missing maven.ssh.args in site:publish

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290961 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2005-09-22 15:28:10 +00:00
parent 46e01e1f0b
commit d1115d4dc2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
site/plugin.jelly
View File

@ -287,11 +287,11 @@
<j:if test="${publishClean}">
<echo>Cleaning destination first</echo>
<exec dir="." executable="${maven.ssh.executable}">
<arg line="${siteUsername}@${siteAddress} 'rm -r ${destSiteDirectory}'" />
<arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'rm -r ${destSiteDirectory}'" />
</exec>
</j:if>
<exec dir="." executable="${maven.ssh.executable}">
<arg line="${siteUsername}@${siteAddress} 'mkdir -p ${destSiteDirectory}; cp -r ${siteDirectory}/* ${destSiteDirectory}'" />
<arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'mkdir -p ${destSiteDirectory} &amp;&amp; cp -r ${siteDirectory}/* ${destSiteDirectory}'" />
</exec>
</j:when>
<j:otherwise>
@ -302,7 +302,7 @@
<j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
</j:if>
<exec dir="." executable="${maven.ssh.executable}">
<arg line="${siteUsername}@${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
<arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
</exec>
</j:otherwise>
</j:choose>

1
site/xdocs/changes.xml
View File

@ -23,6 +23,7 @@
</properties>
<body>
<release version="1.6.2-SNAPSHOT" date="In SVN">
<action dev="ltheussl" type="fix" issue="MPSITE-40">Missing <code>maven.ssh.args</code> in <code>site:publish</code>.</action>
<action dev="ltheussl" type="add" issue="MPSITE-31">Make <code>chmod</code> options in <code>site:sshdeploy</code> configurable.</action>
<action dev="ltheussl" type="fix" issue="MPSITE-24" due-to="Julian Dunn">SSH arguments not used in <code>sshdeploy</code> with 'clean'.</action>
<action dev="aheritier" type="fix" issue="MPSITE-28" due-to="Davy Toch">Deploying the site documentation through SSH always results in 'Build Successful'.</action>