merged relevant 4.4 changes

neo4jrb · Dec 16, 2024 · ba74564 · ba74564
2 parents 8ae1885 + d0fa9a5
commit ba74564
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ jruby, ruby ]
-        neo4j: [ 4.4.36, 5.22.0 ]
+        neo4j: [ 4.4.39, 5.26.0 ]
         include:
           - ruby: jruby
             java-version: 17

diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml
@@ -80,7 +80,7 @@ jobs:
 
       - name: Archive testkit artifacts
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts ${{ matrix.ruby[0] }}
           path: ${{ github.workspace }}/testkit/artifacts
diff --git a/History.txt b/History.txt
@@ -1,3 +1,6 @@
+=== 4.4.19 / 2024-12-16
+=== 4.4.6 / 2024-12-16
+=== 4.4.16 / 2023-05-03
 === 5.19.0.alpha.0 / 2023-04-24
 === 5.15.0.alpha.0 / 2023-12-14
 === 5.13.0.alpha.3 / 2023-10-15

diff --git a/Rakefile b/Rakefile
@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'hoe'
+require 'stringio'
 
 Hoe.plugin :bundler
 Hoe.plugin :gemspec
@@ -42,10 +43,11 @@ end.spec 'neo4j-ruby-driver' do
     dependency 'jar-dependencies', '>= 0.4.1'
     dependency 'ruby-maven', '>= 0', :dev
 
-    spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver-all, 5.20.0' }
+    spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver-all, 5.27.0' }
     spec_extras[:platform] = 'java'
   else
     require_ruby_version '>= 3.1'
+    dependency 'async', '< 2.13'
     dependency 'async-io', '>= 0'
     dependency 'connection_pool', '>= 0'
   end

diff --git a/ruby/neo4j/driver/internal/cluster/routing_table_handler_impl.rb b/ruby/neo4j/driver/internal/cluster/routing_table_handler_impl.rb
@@ -63,7 +63,7 @@ def fresh_cluster_composition_fetched(composition_lookup_result)
           addresses_to_retain = @routing_table_registry.all_servers.map(&:unicast_stream).reduce(&:+)
 
           composition_lookup_result.resolved_initial_routers&.then do |addresses|
-            addresses_to_retain << addresses
+            addresses_to_retain.merge(addresses)
           end
 
           @connection_pool.retain_all(addresses_to_retain)