diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-12-12 06:03:20 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-12-12 06:03:34 +0100 |
| commit | ae22bb617beaa7d0aedd68805280c7cc3b72cb69 (patch) | |
| tree | beaba68642d4d9f051ddacd4b7ede091f55e224a /buildScripts | |
| parent | d9031506b5e7804c277d29db060973cd17033e9a (diff) | |
| download | lombok-ae22bb617beaa7d0aedd68805280c7cc3b72cb69.tar.gz lombok-ae22bb617beaa7d0aedd68805280c7cc3b72cb69.tar.bz2 lombok-ae22bb617beaa7d0aedd68805280c7cc3b72cb69.zip | |
Updated to new in ivy++ scp/ssh tasks.
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/ivy.xml | 3 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 44 |
2 files changed, 26 insertions, 21 deletions
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"> |