From 85b76cbbe367df4cc05a41cbee88ff67cc204231 Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Fri, 4 Feb 2022 08:45:21 -0500 Subject: [PATCH 1/2] temporarily pin nokogiri to 1.12 nokogiri 1.13 requires ruby > 2.5. The server is currrently running ruby 2.5. So the latest version of nokogiri is incompatible. Until there is time to update the server, nokogiri is pinned to v1.12. --- Gemfile | 2 + Gemfile.lock | 275 ++++++++++++++++++++++++++++----------------------- 2 files changed, 154 insertions(+), 123 deletions(-) diff --git a/Gemfile b/Gemfile index c3cbd96..4d7a8c3 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,8 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end +gem 'nokogiri', '~> 1.12', '< 1.13' ### TEMPORARY PIN 1.13 requires ruby > 2.5 + gem 'rails', '~> 5.2' gem 'dotenv-deployment' gem 'dotenv-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 3ce4512..8391219 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,22 +46,23 @@ GEM tzinfo (~> 1.1) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + amazing_print (1.4.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.2) bcp47 (0.3.3) i18n - better_errors (2.8.0) + better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.8.1) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bixby (1.0.0) rubocop (~> 0.50, <= 0.52.1) rubocop-rspec (~> 1.22, <= 1.22.2) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.3) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -71,7 +72,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.9) - connection_pool (2.2.2) + connection_pool (2.2.5) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -79,30 +80,39 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.3) - debug_inspector (0.0.3) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.1) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + debug_inspector (1.1.0) deprecation (1.1.0) activesupport - diff-lcs (1.3) - docile (1.3.2) - dotenv (2.7.5) - dotenv-deployment (0.0.2) - dotenv-rails (2.7.5) - dotenv (= 2.7.5) - railties (>= 3.2, < 6.1) - ebnf (1.2.0) + diff-lcs (1.5.0) + docile (1.4.0) + dotenv (1.0.2) + dotenv-deployment (0.3.0) + dotenv (~> 1.0) + dotenv-rails (1.0.2) + dotenv (= 1.0.2) + ebnf (2.2.1) + amazing_print (~> 1.2) + htmlentities (~> 4.3) rdf (~> 3.1) + scanf (~> 1.0) sxp (~> 1.1) + unicode-types (~> 1.6) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) erubi (1.10.0) - execjs (2.7.0) + execjs (2.8.1) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (2.10.2) + faker (2.19.0) i18n (>= 1.6, < 2) faraday (1.9.3) faraday-em_http (~> 1.0) @@ -127,36 +137,39 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - ffi (1.15.1) + ffi (1.15.5) geocoder (1.7.3) globalid (1.0.0) activesupport (>= 5.0) - gruff (0.13.0) + gruff (0.14.0) histogram rmagick - haml (5.1.2) + haml (5.2.2) temple (>= 0.8.0) tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) histogram (0.2.4.1) htmlentities (4.3.4) i18n (1.9.1) concurrent-ruby (~> 1.0) - jbuilder (2.10.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - json (2.3.0) - json-canonicalization (0.2.0) - json-ld (3.1.1) + json (2.6.1) + json-canonicalization (0.2.1) + json-ld (3.1.10) htmlentities (~> 4.3) json-canonicalization (~> 0.2) link_header (~> 0.0, >= 0.0.8) multi_json (~> 1.14) rack (~> 2.0) rdf (~> 3.1) - json-ld-preloaded (3.1.1) + json-ld-preloaded (3.1.6) json-ld (~> 3.1) rdf (~> 3.1) - ld-patch (3.1.0) - ebnf (~> 1.2) + ld-patch (3.1.3) + ebnf (~> 2.1) rdf (~> 3.1) rdf-xsd (~> 3.1) sparql (~> 3.1) @@ -166,35 +179,37 @@ GEM parslet rdf (~> 3.0) link_header (0.0.8) - linkeddata (3.1.1) + linkeddata (3.1.6) equivalent-xml (~> 0.6) - json-ld (~> 3.1, >= 3.1.1) - json-ld-preloaded (~> 3.1, >= 3.1.1) - ld-patch (~> 3.1) - nokogiri (~> 1.10) - nokogumbo (~> 2.0) - rdf (~> 3.1, >= 3.1.1) + json-ld (~> 3.1, >= 3.1.10) + json-ld-preloaded (~> 3.1, >= 3.1.6) + ld-patch (~> 3.1, >= 3.1.3) + nokogiri (~> 1.12) + rdf (~> 3.1, >= 3.1.15) rdf-aggregate-repo (~> 3.1) - rdf-isomorphic (~> 3.1) + rdf-isomorphic (~> 3.1, >= 3.1.1) rdf-json (~> 3.1) - rdf-microdata (~> 3.1) - rdf-n3 (~> 3.1) + rdf-microdata (~> 3.1, >= 3.1.4) + rdf-n3 (~> 3.1, >= 3.1.2) rdf-normalize (~> 0.4) - rdf-rdfa (~> 3.1) - rdf-rdfxml (~> 3.1) - rdf-reasoner (~> 0.6) - rdf-tabular (~> 3.1) - rdf-trig (~> 3.1) - rdf-trix (~> 3.1) - rdf-turtle (~> 3.1) - rdf-vocab (~> 3.1, >= 3.1.2) - rdf-xsd (~> 3.1) - shex (~> 0.6) - sparql (~> 3.1) - sparql-client (~> 3.1) - listen (3.2.1) + rdf-ordered-repo (~> 3.1, >= 3.1.1) + rdf-rdfa (~> 3.1, >= 3.1.3) + rdf-rdfxml (~> 3.1, >= 3.1.1) + rdf-reasoner (~> 0.7, >= 0.7.2) + rdf-tabular (~> 3.1, >= 3.1.1) + rdf-trig (~> 3.1, >= 3.1.2) + rdf-trix (~> 3.1, >= 3.1.1) + rdf-turtle (~> 3.1, >= 3.1.3) + rdf-vocab (~> 3.1, >= 3.1.14) + rdf-xsd (~> 3.1, >= 3.1.1) + shacl (~> 0.1, >= 0.1.1) + shex (~> 0.6, >= 0.6.4) + sparql (~> 3.1, >= 3.1.8) + sparql-client (~> 3.1, >= 3.1.2) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.0) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -208,26 +223,22 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.7.1) minitest (5.15.0) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) mysql2 (0.5.3) - net-http-persistent (3.1.0) + net-http-persistent (4.0.1) connection_pool (~> 2.2) nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.12.5-x86_64-darwin) racc (~> 1.4) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.1) - parser (2.7.0.2) - ast (~> 2.4.0) + parallel (1.21.0) + parser (2.7.2.0) + ast (~> 2.4.1) parslet (2.0.0) - powerpack (0.1.2) + powerpack (0.1.3) public_suffix (4.0.6) - puma (4.3.9) + puma (4.3.10) nio4r (~> 2.0) qa (5.8.0) activerecord-import @@ -260,10 +271,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.6) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -275,89 +286,97 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rdf (3.2.3) + rdf (3.1.15) + hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (3.1.0) rdf (~> 3.1) - rdf-isomorphic (3.1.0) + rdf-isomorphic (3.1.1) rdf (~> 3.1) rdf-json (3.1.0) rdf (~> 3.1) - rdf-microdata (3.1.0) + rdf-microdata (3.1.4) htmlentities (~> 4.3) - nokogiri (~> 1.10) - rdf (~> 3.1) + nokogiri (~> 1.12) + rdf (~> 3.1, >= 3.1.13) + rdf-rdfa (~> 3.1, >= 3.1.3) rdf-xsd (~> 3.1) - rdf-n3 (3.1.1) - rdf (~> 3.1) - sparql (~> 3.1) + rdf-n3 (3.1.2) + ebnf (~> 2.1) + rdf (~> 3.1, >= 3.1.8) + sparql (~> 3.1, >= 3.1.4) sxp (~> 1.1) rdf-normalize (0.4.0) rdf (~> 3.1) - rdf-rdfa (3.1.0) - haml (~> 5.1) - htmlentities (~> 4.3) + rdf-ordered-repo (3.1.1) rdf (~> 3.1) + rdf-rdfa (3.1.3) + haml (~> 5.2) + htmlentities (~> 4.3) + rdf (~> 3.1, >= 3.1.13) rdf-aggregate-repo (~> 3.1) + rdf-vocab (~> 3.1, >= 3.1.11) rdf-xsd (~> 3.1) - rdf-rdfxml (3.1.0) + rdf-rdfxml (3.1.1) htmlentities (~> 4.3) rdf (~> 3.1) rdf-rdfa (~> 3.1) rdf-xsd (~> 3.1) - rdf-reasoner (0.6.0) - rdf (~> 3.1) - rdf-vocab (~> 3.1) + rdf-reasoner (0.7.2) + rdf (~> 3.1, >= 3.1.12) rdf-xsd (~> 3.1) - rdf-tabular (3.1.0) + rdf-tabular (3.1.1) addressable (~> 2.3) bcp47 (~> 0.3, >= 0.3.3) json-ld (~> 3.1) rdf (~> 3.1) rdf-vocab (~> 3.1) rdf-xsd (~> 3.1) - rdf-trig (3.1.0) - ebnf (~> 1.1) + rdf-trig (3.1.2) + ebnf (~> 2.1) rdf (~> 3.1) rdf-turtle (~> 3.1) - rdf-trix (3.1.0) - rdf (~> 3.1) - rdf-turtle (3.1.0) - ebnf (~> 1.2) - rdf (~> 3.1) - rdf-vocab (3.1.2) + rdf-trix (3.1.1) rdf (~> 3.1) - rdf-xsd (3.1.0) + rdf-xsd (~> 3.1) + rdf-turtle (3.1.3) + ebnf (~> 2.1) + rdf (~> 3.1, >= 3.1.8) + rdf-vocab (3.1.14) + rdf (~> 3.1, >= 3.1.12) + rdf-xsd (3.1.1) rdf (~> 3.1) - request_store (1.5.0) + rexml (~> 3.2) + request_store (1.5.1) rack (>= 1.4) - rmagick (4.2.2) + rexml (3.2.5) + rmagick (4.2.4) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec-core (3.10.2) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (3.9.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (~> 3.10.0) + rspec-rails (5.1.0) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.3) rubocop (0.52.1) parallel (~> 1.10) parser (>= 2.4.0.2, < 3.0) @@ -369,7 +388,7 @@ GEM rubocop (>= 0.35.1) rubocop-rspec (1.22.2) rubocop (>= 0.52.1) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -382,8 +401,15 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - shex (0.6.0) - ebnf (~> 1.2) + scanf (1.0.0) + shacl (0.1.1) + json-ld (~> 3.1, >= 3.1.7) + rdf (~> 3.1, >= 3.1.8) + sparql (~> 3.1) + sxp (~> 1.1) + shex (0.6.4) + ebnf (~> 2.1, >= 2.2) + htmlentities (~> 4.3) json-ld (~> 3.1) json-ld-preloaded (~> 3.1) rdf (~> 3.1) @@ -395,18 +421,19 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sparql (3.1.0) + sparql (3.1.8) builder (~> 3.2) - ebnf (~> 1.2) - rdf (~> 3.1) + ebnf (~> 2.1) + logger (~> 1.4) + rdf (~> 3.1, >= 3.1.14) rdf-aggregate-repo (~> 3.1) rdf-xsd (~> 3.1) - sparql-client (~> 3.1) + sparql-client (~> 3.1, >= 3.1.2) sxp (~> 1.1) - sparql-client (3.1.0) - net-http-persistent (~> 3.1) + sparql-client (3.1.2) + net-http-persistent (~> 4.0, >= 4.0.1) rdf (~> 3.1) - spring (2.1.0) + spring (3.1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -427,7 +454,7 @@ GEM thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) - tins (1.24.1) + tins (1.31.0) sync turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -436,7 +463,8 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.1) + unicode-display_width (1.8.0) + unicode-types (1.7.0) useragent (0.16.10) web-console (3.7.0) actionview (>= 5.0) @@ -450,7 +478,7 @@ GEM rails (>= 3.1.0) PLATFORMS - ruby + x86_64-darwin-18 DEPENDENCIES better_errors @@ -470,6 +498,7 @@ DEPENDENCIES listen lograge mysql2 + nokogiri (~> 1.12, < 1.13) puma (~> 4.3) qa (~> 5.5) qa_server (~> 7.9) @@ -490,4 +519,4 @@ DEPENDENCIES xray-rails BUNDLED WITH - 2.2.17 + 2.2.30 From f35f99ddaa1d7299ce5d739707eb16dfb5bf4a10 Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Fri, 4 Feb 2022 08:46:47 -0500 Subject: [PATCH 2/2] release v6.7.1 * temporarily pin nokogiri to v1.12 to support ruby 2.5 --- CHANGELOG.md | 4 ++++ config/locales/qa_server.en.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af6f6bc..c57b68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 6.7.1 (2022-02-04) + +* temporarily pin nokogiri to v1.12 to support ruby 2.5 + ### 6.7.0 (2022-02-04) * rename current ISNI_LD4L_CACHE to ISNI_LD4L_WRAPPED, which wraps direct calls to ISNI API diff --git a/config/locales/qa_server.en.yml b/config/locales/qa_server.en.yml index 9d961fe..77e1b51 100644 --- a/config/locales/qa_server.en.yml +++ b/config/locales/qa_server.en.yml @@ -1,7 +1,7 @@ --- en: qa_server: - application_version: "6.7.0" + application_version: "6.7.1" application_name: "LD4P Authority Lookup Service" footer: copyright_html: "Copyright © 2018-2021 Cornell Licensed under the Apache License, Version 2.0"