15900: Update bundle to commits that report stable versions.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 1ef84619a6abbf29e50db30f012b7ca581c11446..136e1948bb39aafbec96824710ed0373e520e621 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -5,7 +5,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 5.0.0'
-gem 'arvados', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/ruby/arvados.gemspec'
+gem 'arvados', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/ruby/arvados.gemspec', branch: '15900-gem-version-142'
 
 gem 'activerecord-nulldb-adapter', git: 'https://github.com/curoverse/nulldb'
 gem 'multi_json'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 79d4f1712d62fa30e4ddf37873059de547ea3514..af6dc647f95774b956c1935e47d2a6bda7b767a3 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/curoverse/arvados.git
-  revision: dd9f2403f43bcb93da5908ddde57d8c0491bb4c2
+  revision: 2c952e4c3635e02b231019ed1bca2700c35a5682
+  branch: 15900-gem-version-142
   glob: sdk/ruby/arvados.gemspec
   specs:
-    arvados (1.4.1.20191019025325)
+    arvados (1.4.3.pre20191203162527)
       activesupport (>= 3)
       andand (~> 1.3, >= 1.3.3)
       arvados-google-api-client (>= 0.7, < 0.8.9)

diff --git a/services/api/Gemfile b/services/api/Gemfile
index f166505bc07ea82703fb8673c919119003cc20c2..29829c15920e1a9d226f8bac7f74f3b0e80fe50c 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -59,8 +59,8 @@ gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
 # two gems with the same "git" url but different "glob" values, hence
 # the use of a wildcard here instead of literal paths
 # (sdk/cli/arvados-cli.gem and sdk/ruby/arvados.gem).
-gem 'arvados-cli', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/*/*.gemspec'
-gem 'arvados', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/*/*.gemspec'
+gem 'arvados-cli', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/*/*.gemspec', branch: '15900-gem-version-142'
+gem 'arvados', git: 'https://github.com/curoverse/arvados.git', glob: 'sdk/*/*.gemspec', branch: '15900-gem-version-142'
 gem 'httpclient'
 
 gem 'sshkey'

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 88fcdcfed02ca2e61a44e8c55d64c5d1507cd71a..204c509bd3993a27173ddf6cf160eb1d7f712d1d 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/curoverse/arvados.git
-  revision: dd9f2403f43bcb93da5908ddde57d8c0491bb4c2
+  revision: 2c952e4c3635e02b231019ed1bca2700c35a5682
+  branch: 15900-gem-version-142
   glob: sdk/*/*.gemspec
   specs:
-    arvados (1.4.1.20191019025325)
+    arvados (1.4.3.pre20191203162527)
       activesupport (>= 3)
       andand (~> 1.3, >= 1.3.3)
       arvados-google-api-client (>= 0.7, < 0.8.9)
@@ -11,7 +12,7 @@ GIT
       i18n (~> 0)
       json (>= 1.7.7, < 3)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (1.4.1.20191017145711)
+    arvados-cli (1.4.3.pre20191203162527)
       activesupport (>= 3.2.13, < 5.1)
       andand (~> 1.3, >= 1.3.3)
       arvados (>= 1.4.1.20190320201707)