From d01841e5ec1b6420c8204ca6ea9dea64dbca6f87 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 3 May 2024 11:14:25 -0800 Subject: [PATCH 01/10] bumped version --- jruby/neo4j/driver/version.rb | 2 +- spec/integration/bookmark_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jruby/neo4j/driver/version.rb b/jruby/neo4j/driver/version.rb index 7e7848e8..47bbc2c0 100644 --- a/jruby/neo4j/driver/version.rb +++ b/jruby/neo4j/driver/version.rb @@ -2,6 +2,6 @@ module Neo4j module Driver - VERSION = '4.4.6' + VERSION = '4.4.16' end end diff --git a/spec/integration/bookmark_spec.rb b/spec/integration/bookmark_spec.rb index 7b6896be..27e1d6b7 100755 --- a/spec/integration/bookmark_spec.rb +++ b/spec/integration/bookmark_spec.rb @@ -32,7 +32,6 @@ def expect_single_value(bookmark, value) expect(values.first).to start_with(value) end - # TODO: The version restriction should not be present here! it 'raises for invalid bookmark' do invalid_bookmark = Neo4j::Driver::Bookmark.from('hi, this is an invalid bookmark') expect { driver.session(bookmarks: invalid_bookmark, &:begin_transaction) } From 610e61126e984244e2be05836b3d2628cc57ce03 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 3 May 2024 12:37:40 -0800 Subject: [PATCH 02/10] bumped version --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index c181781b..9934c015 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,4 @@ +=== 4.4.16 / 2023-05-03 === 4.4.6 / 2023-10-12 === 4.4.5 / 2023-02-09 === 4.4.4 / 2023-02-06 From 0caa616c4f304175a123319153baf392f59261d1 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Mon, 10 Jun 2024 12:35:02 -0800 Subject: [PATCH 03/10] bumped versions --- .github/workflows/specs.yml | 22 +++++++++++----------- .github/workflows/testkit.yml | 6 +++--- Rakefile | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index c93cc2ed..b37404e8 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -17,32 +17,32 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ jruby, ruby-3.1.5, ruby ] - neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.33, 5.19.0 ] + ruby: [ jruby, ruby-3.1.6, ruby ] + neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.34, 5.20.0 ] active_support: [ '' ] include: - neo4j: 3.5.35 java-version: 8 - - neo4j: 5.19.0 + - neo4j: 5.20.0 java-version: 17 options: "-t ~causal" - - neo4j: 5.19.0 + - neo4j: 5.20.0 ruby: ruby-3.1.5 java-version: 17 options: "-t ~causal" - active_support: 7.0.8.1 - - neo4j: 5.19.0 - ruby: ruby-3.1.5 + active_support: 7.0.8.4 + - neo4j: 5.20.0 + ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" - active_support: 6.1.7.7 - - neo4j: 5.19.0 - ruby: ruby-3.1.5 + active_support: 6.1.7.8 + - neo4j: 5.20.0 + ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 6.0.6.1 - - neo4j: 5.19.0 + - neo4j: 5.20.0 ruby: ruby-3.1.5 java-version: 17 options: "-t ~causal" diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 06dd25bc..9e7375b9 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -27,9 +27,9 @@ jobs: fail-fast: false matrix: ruby: - - [jruby, 9.3.4.0] - - [jruby, 9.4.6.0] - - [ruby, 3.1.5] + - [jruby, 9.3.14.0] + - [jruby, 9.4.7.0] + - [ruby, 3.1.6] tests: - TESTKIT_TESTS - STUB_TESTS diff --git a/Rakefile b/Rakefile index 7064619b..e9a4ee46 100644 --- a/Rakefile +++ b/Rakefile @@ -42,7 +42,7 @@ 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, 4.4.16' } + spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver, 4.4.17' } spec_extras[:platform] = 'java' else require_ruby_version '>= 3.1' From 0c26931925be920dddf1b943217dfece3ffd3b10 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Tue, 11 Jun 2024 06:46:38 -0800 Subject: [PATCH 04/10] downgraded async due to failing specs --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index e9a4ee46..95f567b3 100644 --- a/Rakefile +++ b/Rakefile @@ -46,6 +46,7 @@ end.spec 'neo4j-ruby-driver' do spec_extras[:platform] = 'java' else require_ruby_version '>= 3.1' + dependency 'async', '< 2.12' dependency 'async-io', '>= 0' dependency 'connection_pool', '>= 0' end From 3205313d86903fd47989e350ef039f6aa93c547f Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 14 Jun 2024 06:46:03 -0800 Subject: [PATCH 05/10] back to normal --- Rakefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Rakefile b/Rakefile index 95f567b3..e9a4ee46 100644 --- a/Rakefile +++ b/Rakefile @@ -46,7 +46,6 @@ end.spec 'neo4j-ruby-driver' do spec_extras[:platform] = 'java' else require_ruby_version '>= 3.1' - dependency 'async', '< 2.12' dependency 'async-io', '>= 0' dependency 'connection_pool', '>= 0' end From 19abaac79345587111c46e4ff711517a62a43dc1 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Tue, 13 Aug 2024 21:57:34 +0200 Subject: [PATCH 06/10] back to normal --- .github/workflows/specs.yml | 16 ++++++++-------- .github/workflows/testkit.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index b37404e8..9983f0e6 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -18,32 +18,32 @@ jobs: fail-fast: false matrix: ruby: [ jruby, ruby-3.1.6, ruby ] - neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.34, 5.20.0 ] + neo4j: [ 3.5.35, 4.0.12, 4.1.13, 4.2.19, 4.3.24, 4.4.36, 5.22.0 ] active_support: [ '' ] include: - neo4j: 3.5.35 java-version: 8 - - neo4j: 5.20.0 + - neo4j: 5.22.0 java-version: 17 options: "-t ~causal" - - neo4j: 5.20.0 - ruby: ruby-3.1.5 + - neo4j: 5.22.0 + ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 7.0.8.4 - - neo4j: 5.20.0 + - neo4j: 5.22.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 6.1.7.8 - - neo4j: 5.20.0 + - neo4j: 5.22.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 6.0.6.1 - - neo4j: 5.20.0 - ruby: ruby-3.1.5 + - neo4j: 5.22.0 + ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 5.2.8.1 diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 9e7375b9..1361413f 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -28,7 +28,7 @@ jobs: matrix: ruby: - [jruby, 9.3.14.0] - - [jruby, 9.4.7.0] + - [jruby, 9.4.8.0] - [ruby, 3.1.6] tests: - TESTKIT_TESTS From 8c0262a8ff8e595e95563627e97ec5b387db650e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20G=C4=99bala?= Date: Fri, 11 Oct 2024 20:22:13 +0200 Subject: [PATCH 07/10] Fix issues with nested Sets (#233) --- .../neo4j/driver/internal/cluster/routing_table_handler_impl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/neo4j/driver/internal/cluster/routing_table_handler_impl.rb b/ruby/neo4j/driver/internal/cluster/routing_table_handler_impl.rb index 42ed2437..84a1e102 100644 --- 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) From 8e43995e58ad460da2ebed348f3e923491e8c042 Mon Sep 17 00:00:00 2001 From: klobuczek Date: Mon, 16 Dec 2024 19:22:16 +0100 Subject: [PATCH 08/10] updated neo4j, downgraded async --- .github/workflows/specs.yml | 12 ++++++------ .github/workflows/testkit.yml | 2 +- Rakefile | 3 ++- jruby/neo4j/driver/version.rb | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index 9983f0e6..e0bdcb2a 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -18,31 +18,31 @@ jobs: fail-fast: false matrix: ruby: [ jruby, ruby-3.1.6, ruby ] - neo4j: [ 3.5.35, 4.0.12, 4.1.13, 4.2.19, 4.3.24, 4.4.36, 5.22.0 ] + neo4j: [ 3.5.35, 4.0.12, 4.1.13, 4.2.19, 4.3.24, 4.4.39, 5.26.0 ] active_support: [ '' ] include: - neo4j: 3.5.35 java-version: 8 - - neo4j: 5.22.0 + - neo4j: 5.26.0 java-version: 17 options: "-t ~causal" - - neo4j: 5.22.0 + - neo4j: 5.26.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 7.0.8.4 - - neo4j: 5.22.0 + - neo4j: 5.26.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 6.1.7.8 - - neo4j: 5.22.0 + - neo4j: 5.26.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" active_support: 6.0.6.1 - - neo4j: 5.22.0 + - neo4j: 5.26.0 ruby: ruby-3.1.6 java-version: 17 options: "-t ~causal" diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 1361413f..26a47ac4 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -28,7 +28,7 @@ jobs: matrix: ruby: - [jruby, 9.3.14.0] - - [jruby, 9.4.8.0] + - [jruby, 9.4.9.0] - [ruby, 3.1.6] tests: - TESTKIT_TESTS diff --git a/Rakefile b/Rakefile index e9a4ee46..9ff3b22f 100644 --- a/Rakefile +++ b/Rakefile @@ -42,10 +42,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, 4.4.17' } + spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver, 4.4.19' } spec_extras[:platform] = 'java' else require_ruby_version '>= 3.1' + dependency 'async', '< 2.12' dependency 'async-io', '>= 0' dependency 'connection_pool', '>= 0' end diff --git a/jruby/neo4j/driver/version.rb b/jruby/neo4j/driver/version.rb index 47bbc2c0..be1076f6 100644 --- a/jruby/neo4j/driver/version.rb +++ b/jruby/neo4j/driver/version.rb @@ -2,6 +2,6 @@ module Neo4j module Driver - VERSION = '4.4.16' + VERSION = '4.4.19' end end From 28fa277656752642e18970b29ae0e108a720c045 Mon Sep 17 00:00:00 2001 From: klobuczek Date: Mon, 16 Dec 2024 20:35:43 +0100 Subject: [PATCH 09/10] relaxed async constraint --- .github/workflows/testkit.yml | 2 +- Rakefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 26a47ac4..fa721c6b 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -81,7 +81,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/Rakefile b/Rakefile index 9ff3b22f..b388859b 100644 --- a/Rakefile +++ b/Rakefile @@ -2,6 +2,7 @@ require 'rubygems' require 'hoe' +require 'stringio' Hoe.plugin :bundler Hoe.plugin :gemspec @@ -46,7 +47,7 @@ end.spec 'neo4j-ruby-driver' do spec_extras[:platform] = 'java' else require_ruby_version '>= 3.1' - dependency 'async', '< 2.12' + dependency 'async', '< 2.13' dependency 'async-io', '>= 0' dependency 'connection_pool', '>= 0' end From d0fa9a5783c85711081989f14fd3ffd323e7663b Mon Sep 17 00:00:00 2001 From: klobuczek Date: Mon, 16 Dec 2024 22:29:20 +0100 Subject: [PATCH 10/10] bumped version --- History.txt | 2 ++ ruby/neo4j/driver/version.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/History.txt b/History.txt index 9934c015..7886aa1c 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,5 @@ +=== 4.4.19 / 2024-12-16 +=== 4.4.6 / 2024-12-16 === 4.4.16 / 2023-05-03 === 4.4.6 / 2023-10-12 === 4.4.5 / 2023-02-09 diff --git a/ruby/neo4j/driver/version.rb b/ruby/neo4j/driver/version.rb index 68ce1f83..7e7848e8 100644 --- a/ruby/neo4j/driver/version.rb +++ b/ruby/neo4j/driver/version.rb @@ -2,6 +2,6 @@ module Neo4j module Driver - VERSION = '4.4.5' + VERSION = '4.4.6' end end