Update to traject v4.6.0

Fix backwards upgrade bug.
tulibraries · Nov 12, 2021 · 6afa459 · 6afa459
1 parent 7bc1470
commit 6afa459
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -126,8 +126,8 @@ GEM
       nokogiri (~> 1.6)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.3)
-    ffi (1.15.3-java)
+    ffi (1.15.4)
+    ffi (1.15.4-java)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -150,16 +150,14 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (4.1.0)
-    http (4.4.1)
-      addressable (~> 2.3)
+    http (5.0.4)
+      addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
+      llhttp-ffi (~> 0.4.0)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -184,6 +182,9 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -227,8 +228,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
-    racc (1.5.2-java)
+    racc (1.6.0)
+    racc (1.6.0-java)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -302,7 +303,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
-    slop (3.6.0)
+    slop (4.9.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -311,23 +312,23 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (1.1.0)
-    traject (3.4.0)
+    traject (3.6.0)
       concurrent-ruby (>= 0.8.0)
       dot-properties (>= 0.1.1)
       hashie (>= 3.1, < 5)
-      http (>= 3.0, < 5)
+      http (>= 3.0, < 6)
       httpclient (~> 2.5)
       marc (~> 1.0)
       marc-fastxmlwriter (~> 1.0)
       nokogiri (~> 1.9)
-      slop (>= 3.4.5, < 4.0)
+      slop (~> 4.0)
       yell
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf (0.1.4-java)
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     unicode-display_width (2.1.0)
     view_component (2.38.0)
       activesupport (>= 5.0.0, < 8.0)

diff --git a/lib/cob_index/solr_json_writer.rb b/lib/cob_index/solr_json_writer.rb
@@ -137,7 +137,7 @@ def solr_select_url
       if settings["solr.select_url"]
         check_solr_update_url(settings["solr.select_url"])
       else
-        self.determine_solr_update_url.gsub(/\/update(\/json)?/, "/select")
+        @solr_update_url.gsub(/\/update(\/json)?/, "/select")
       end
   end