update Jaybird (Firebird JDBC driver) to 2.2.7

jruby · Feb 17, 2015 · 6c297c4 · 6c297c4
1 parent 69e8a88
commit 6c297c4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/jdbc-firebird/History.txt b/jdbc-firebird/History.txt
@@ -0,0 +1,11 @@
+== 2.2.7
+
+* Based on Jaybird 2.2.7 (see changes since 2.2.4)
+  http://www.firebirdsql.org/file/documentation/drivers_documentation/java/2.2.7/release_notes.html#__RefHeading__6537_1196219519
+
+* jdk16 and jdk17 versions of jaybird jar are packed and used based on Java version
+
+== 2.2.4
+
+* Based on Jaybird 2.2.4
+  http://www.firebirdsql.org/file/documentation/drivers_documentation/java/2.2.7/release_notes.html#__RefHeading__4798_1756560361
diff --git a/jdbc-firebird/lib/jdbc/firebird.rb b/jdbc-firebird/lib/jdbc/firebird.rb
@@ -5,7 +5,7 @@ module Jdbc
   module Firebird
 
     def self.driver_jar
-      "jaybird-#{DRIVER_VERSION}.jar"
+      "#{jdk_qualifier}/jaybird-#{DRIVER_VERSION}.jar"
     end
 
     def self.load_driver(method = :load)
@@ -27,6 +27,16 @@ def self.driver_name
 
     private
 
+    def self.jdk_qualifier
+      version = ENV_JAVA[ 'java.specification.version' ]
+      version = version.split('.').last.to_i # '1.7' => 7
+      if version >= 7
+        'jdk17' # loading JDBC 4.1 version on JDK-8
+      else # JDBC >= 4.1
+        'jdk16'
+      end
+    end
+
     @@connector_api = nil
 
     def self.load_connector_api(method = :load)

diff --git a/jdbc-firebird/lib/jdbc/firebird/version.rb b/jdbc-firebird/lib/jdbc/firebird/version.rb
@@ -1,6 +1,6 @@
 module Jdbc
   module Firebird
-    DRIVER_VERSION = '2.2.4'
+    DRIVER_VERSION = '2.2.7'
     VERSION = DRIVER_VERSION
   end
 end
diff --git a/jdbc-firebird/lib/jaybird-2.2.4.jar → jdbc-firebird/lib/jdk16/jaybird-2.2.7.jar b/jdbc-firebird/lib/jaybird-2.2.4.jar → jdbc-firebird/lib/jdk16/jaybird-2.2.7.jar
diff --git a/jdbc-firebird/lib/jdk17/jaybird-2.2.7.jar b/jdbc-firebird/lib/jdk17/jaybird-2.2.7.jar