From ae22bb617beaa7d0aedd68805280c7cc3b72cb69 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Tue, 12 Dec 2017 06:03:20 +0100
Subject: Updated to new in ivy++ scp/ssh tasks.

---
 buildScripts/website.ant.xml | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'buildScripts/website.ant.xml')

diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 4b61ee02..13626dd7 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -132,21 +132,22 @@ such as applying the templates to produce the website, converting the changelog
 		</tar>
 	</target>
 	
-	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
-	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
 	<target name="website-publish" depends="website, -send-site-to-remote" />
 	<target name="website-only-publish" depends="website-only, -send-site-to-remote" />
 	<target name="-send-site-to-remote" depends="-requires-ssh">
-		<scp
-			localFile="dist/website.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
+		<ivy:scpUpload
+			from="dist/website.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployWebsite" />
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployWebsite"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 	</target>
 	
 	<target name="latestChanges" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
@@ -189,14 +190,19 @@ such as applying the templates to produce the website, converting the changelog
 	</target>
 
 	<target name="edgeRelease" depends="-requires-ssh, edgeRelease-build">
-		<scp
-			localFile="dist/website-edge.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org" username="${ssh.username}" keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployEdge" />
+		<ivy:scpUpload
+			from="dist/website-edge.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployEdge"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 	</target>
 	
 	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion" unless="skip.javadoc">
-- 
cgit