Skip to content

Commit 9b2925a

Browse files
committed
Merge 63555022-deep-jdbc-drivers to master
[Completes #63555022]
2 parents 5249fe5 + b16c160 commit 9b2925a

5 files changed

Lines changed: 2 additions & 2 deletions

File tree

lib/java_buildpack/framework/maria_db_jdbc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def supports?
4242

4343
def has_driver?
4444
%w(mariadb-java-client*.jar mysql-connector-java*.jar).any? do |candidate|
45-
(@application.root + candidate).glob.any?
45+
(@application.root + '**' + candidate).glob.any?
4646
end
4747
end
4848

lib/java_buildpack/framework/postgresql_jdbc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def supports?
4141
private
4242

4343
def has_driver?
44-
(@application.root + 'postgresql-*.jar').glob.any?
44+
(@application.root + '**/postgresql-*.jar').glob.any?
4545
end
4646

4747
def has_service?

spec/fixtures/framework_mariadb_jdbc_with_driver/mariadb-java-client-0.0.0.jar renamed to spec/fixtures/framework_mariadb_jdbc_with_driver/WEB-INF/lib/mariadb-java-client-0.0.0.jar

File renamed without changes.

spec/fixtures/framework_mariadb_jdbc_with_mysql_driver/mysql-connector-java-5.1.27-bin.jar renamed to spec/fixtures/framework_mariadb_jdbc_with_mysql_driver/WEB-INF/lib/mysql-connector-java-5.1.27-bin.jar

File renamed without changes.

spec/fixtures/framework_postgresql_jdbc_with_driver/postgresql-9.3-1100-jdbc41.jar renamed to spec/fixtures/framework_postgresql_jdbc_with_driver/WEB-INF/lib/postgresql-9.3-1100-jdbc41.jar

File renamed without changes.

0 commit comments

Comments
 (0)