Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jar Updates #1145

Open
wants to merge 11 commits into
base: 70-stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions activerecord-jdbc-adapter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
"AR-JDBC is a database adapter for Rails' ActiveRecord component " <<
"designed to be used with JRuby built upon Java's JDBC API for " <<
"database access. Provides (ActiveRecord) built-in adapters: MySQL, " <<
"PostgreSQL, SQLite3, and SQLServer."
"PostgreSQL, SQLite3, and SQLServer. " <<
"This branch replaces mysql-connector-java-8.0.27 with mysql-connector-j-8.4.0.jar"

gem.require_paths = ["lib"]

Expand All @@ -34,7 +35,7 @@ Gem::Specification.new do |gem|
#gem.requirements << "jar org.postgresql:postgresql, 42.1.4.jre6, :scope => :compile"

# compilation .jar dependencies for extension (at least until `mvn') :
gem.add_development_dependency 'jdbc-mysql', '~> 5.1.44'
gem.add_development_dependency 'jdbc-mysql', '~> 8.1.0'
gem.add_development_dependency 'jdbc-postgres', '~> 42.1'
end

Expand Down
Binary file removed jdbc-h2/lib/h2-2.0.204.jar
Binary file not shown.
Binary file added jdbc-h2/lib/h2-2.2.224.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jdbc-h2/lib/jdbc/h2/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jdbc
module H2
DRIVER_VERSION = '2.0.204'
DRIVER_VERSION = '2.2.224'
VERSION = DRIVER_VERSION
end
end
Binary file removed jdbc-hsqldb/lib/hsqldb-2.3.2.jar
Binary file not shown.
Binary file added jdbc-hsqldb/lib/hsqldb-2.7.2.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jdbc-hsqldb/lib/jdbc/hsqldb/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jdbc
module HSQLDB
DRIVER_VERSION = '2.3.2'
DRIVER_VERSION = '2.7.2'
VERSION = DRIVER_VERSION
end
end
2 changes: 1 addition & 1 deletion jdbc-mysql/lib/jdbc/mysql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Jdbc
module MySQL

def self.driver_jar
"mysql-connector-java-#{DRIVER_VERSION}.jar"
"mysql-connector-j-#{DRIVER_VERSION}.jar"
end

def self.load_driver(method = :load)
Expand Down
2 changes: 1 addition & 1 deletion jdbc-mysql/lib/jdbc/mysql/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jdbc
module MySQL
DRIVER_VERSION = '8.0.27'
DRIVER_VERSION = '8.4.0'
VERSION = DRIVER_VERSION
end
end
Binary file added jdbc-mysql/lib/mysql-connector-j-8.4.0.jar
Binary file not shown.
Binary file removed jdbc-mysql/lib/mysql-connector-java-8.0.27.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jdbc-postgres/lib/jdbc/postgres/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jdbc
module Postgres
DRIVER_VERSION = '42.2.25'
DRIVER_VERSION = '42.7.3'
VERSION = DRIVER_VERSION
end
end
Binary file removed jdbc-postgres/lib/postgresql-42.2.25.jar
Binary file not shown.
Binary file removed jdbc-postgres/lib/postgresql-42.2.25.jre6.jar
Binary file not shown.
Binary file removed jdbc-postgres/lib/postgresql-42.2.25.jre7.jar
Binary file not shown.
Binary file added jdbc-postgres/lib/postgresql-42.7.3.jar
Binary file not shown.
Binary file added jdbc-postgres/lib/postgresql-42.7.3.jre6.jar
Binary file not shown.
Binary file added jdbc-postgres/lib/postgresql-42.7.3.jre7.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jdbc-sqlite3/lib/jdbc/sqlite3/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jdbc
module SQLite3
DRIVER_VERSION = '3.32.3.3'
DRIVER_VERSION = '3.45.3.0'
VERSION = DRIVER_VERSION
end
end
Binary file removed jdbc-sqlite3/lib/sqlite-jdbc-3.32.3.3.jar
Binary file not shown.
Binary file added jdbc-sqlite3/lib/sqlite-jdbc-3.45.3.0.jar
Binary file not shown.