New upstream version 42.5.4

pom.xml

@@ -10,7 +10,7 @@
     <artifactId>postgresql</artifactId>
     <packaging>jar</packaging>
     <name>PostgreSQL JDBC Driver - JDBC 4.2</name>
-    <version>42.5.3</version>
+    <version>42.5.4</version>
     <description>Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database</description>
     <url>https://github.com/pgjdbc/pgjdbc</url>
 

src/main/java/org/postgresql/util/DriverInfo.java

@@ -16,13 +16,13 @@ public final class DriverInfo {
   // Driver name
   public static final String DRIVER_NAME = "PostgreSQL JDBC Driver";
   public static final String DRIVER_SHORT_NAME = "PgJDBC";
-  public static final String DRIVER_VERSION = "42.5.3";
+  public static final String DRIVER_VERSION = "42.5.4";
   public static final String DRIVER_FULL_NAME = DRIVER_NAME + " " + DRIVER_VERSION;
 
   // Driver version
   public static final int MAJOR_VERSION = 42;
   public static final int MINOR_VERSION = 5;
-  public static final int PATCH_VERSION = 3;
+  public static final int PATCH_VERSION = 4;
 
   // JDBC specification
   public static final String JDBC_VERSION = "4.2";

src/main/resources/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Implementation-Title: PostgreSQL JDBC Driver
 Bundle-License: BSD-2-Clause
 Automatic-Module-Name: org.postgresql.jdbc
-Implementation-Version: 42.5.3
+Implementation-Version: 42.5.4
 Specification-Vendor: Oracle Corporation
 Specification-Title: JDBC
 Implementation-Vendor-Id: org.postgresql

src/test/java/org/postgresql/core/OidValuesCorrectnessTest.java

@@ -61,6 +61,7 @@ public class OidValuesCorrectnessTest extends BaseTest4 {
    * Helps in situation when variable name in Oid class isn't the same as typname in pg_type table.
    */
   private static Map<String, String> oidTypeNames = new HashMap<String, String>() {{
+      put("BOX_ARRAY", "_BOX");
       put("INT2_ARRAY", "_INT2");
       put("INT4_ARRAY", "_INT4");
       put("INT8_ARRAY", "_INT8");

src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataCacheTest.java

@@ -62,11 +62,11 @@ public class DatabaseMetaDataCacheTest {
     List<LogRecord> typeQueries = log.getRecordsMatching(SQL_TYPE_QUERY_LOG_FILTER);
     assertEquals(0, typeQueries.size());
 
-    ti.getSQLType("box");  // this must be a type not in the hardcoded 'types' list
+    ti.getSQLType("xid");  // this must be a type not in the hardcoded 'types' list
     typeQueries = log.getRecordsMatching(SQL_TYPE_QUERY_LOG_FILTER);
     assertEquals(1, typeQueries.size());
 
-    ti.getSQLType("box");  // this time it should be retrieved from the cache
+    ti.getSQLType("xid");  // this time it should be retrieved from the cache
     typeQueries = log.getRecordsMatching(SQL_TYPE_QUERY_LOG_FILTER);
     assertEquals(1, typeQueries.size());
   }