tapestry-5 git commit: Fix gradle task zippedBinaries to correctly use a buildable file collection, make scp use public key authentication instead of password because the latter isn't allowed anymore

[ka...@apache.org]

Repository: tapestry-5
Updated Branches:
  refs/heads/5.3 eb58c27f0 -> 00e3ef4e9


Fix gradle task zippedBinaries to correctly use a buildable file collection, make scp use public key authentication instead of password because the latter isn't allowed anymore


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/00e3ef4e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/00e3ef4e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/00e3ef4e

Branch: refs/heads/5.3
Commit: 00e3ef4e9c707e3c6f31c917b8ae0999b98569cd
Parents: eb58c27
Author: kaosko <ka...@apache.org>
Authored: Thu Nov 20 18:50:45 2014 +0000
Committer: kaosko <ka...@apache.org>
Committed: Thu Nov 20 18:50:45 2014 +0000

----------------------------------------------------------------------
 build.gradle | 2 +-
 ssh.gradle   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/00e3ef4e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 14c584d..15ac832 100644
--- a/build.gradle
+++ b/build.gradle
@@ -344,7 +344,7 @@ task zippedBinaries(type: Zip) {
     group "Release artifact"
     // This may create a few unwanted dependencies, but does
     // seem to ensure that the subprojects are created
-    inputs.files subprojects*.configurations*.archives.artifacts
+    inputs.files subprojects*.configurations*.archives.artifacts.files
 
     destinationDir buildDir
     baseName "apache-tapestry"

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/00e3ef4e/ssh.gradle
----------------------------------------------------------------------
diff --git a/ssh.gradle b/ssh.gradle
index 74b620d..e367719 100644
--- a/ssh.gradle
+++ b/ssh.gradle
@@ -60,7 +60,7 @@ class SshTask extends DefaultTask {
   def scpFile(source, destination) {
     initAnt()
     withInfoLogging {
-      ant.scp(localFile: project.files(source).singleFile, remoteToFile: "${userName}@${host}:${destination}", password: password, verbose: verbose)
+      ant.scp(localFile: project.files(source).singleFile, remoteToFile: "${userName}@${host}:${destination}", keyfile : "${System.properties['user.home']}/.ssh/id_dsa", verbose: verbose)
     }
   }
 
@@ -68,7 +68,7 @@ class SshTask extends DefaultTask {
     initAnt()
     withInfoLogging {
       ant.sshexec(host: host, username: userName, password: password, command: "mkdir -p ${destination}")
-      ant.scp(remoteTodir: "${userName}@${host}:${destination}", password: password, verbose: verbose) {
+      ant.scp(remoteTodir: "${userName}@${host}:${destination}", keyfile : "${System.properties['user.home']}/.ssh/id_dsa", verbose: verbose) {
         project.files(source).addToAntBuilder(ant, "fileSet", FileCollection.AntType.FileSet)
       }
     }