You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by to...@apache.org on 2016/05/03 17:34:34 UTC
buildr git commit: Attempt to fix the Travis build: use alternate
version of net-ssh when using jruby-1.7.25,
which is not compatible with ruby 2.0 APIs remove jdk6 from test combo,
use jdk7 only. We will start using oracle jdk8 for testing soon when we
Repository: buildr
Updated Branches:
refs/heads/master e3fc2671b -> 88f5d5a98
Attempt to fix the Travis build:
use alternate version of net-ssh when using jruby-1.7.25, which is not compatible with ruby 2.0 APIs
remove jdk6 from test combo, use jdk7 only. We will start using oracle jdk8 for testing soon when we have a way to exclude scala from testing.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/88f5d5a9
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/88f5d5a9
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/88f5d5a9
Branch: refs/heads/master
Commit: 88f5d5a98a9c3866e618aefd8dfe90d093d9b1c4
Parents: e3fc267
Author: Antoine Toulme <an...@lunar-ocean.com>
Authored: Tue May 3 08:33:36 2016 -0700
Committer: Antoine Toulme <an...@lunar-ocean.com>
Committed: Tue May 3 08:33:46 2016 -0700
----------------------------------------------------------------------
.travis.yml | 8 ++------
buildr.gemspec | 3 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/88f5d5a9/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index aceb68d..5e58970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,12 @@
language: ruby
jdk:
- - oraclejdk7
- - openjdk6
+# - oraclejdk8 -- will turn this on once scala can be excluded
+ - openjdk7
rvm:
- 2.2.5
- 2.3.1
- jruby-1.7.25
- jruby-9.0.5.0
-matrix:
- exclude:
- - rvm: jruby-9.0.5.0
- jdk: openjdk6
git:
depth: 10
scala:
http://git-wip-us.apache.org/repos/asf/buildr/blob/88f5d5a9/buildr.gemspec
----------------------------------------------------------------------
diff --git a/buildr.gemspec b/buildr.gemspec
index 4b8b8f7..43e71c9 100644
--- a/buildr.gemspec
+++ b/buildr.gemspec
@@ -58,7 +58,8 @@ for those one-off tasks, with a language that's a joy to use.
# Tested against these dependencies.
spec.add_dependency 'rake', '0.9.2.2'
spec.add_dependency 'builder', '3.2.2'
- spec.add_dependency 'net-ssh', '3.1.1'
+ spec.add_dependency 'net-ssh', '3.1.1' if RUBY_VERSION >= '2.0.0'
+ spec.add_dependency 'net-ssh', '2.9.4' if RUBY_VERSION < '2.0.0'
spec.add_dependency 'net-sftp', '2.1.2'
# Required for sftp support under windows
spec.add_dependency 'jruby-pageant', '1.1.1' if $platform.to_s == 'java'