From 5c154fb9cf7afdd98668b84be159556b662b0984 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Wed, 10 Feb 2021 11:51:34 +1100
Subject: [PATCH] Load JDBC drivers parent first

Fixes #14829
---
 extensions/jdbc/jdbc-db2/runtime/pom.xml                   | 5 +++++
 extensions/jdbc/jdbc-derby/runtime/pom.xml                 | 5 +++++
 extensions/jdbc/jdbc-h2/runtime/pom.xml                    | 5 +++++
 extensions/jdbc/jdbc-mariadb/runtime/pom.xml               | 5 +++++
 extensions/jdbc/jdbc-mssql/runtime/pom.xml                 | 6 +++++-
 extensions/jdbc/jdbc-mysql/runtime/pom.xml                 | 5 +++++
 extensions/jdbc/jdbc-postgresql/runtime/pom.xml            | 5 +++++
 .../it/main/QuarkusClassloaderProtectionDomainTest.java    | 7 +++++--
 8 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/extensions/jdbc/jdbc-db2/runtime/pom.xml b/extensions/jdbc/jdbc-db2/runtime/pom.xml
index 1f8d7752fc458..b84d0be62c5d3 100644
--- a/extensions/jdbc/jdbc-db2/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-db2/runtime/pom.xml
@@ -44,6 +44,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.ibm.db2:jcc</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-derby/runtime/pom.xml b/extensions/jdbc/jdbc-derby/runtime/pom.xml
index a6146b2cc3b5d..8dbd9acce1b0d 100644
--- a/extensions/jdbc/jdbc-derby/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-derby/runtime/pom.xml
@@ -38,6 +38,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.apache.derby:derbyclient</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-h2/runtime/pom.xml b/extensions/jdbc/jdbc-h2/runtime/pom.xml
index a8333bdad905e..f5b0ead89a3e1 100644
--- a/extensions/jdbc/jdbc-h2/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-h2/runtime/pom.xml
@@ -44,6 +44,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.h2database:h2</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
index f822110f3a791..dd9f06910dd65 100644
--- a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
@@ -39,6 +39,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.mariadb.jdbc:mariadb-java-client</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mssql/runtime/pom.xml b/extensions/jdbc/jdbc-mssql/runtime/pom.xml
index 6872952334137..6d4237196e5a5 100644
--- a/extensions/jdbc/jdbc-mssql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mssql/runtime/pom.xml
@@ -83,11 +83,15 @@
     </dependencies>
 
     <build>
-        <!-- Mark this as a runtime dependency, so to make sure it's included on the final classpath during native-image -->
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.microsoft.sqlserver:mssql-jdbc</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mysql/runtime/pom.xml b/extensions/jdbc/jdbc-mysql/runtime/pom.xml
index 45f61b55af864..886c6e44ba5ef 100644
--- a/extensions/jdbc/jdbc-mysql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mysql/runtime/pom.xml
@@ -43,6 +43,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>mysql:mysql-connector-java</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
index 0d6ae6b92f953..e2d054a01aa26 100644
--- a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
@@ -39,6 +39,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.postgresql:postgresql</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java
index 53913e16e39dd..b1b51ef8f50d6 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.main;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -9,6 +10,8 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
+import javax.enterprise.inject.spi.BeanManager;
+
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
@@ -23,7 +26,7 @@ public class QuarkusClassloaderProtectionDomainTest {
 
     @Test
     public void testClassFromJar() throws IOException {
-        Class<?> testClass = org.h2.tools.Server.class;
+        Class<?> testClass = BeanManager.class;
         ClassLoader classLoader = testClass.getClassLoader();
         assertTrue(classLoader instanceof QuarkusClassLoader);
 
@@ -34,7 +37,7 @@ public void testClassFromJar() throws IOException {
             try (JarInputStream jarInputStream = new JarInputStream(inputStream)) {
                 Manifest manifest = jarInputStream.getManifest();
                 assertNotNull(manifest);
-                assertNotNull(manifest.getMainAttributes().getValue("Implementation-Version"));
+                assertEquals("jakarta.enterprise.cdi-api", manifest.getMainAttributes().getValue("Bundle-SymbolicName"));
             }
         }
     }