logstash-integration-jdbc 5.4.8 → 5.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b685b74c2638954f52e43f9f2443ad12701be5a0f75973a7380eb3d19bd5a75
-  data.tar.gz: d77612944fbc3ff7696cb4858f81fd3348c5342e23fae43f4ef3680412b9159e
+  metadata.gz: fd25bda7dbc3dbbc14d2db3d79f2aff6c4c1eb39de48c786701c998ed66fefcf
+  data.tar.gz: 519d0d5d51ad001974ccdf2ca131d81f8d2558984b78f897cb9d2f69b509e444
 SHA512:
-  metadata.gz: 4b1a24c4e64eff48d836e058cebeef83a062506f9144ba9ac6ee16364ab4095ce411a2d19612fc5db597d265f51de75fa3daf119553272168c885270911a9b9e
-  data.tar.gz: 05edc5d6b08312f04efd13bb0c360ff58be1125f244e01437d784baaf99b4df14f9228af61c197b32a5e70b379024f18d5ffe8244957d703fff5c53255d27d6b
+  metadata.gz: 4776aa8f80c18579b366713c5eea82f956e0b18304414a6bf66c3866bab4d92f08cf4c10d82ce464d2c33fef5ce51ae69102a0db814383bef4b8aa9f6e4621a7
+  data.tar.gz: 28b7b9ee174032657084ec43d55eeb9152d51689e97ccbf4d1bac826fa6890b1b9f0e3d190bc2230c5f2b1462f22249c5f18aef1ce50423838d8037c44d2f711

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.4.9
+  - Fix Derby missed driver classes when built locally for version 10.15 [#160](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/160)
+  - 
 ## 5.4.8
   - Update Derby with locally built 10.15.2.1 version [#155](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/155) 
 

data/lib/logstash-integration-jdbc_jars.rb

@@ -3,3 +3,5 @@
 require 'jar_dependencies'
 require_jar('org.apache.derby', 'derby', '10.15.2.1')
 require_jar('org.apache.derby', 'derbyclient', '10.15.2.1')
+require_jar('org.apache.derby', 'derbytools', '10.15.2.1')
+require_jar('org.apache.derby', 'derbyshared', '10.15.2.1')

data/logstash-integration-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-integration-jdbc'
-  s.version         = '5.4.8'
+  s.version         = '5.4.9'
   s.licenses = ['Apache License (2.0)']
   s.summary         = "Integration with JDBC - input and filter plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -45,5 +45,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "childprocess"
   s.add_development_dependency 'logstash-devutils', '>= 2.3'
   s.add_development_dependency 'timecop'
-  s.add_development_dependency 'jdbc-derby'
 end

data/spec/filters/jdbc_streaming_spec.rb

@@ -1,7 +1,6 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/devutils/rspec/shared_examples"
 require "logstash/filters/jdbc_streaming"
-require 'jdbc/derby'
 require "sequel"
 require "sequel/adapters/jdbc"
 
@@ -13,8 +12,6 @@ module LogStash module Filters
   describe JdbcStreaming do
     let!(:jdbc_connection_string) { "jdbc:derby:memory:jdbc_streaming_testdb;create=true"}
     #Use embedded Derby for tests
-    ::Jdbc::Derby.load_driver
-
     ENV["TZ"] = "Etc/UTC"
     describe "plugin level execution" do
       let(:mixin_settings) do

data/spec/inputs/jdbc_spec.rb

@@ -2,7 +2,6 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/devutils/rspec/shared_examples"
 require "logstash/inputs/jdbc"
-require "jdbc/derby"
 require "sequel"
 require "sequel/adapters/jdbc"
 require "timecop"
@@ -33,7 +32,6 @@ describe LogStash::Inputs::Jdbc do
   before :each do
     if !RSpec.current_example.metadata[:no_connection]
       # before body
-      Jdbc::Derby.load_driver
       db.create_table :test_table do
         DateTime     :created_at
         BigDecimal   :big_num
@@ -1587,9 +1585,21 @@ describe LogStash::Inputs::Jdbc do
     end
   end
 
+  def load_derby_version
+    version = {}
+    derby_version =  File.join(Dir.pwd, 'derby_version.txt')
+    File.readlines(derby_version, chomp: true).each do |line|
+      key = line.split('=')[0]
+      value = line.split('=')[1]
+      version[key] = value
+    end
+    version
+  end
+
   context "when an unreadable jdbc_driver_path entry is present" do
     let(:driver_jar_path) do
-      jar_file = $CLASSPATH.find { |name| name.index(Jdbc::Derby.driver_jar) }
+      derby_version = load_derby_version()['DERBY_VERSION']
+      jar_file = $CLASSPATH.find { |name| name.index("derby-#{derby_version}.jar") }
       raise "derby jar not found on class-path" unless jar_file
       jar_file.sub('file:', '')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.4.8
+  version: 5.4.9
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -226,20 +226,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: jdbc-derby
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a Logstash plugin required to be installed on top of the
   Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
   gem is not a stand-alone program
@@ -311,6 +297,8 @@ files:
 - spec/plugin_mixins/jdbc_streaming/parameter_handler_spec.rb
 - vendor/jar-dependencies/org/apache/derby/derby/10.15.2.1/derby-10.15.2.1.jar
 - vendor/jar-dependencies/org/apache/derby/derbyclient/10.15.2.1/derbyclient-10.15.2.1.jar
+- vendor/jar-dependencies/org/apache/derby/derbyshared/10.15.2.1/derbyshared-10.15.2.1.jar
+- vendor/jar-dependencies/org/apache/derby/derbytools/10.15.2.1/derbytools-10.15.2.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)