Merge remote-tracking branch 'refs/remotes/origin/master' into errorprone

Author: bytefish

PgBulkInsert/pgbulkinsert-core/src/test/java/de/bytefish/pgbulkinsert/test/pgsql/handlers/HstoreExtensionTest.java

@@ -8,7 +8,6 @@
 import de.bytefish.pgbulkinsert.util.PostgreSqlUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.sql.ResultSet;
@@ -38,6 +37,7 @@ public void setCol_hstore(Map<String, String> col_hstore) {
 
     @Override
     protected void onSetUpInTransaction() throws Exception {
+        installExtension();
         createTable();
     }
 
@@ -55,6 +55,14 @@ public HStoreEntityMapping() {
         }
     }
 
+    private boolean installExtension() throws SQLException {
+        String sqlStatement = "CREATE EXTENSION IF NOT EXISTS hstore;";
+
+        Statement statement = connection.createStatement();
+
+        return statement.execute(sqlStatement);
+    }
+
     private boolean createTable() throws SQLException {
         String sqlStatement = String.format("CREATE TABLE %s.hstore_table(\n", schema) +
                 "                col_hstore hstore \n" +
@@ -66,7 +74,6 @@ private boolean createTable() throws SQLException {
     }
 
     @Test
-    @Ignore("This Test Requires the hstore extension to be enabled.")
     @SuppressWarnings("unchecked")
     public void saveAll_Hstore_Test() throws SQLException {
 
@@ -96,7 +103,7 @@ public void saveAll_Hstore_Test() throws SQLException {
             Map<String, String> v = (Map<String,String>) rs.getObject("col_hstore");
 
             Assert.assertEquals(1, v.size());
-            Assert.assertEquals(true, v.containsKey("Philipp"));
+            Assert.assertTrue(v.containsKey("Philipp"));
             Assert.assertEquals("Cool Cool Cool!", v.get("Philipp"));
         }
     }

PgBulkInsert/pom.xml

@@ -166,7 +166,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <postgresql.version>42.2.9</postgresql.version>
+        <postgresql.version>42.2.12</postgresql.version>
         <junit.version>4.13</junit.version>
     </properties>
 
@@ -215,7 +215,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>