From a7564422f92c28dac7bb2594920ff319bec16f4b Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Thu, 14 Dec 2023 21:23:09 -0800 Subject: [PATCH] Gemfile update --- Gemfile | 12 +++---- Gemfile.lock | 90 +++++++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/Gemfile b/Gemfile index e1050f63..ec1f76f3 100644 --- a/Gemfile +++ b/Gemfile @@ -41,12 +41,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107 gem 'redcarpet' # NCBO -gem 'goo', github: 'ncbo/goo', branch: 'develop' -gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop' -gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop' -gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop' -gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop' -gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop' +gem 'goo', github: 'ncbo/goo', branch: 'master' +gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master' +gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master' +gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master' +gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master' +gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master' group :development do # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 diff --git a/Gemfile.lock b/Gemfile.lock index 1087b7f6..0cfa6275 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 6db93bb3d5095a5fe0d017e572c5a04caa34ebc6 - branch: develop + revision: 657149d6b33813253fa7440252f69c04e0631190 + branch: master specs: goo (0.0.2) addressable (~> 2.8) @@ -15,8 +15,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 067104ae94c0e9d058cfbf419364fbf03f34de43 - branch: develop + revision: 1170a94d266d3e469bfb034a3aa3c4852bd0de82 + branch: master specs: ncbo_annotator (0.0.1) goo @@ -26,8 +26,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 6317dc4976d2ab8e17104887bab0abf5f412b2ef - branch: develop + revision: a20827249fe225af6f18e9efea5e1097ab28d86b + branch: master specs: ncbo_cron (0.0.1) dante @@ -42,8 +42,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: e6d4449d8b854f17bb54af6de142bc64bff22ab3 - branch: develop + revision: 013abea4af3b10910ec661dbb358a4b6cae198a4 + branch: master specs: ncbo_ontology_recommender (0.0.1) goo @@ -53,8 +53,8 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 9487c7f73e68abab097af523d42c1d2e106e614b - branch: develop + revision: 7783784f9d2ceada9be706cf6c084d272ae653e8 + branch: master specs: ontologies_linked_data (0.0.1) activesupport @@ -73,8 +73,8 @@ GIT GIT remote: https://github.com/ncbo/sparql-client.git - revision: 55e7dbf858eb571c767bc67868f9af61663859cb - branch: develop + revision: d418d56a6c9ff5692f925b45739a2a1c66bca851 + branch: master specs: sparql-client (1.0.1) json_pure (>= 1.4) @@ -103,7 +103,7 @@ GEM activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.0) sshkit (>= 1.6.1, != 1.7.0) @@ -143,27 +143,27 @@ GEM faraday-retry (2.2.0) faraday (~> 2.0) ffi (1.16.3) - gapic-common (0.20.0) + gapic-common (0.21.1) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.14) - googleapis-common-protos (>= 1.3.12, < 2.a) - googleapis-common-protos-types (>= 1.3.1, < 2.a) - googleauth (~> 1.0) - grpc (~> 1.36) + google-protobuf (~> 3.18) + googleapis-common-protos (>= 1.4.0, < 2.a) + googleapis-common-protos-types (>= 1.11.0, < 2.a) + googleauth (~> 1.9) + grpc (~> 1.59) get_process_mem (0.2.7) ffi (~> 1.0) google-analytics-data (0.4.0) google-analytics-data-v1beta (>= 0.7, < 2.a) google-cloud-core (~> 1.6) - google-analytics-data-v1beta (0.9.0) + google-analytics-data-v1beta (0.10.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.0) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) google-protobuf (3.25.1-aarch64-linux) google-protobuf (3.25.1-arm64-darwin) @@ -173,22 +173,26 @@ GEM google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) grpc (~> 1.27) - googleapis-common-protos-types (1.10.0) + googleapis-common-protos-types (1.11.0) google-protobuf (~> 3.18) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.9.1) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.59.2) - google-protobuf (~> 3.24) + grpc (1.60.0-aarch64-linux) + google-protobuf (~> 3.25) + googleapis-common-protos-types (~> 1.0) + grpc (1.60.0-arm64-darwin) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) - grpc (1.59.2-x86_64-darwin) - google-protobuf (~> 3.24) + grpc (1.60.0-x86_64-darwin) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) - grpc (1.59.2-x86_64-linux) - google-protobuf (~> 3.24) + grpc (1.60.0-x86_64-linux) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) haml (5.2.2) temple (>= 0.8.0) @@ -198,10 +202,10 @@ GEM domain_name (~> 0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) json-schema (2.8.1) addressable (>= 2.4) - json_pure (2.6.3) + json_pure (2.7.1) jwt (2.7.1) kgio (2.11.4) language_server-protocol (3.17.0.3) @@ -217,7 +221,7 @@ GEM method_source (1.0.0) mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) + mime-types-data (3.2023.1205) mini_mime (1.1.5) minitest (4.7.5) minitest-stub_any_instance (1.0.3) @@ -225,7 +229,7 @@ GEM redis multi_json (1.15.0) net-http-persistent (2.9.4) - net-imap (0.4.6) + net-imap (0.4.8) date net-protocol net-pop (0.1.2) @@ -265,7 +269,7 @@ GEM rack (>= 0.4) rack-cors (1.0.6) rack (>= 1.6.0) - rack-mini-profiler (3.1.1) + rack-mini-profiler (3.3.0) rack (>= 1.2.0) rack-protection (1.5.5) rack @@ -280,14 +284,14 @@ GEM redcarpet (3.6.0) redis (5.0.8) redis-client (>= 0.17.0) - redis-client (0.18.0) + redis-client (0.19.0) connection_pool redis-rack-cache (2.2.1) rack-cache (>= 1.10, < 2) redis-store (>= 1.6, < 2) redis-store (1.10.0) redis (>= 4, < 6) - regexp_parser (2.8.2) + regexp_parser (2.8.3) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -297,7 +301,7 @@ GEM rsolr (2.5.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -305,7 +309,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -420,4 +424,4 @@ DEPENDENCIES unicorn-worker-killer BUNDLED WITH - 2.4.21 + 2.4.18