Merge pull request #9866 from Sanne/pgsql42.2.13

Upgrade PostgreSQL JDBC driver from 42.2.12 to 42.2.13
quarkusio · Jun 8, 2020 · bf97e2e · bf97e2e
2 parents f296186 + d3c9f7a
commit bf97e2e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -110,7 +110,7 @@
         <cronutils.version>9.0.2</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
         <h2.version>1.4.197</h2.version>  <!-- keep 1.4.197 as newer versions have severe regressions -->
-        <postgresql-jdbc.version>42.2.12</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.2.13</postgresql-jdbc.version>
         <mariadb-jdbc.version>2.6.0</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.20</mysql-jdbc.version>
         <mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>

diff --git a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
@@ -21,6 +21,23 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <exclusions>
+                <!-- These dependencies used to be optional in previous versions of the postgresql,
+                    the change seems to be a mistake in the latest release.
+                    Since we didn't have them before, exclude them now explicitly.-->
+                <exclusion>
+                    <groupId>com.github.waffle</groupId>
+                    <artifactId>waffle-jna</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.enterprise</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>