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.

---
 build.xml                    | 99 ++++++++++++++++++++++++--------------------
 buildScripts/ivy.xml         |  3 +-
 buildScripts/website.ant.xml | 44 +++++++++++---------
 3 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/build.xml b/build.xml
index d33a1952..633d7922 100644
--- a/build.xml
+++ b/build.xml
@@ -54,11 +54,6 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</fileset>
 	</path>
 	
-	<target name="-defSSH" depends="ensureBuildDeps">
-		<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>
-	
 	<target name="clean" description="Removes all generated files.">
 		<delete dir="build" quiet="true" />
 	</target>
@@ -81,7 +76,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	
 	<target name="load-ipp" depends="download-ipp">
 		<taskdef classpath="lib/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" />
-		<ivy:ensureippversion version="1.22" property="ivyplusplus.minimumAvailable" />
+		<ivy:ensureippversion version="1.26" property="ivyplusplus.minimumAvailable" />
 	</target>
 	
 	<target name="redownload-ipp" unless="ivyplusplus.minimumAvailable">
@@ -784,51 +779,63 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		</tar>
 	</target>
 	
-	<target name="maven-publish" depends="config-ssh, -defSSH, maven, utils-maven" description="Build a maven artifact bundle then upload it to projectlombok.org and ask the server to upload it to maven central">
-		<scp
-			localFile="build/mavenPublish/mavenPublish.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<scp
-			localFile="build/utils-mavenPublish/utils-mavenPublish.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
+	<target name="maven-publish" depends="config-ssh, maven, utils-maven" description="Build a maven artifact bundle then upload it to projectlombok.org and ask the server to upload it to maven central">
+		<ivy:scpUpload
+			from="build/mavenPublish/mavenPublish.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:scpUpload
+			from="build/utils-mavenPublish/utils-mavenPublish.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/publishToMavenCentral"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/publishToMavenCentral" />
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 		<echo>The artifact has been published to staging. Now go to https://oss.sonatype.org/ and log in as Reinier, then doublecheck if all is well and 'release' it.</echo>
-		<sshexec
-			host="projectlombok.org"
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/showMavenCentralPassword"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+	</target>
+	
+	<target name="publish" description="Publishes the latest build to googlecode." depends="config-ssh, version, dist, dist-utils, test">
+		<ivy:scpUpload
+			from="dist/lombok-utils-${lombok.version}.jar"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployLombokUtils '${lombok.version}'"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/showMavenCentralPassword" />
-	</target>
-	
-	<target name="publish" description="Publishes the latest build to googlecode." depends="config-ssh, -defSSH, version, dist, dist-utils, test">
-		<scp
-			localFile="dist/lombok-utils-${lombok.version}.jar"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:scpUpload
+			from="dist/lombok-${lombok.version}.jar"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployLombokUtils '${lombok.version}'" />
-		<scp
-			localFile="dist/lombok-${lombok.version}.jar"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployLombok '${lombok.version}'"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployLombok '${lombok.version}'" />
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 	</target>
 	
 	<target name="publish-all" depends="clean, version, website-publish, maven-publish, publish"
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 9a1efdc7..81f50f4c 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -32,8 +32,7 @@
 		
 		<dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="buildBase->default; contrib->sources" />
 		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="buildBase->build" />
-		<dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="buildBase->default" />
-		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="buildBase->build" />
+		<dependency org="com.hierynomus" name="sshj" rev="0.23.0" conf="buildBase->default" />
 		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildBase->build" />
 		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildBase->default" />
 		<dependency org="org.freemarker" name="freemarker" rev="2.3.25-incubating" conf="buildBase->default" />
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