Adds dependency to Derby (without renaming) and also add derbytools dependency (#160)

* Removed maybe a duplication of derby jdbc classes
* Use local Derby driver in tests without using the support gem jdbc-derby which bundled old Derby version
* Test, shouldn't need to refer the driver class which is already in classpath
* Extracted Derby version in a file so that's defined in single point both for Gradle script and Ruby specs
* Removed commented code (Dervy driver class reference in Ruby specs)

Author: andsel

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) 
 

build.gradle

@@ -11,10 +11,6 @@ apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
-def DERBY_VERSION = '10.15.2.1'
-def DERBY_MINOR = '10.15'
-long DERBY_REVISION = 1905585
-
 buildscript {
     ext {
         svnkitVersion = '1.10.11'
@@ -28,6 +24,22 @@ buildscript {
     }
 }
 
+def loadDerbyVersion() {
+    Map version = [:]
+    new File("$projectDir/derby_version.txt").eachLine {line ->
+        def key = line.split('=')[0]
+        def value = line.split('=')[1]
+        version[key] = value
+    }
+    return version
+}
+
+def version = loadDerbyVersion()
+
+def DERBY_VERSION = version['DERBY_VERSION']
+def DERBY_MINOR = version['DERBY_MINOR']
+long DERBY_REVISION = 1905585
+
 class SvnCheckout extends DefaultTask {
 
     @Input
@@ -68,7 +80,12 @@ repositories {
 
 
 dependencies {
-    implementation files("local_repository/derby-${DERBY_VERSION}.jar", "local_repository/derbyclient-${DERBY_VERSION}.jar")
+    implementation files(
+            "local_repository/derby-${DERBY_VERSION}.jar",
+            "local_repository/derbyclient-${DERBY_VERSION}.jar",
+            "local_repository/derbytools-${DERBY_VERSION}.jar",
+            "local_repository/derbyshared-${DERBY_VERSION}.jar"
+    )
 }
 
 tasks.register("svnCheckout", SvnCheckout) {
@@ -120,15 +137,25 @@ tasks.register('deployLocallyDerbyArtifacts') {
     doLast {
         String derbyFullVersion = readFullDerbyVersion(DERBY_MINOR)
         copy {
-            from layout.buildDirectory.dir("${DERBY_MINOR}/jars/sane/derbyshared.jar")
+            from layout.buildDirectory.dir("${DERBY_MINOR}/jars/sane/derby.jar")
             into file('local_repository/')
-            rename 'derbyshared.jar', "derby-${derbyFullVersion}.jar"
+            rename 'derby.jar', "derby-${derbyFullVersion}.jar"
         }
         copy {
             from layout.buildDirectory.dir("${DERBY_MINOR}/jars/sane/derbyclient.jar")
             into file('local_repository/')
             rename 'derbyclient.jar', "derbyclient-${derbyFullVersion}.jar"
         }
+        copy {
+            from layout.buildDirectory.dir("${DERBY_MINOR}/jars/sane/derbytools.jar")
+            into file('local_repository/')
+            rename 'derbytools.jar', "derbytools-${derbyFullVersion}.jar"
+        }
+        copy {
+            from layout.buildDirectory.dir("${DERBY_MINOR}/jars/sane/derbyshared.jar")
+            into file('local_repository/')
+            rename 'derbyshared.jar', "derbyshared-${derbyFullVersion}.jar"
+        }
     }
 }
 

derby_version.txt

@@ -0,0 +1,2 @@
+DERBY_VERSION=10.15.2.1
+DERBY_MINOR=10.15

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')

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

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 @@ class TestJdbcStreaming < JdbcStreaming
   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

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 @@
   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 @@
     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