Upgraded buildr 1.5.3 and java 8
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/73997d92 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/73997d92 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/73997d92 Branch: refs/heads/ode-1.3.x Commit: 73997d92e16e25d89caf88bb43f3a17bd2e2c466 Parents: 9441572 Author: sathwik <[email protected]> Authored: Fri Jul 21 10:47:41 2017 +0530 Committer: sathwik <[email protected]> Committed: Fri Jul 21 10:47:41 2017 +0530 ---------------------------------------------------------------------- Gemfile | 5 ++--- Rakefile | 2 +- ci-build.sh | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/73997d92/Gemfile ---------------------------------------------------------------------- diff --git a/Gemfile b/Gemfile index c7f3dfd..d4a9b18 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,10 @@ source 'https://rubygems.org' -gem 'buildr', '>= 1.4.22' +gem 'buildr', '>= 1.5.3' # rspec dependencies for check() gem 'rspec-expectations', '= 2.14.3' gem 'rspec-mocks', '= 2.14.3' gem 'rspec-core', '= 2.14.5' gem 'rspec', '= 2.14.1' -gem 'nokogiri', '= 1.6.8' -gem 'net-ssh', '= 2.7.0' \ No newline at end of file +gem 'nokogiri', '= 1.6.8' http://git-wip-us.apache.org/repos/asf/ode/blob/73997d92/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index 036fd18..cdda10c 100644 --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ # limitations under the License. # -gem "buildr", "~>1.4.3" +gem "buildr", "~>1.5.3" require "buildr" require "buildr/xmlbeans.rb" require "buildr/openjpa" http://git-wip-us.apache.org/repos/asf/ode/blob/73997d92/ci-build.sh ---------------------------------------------------------------------- diff --git a/ci-build.sh b/ci-build.sh index 2463ad8..220a159 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -15,7 +15,7 @@ #!/bin/sh -docker pull sathwik/apache-buildr:latest-jruby-jdk7 +docker pull sathwik/apache-buildr:latest-jruby-jdk8 export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M" BUILDR_ARGS="$@" @@ -60,4 +60,4 @@ docker run --rm \ -v $HOME/.m2:/home/dummy/.m2 \ -v $HOME/.buildr:/home/dummy/.buildr \ -v /tmp:/tmp \ - --entrypoint bash sathwik/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND"; + --entrypoint bash sathwik/apache-buildr:latest-jruby-jdk8 -c "$FINAL_COMMAND";
