[ARVADOS] created: 1.1.4-595-gec9ecf93b

[Git user]

        at  ec9ecf93b25f849e8480ece08b330c22b13bfe5f (commit)


commit ec9ecf93b25f849e8480ece08b330c22b13bfe5f
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Jul 13 11:34:48 2018 -0300

    13803: Upgrade oj dependency on arvados-cli gem.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index fd48b4852..f84636e07 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '>= 1.7.7', '<3'
   s.add_runtime_dependency 'trollop', '~> 2.0'
   s.add_runtime_dependency 'andand', '~> 1.3', '>= 1.3.3'
-  s.add_runtime_dependency 'oj', '~> 2.0', '>= 2.0.3'
+  s.add_runtime_dependency 'oj', '~> 3.0'
   s.add_runtime_dependency 'curb', '~> 0.8'
   s.homepage    =
     'https://arvados.org'

commit e0033099ba12ae2c42d41d3d049b9d759663d35d
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Jul 13 11:33:41 2018 -0300

    13803: Upgrade oj gem on API server by removing arvados-cli dependency
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 7d4d4bba1..fb19633cd 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -62,7 +62,6 @@ gem 'faye-websocket'
 gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
 
 gem 'arvados', '>= 0.1.20150615153458'
-gem 'arvados-cli', '>= 0.1.20161017193526'
 gem 'httpclient'
 
 gem 'sshkey'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index a3ff8e789..ca5b7d755 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -58,15 +58,6 @@ GEM
       i18n (~> 0)
       json (>= 1.7.7, < 3)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (1.1.4.20180412190507)
-      activesupport (>= 3.2.13, < 5)
-      andand (~> 1.3, >= 1.3.3)
-      arvados (~> 0.1, >= 0.1.20150128223554)
-      curb (~> 0.8)
-      google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
-      json (>= 1.7.7, < 3)
-      oj (~> 2.0, >= 2.0.3)
-      trollop (~> 2.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -87,7 +78,6 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
-    curb (0.9.4)
     database_cleaner (1.7.0)
     erubis (2.7.0)
     eventmachine (1.2.6)
@@ -179,7 +169,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (2.18.5)
+    oj (3.6.4)
     oj_mimic_json (1.0.1)
     omniauth (1.4.3)
       hashie (>= 1.2, < 4)
@@ -292,7 +282,6 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
-  arvados-cli (>= 0.1.20161017193526)
   coffee-rails (~> 4.0)
   database_cleaner
   factory_girl_rails
@@ -328,4 +317,4 @@ DEPENDENCIES
   uglifier (~> 2.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

-----------------------------------------------------------------------


hooks/post-receive
--