From 8fee0e2d73ba9ad82ddfad4955b20de402bc4b98 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 21 Oct 2024 20:53:12 -0700 Subject: [PATCH 1/2] reset branch specifier to master --- Gemfile | 12 ++++++------ Gemfile.lock | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 8832064f..ee7b592a 100644 --- a/Gemfile +++ b/Gemfile @@ -42,12 +42,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107 gem 'redcarpet' # NCBO gems (can be from a local dev path or from rubygems/git) -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 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop' -gem 'goo', github: 'ncbo/goo', branch: 'multilingual_preflabels' -gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop' +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 'sparql-client', github: 'ncbo/sparql-client', branch: 'master' +gem 'goo', github: 'ncbo/goo', branch: 'master' +gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 15327a67..a03cb89f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/ncbo/goo.git - revision: a27d6ca79d47eb045b1bdfe311531827428aa504 - branch: multilingual_preflabels + revision: 3c3ab5ae2824e9a1149b907b01a6c0c461a347e3 + branch: master specs: goo (0.0.2) addressable (~> 2.8) @@ -16,8 +16,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: b2731c98bfef0958fecb440c8648b7755a670895 - branch: develop + revision: d46d667ec1b2343fbcdab587f1a70e763b894133 + branch: master specs: ncbo_annotator (0.0.1) goo @@ -27,8 +27,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 4255106846207d79a41716615bc57a379256212b - branch: develop + revision: 25d54ae938e63e9d1a6f4b8eb697e0ec2ff1ef87 + branch: master specs: ncbo_cron (0.0.1) dante @@ -45,8 +45,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 084cfc74a78b1c6334f3b74e228ddbf80d36e30a - branch: develop + revision: 9dbd4f179e42c52095129d353a5ac584e9bd47f3 + branch: master specs: ncbo_ontology_recommender (0.0.1) goo @@ -56,8 +56,8 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: a65341b714f2734c6ad5fd1999c9e1bf03a17585 - branch: develop + revision: 883344784ef9d9be80e3809ea154f67dc9975590 + branch: master specs: ontologies_linked_data (0.0.1) activesupport @@ -76,8 +76,8 @@ GIT GIT remote: https://github.com/ncbo/sparql-client.git - revision: 1657f0dd69fd4b522d3549a6848670175f5e98cc - branch: develop + revision: e89c26aa96f184dbe9b52d51e04fb3d9ba998dbc + branch: master specs: sparql-client (1.0.1) json_pure (>= 1.4) From c1c0494a226140954a6af265f6d9f38742628075 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 18 Nov 2024 21:19:38 -0800 Subject: [PATCH 2/2] Gemfile.lock update --- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a03cb89f..8c28aa1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 3c3ab5ae2824e9a1149b907b01a6c0c461a347e3 + revision: 39f67ab7fae7675b6ff417ace0ab923e40ffcbcd branch: master specs: goo (0.0.2) @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: d46d667ec1b2343fbcdab587f1a70e763b894133 + revision: b6d50ebb79f114bf81a1cd89d0f8b4d4cbcddda2 branch: master specs: ncbo_annotator (0.0.1) @@ -27,7 +27,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 25d54ae938e63e9d1a6f4b8eb697e0ec2ff1ef87 + revision: 095ee0fab70b0fe0f2486655811cc8347b6a63ff branch: master specs: ncbo_cron (0.0.1) @@ -56,7 +56,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 883344784ef9d9be80e3809ea154f67dc9975590 + revision: 0ce77f2781ac3353716407c22d8fc16d9bfd2c8f branch: master specs: ontologies_linked_data (0.0.1) @@ -120,7 +120,7 @@ GEM bcrypt_pbkdf (1.1.1-arm64-darwin) bigdecimal (3.1.8) builder (3.3.0) - capistrano (3.19.1) + capistrano (3.19.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -139,24 +139,24 @@ GEM rexml cube-ruby (0.0.3) dante (0.2.0) - date (3.3.4) + date (3.4.0) docile (1.4.1) domain_name (0.6.20240107) ed25519 (1.3.0) - faraday (2.12.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) json logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0-aarch64-linux-gnu) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) - gapic-common (0.22.0) + gapic-common (0.23.0) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) google-protobuf (>= 3.25, < 5.a) @@ -187,7 +187,7 @@ GEM grpc (~> 1.41) googleapis-common-protos-types (1.16.0) google-protobuf (>= 3.18, < 5.a) - googleauth (1.11.1) + googleauth (1.11.2) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) @@ -206,16 +206,16 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - hashdiff (1.1.1) + hashdiff (1.1.2) http-accept (1.7.0) http-cookie (1.0.7) domain_name (~> 0.5) i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.2) + json (2.8.2) json-schema (2.8.1) addressable (>= 2.4) - json_pure (2.7.2) + json_pure (2.8.1) jwt (2.9.3) base64 kgio (2.11.4) @@ -233,7 +233,7 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) + mime-types-data (3.2024.1105) mini_mime (1.1.5) minitest (5.25.1) minitest-hooks (1.5.2) @@ -242,10 +242,10 @@ GEM mlanett-redis-lock (0.2.7) redis multi_json (1.15.0) - net-http (0.4.1) + net-http (0.5.0) uri net-http-persistent (2.9.4) - net-imap (0.4.17) + net-imap (0.4.18) date net-protocol net-pop (0.1.2) @@ -260,22 +260,22 @@ GEM net-protocol net-ssh (7.3.0) netrc (0.11.0) - newrelic_rpm (9.14.0) - oj (3.16.6) + newrelic_rpm (9.15.0) + oj (3.16.7) bigdecimal (>= 3.0) ostruct (>= 0.2) omni_logger (0.1.4) logger os (1.1.4) - ostruct (0.6.0) + ostruct (0.6.1) parallel (1.26.3) parseconfig (1.1.2) - parser (3.3.5.0) + parser (3.3.6.0) ast (~> 2.4.1) racc pony (1.13.1) mail (>= 2.0) - pry (0.14.2) + pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) public_suffix (6.0.1) @@ -319,11 +319,11 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.3.8) + rexml (3.3.9) rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rubocop (1.67.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -333,7 +333,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.36.1) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby-xxHash (0.4.0.2) @@ -377,7 +377,7 @@ GEM temple (0.10.3) thread_safe (0.3.6) tilt (2.4.0) - timeout (0.4.1) + timeout (0.4.2) tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.6.0) @@ -387,14 +387,14 @@ GEM unicorn-worker-killer (0.4.5) get_process_mem (~> 0) unicorn (>= 4, < 7) - uri (0.13.1) + uri (1.0.2) uuid (2.3.9) macaddr (~> 1.0) webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) + webrick (1.9.0) PLATFORMS aarch64-linux @@ -456,4 +456,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.5.20 + 2.5.7