chore: bump minimum version of psql from 10 to 11
Mistaken in previous commit, should have been 11
MODIFY
CHANGELOG.adoc
CHANGELOG.adoc
@@ -135,7 +135,7 @@ Particular thanks go to the team at https://www.scheer-pas.com[Scheer PAS^] who
* [manager-jpa]: Remove most uses of JPA Criteria API and replace with https://persistence.blazebit.com/[Blaze-Persistence^]. This is a modern reinterpretation of the Criteria API concept that is usable by mere human beings such as Apiman's maintainer. https://github.com/Blazebit/blaze-persistence/issues/1436[Thanks to Christian Beikov for his assistance^] in fixing a show-stopper bug that Apiman exposed in Hibernate when using Blaze-Persistence. By https://github.com/msavy[Marc Savy (@msavy)^].
-* [distro]: bump minimum version of Postgres from 9.x to 10.x. PGES 9.x does not support the `create or replace procedure` syntax we use, and the 9.x lineage is not supported upstream any more.
+* [distro]: bump minimum required version of Postgres from 9 to **11**. PGES 9.x does not support the `create or replace procedure` syntax we use, and the 9.x lineage is not supported upstream anymore.
=== Removed

RENAME
distro/data/src/main/resources/ddls/apiman-gateway_postgresql10.ddl
distro/data/src/main/resources/ddls/apiman-gateway_postgresql11.ddl
RENAME
distro/data/src/main/resources/ddls/apiman_postgresql10.ddl
distro/data/src/main/resources/ddls/apiman_postgresql11.ddl
DELETE
distro/data/src/main/resources/sample-configs/apiman-ds_mssql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-manager" pool-name="apiman-manager-api" enabled="true" use-java-context="true">
- <connection-url>jdbc:sqlserver://SQLSERVER:1433;databaseName=apiman;</connection-url>
- <driver>mssql-jdbc-9.4.0.jre11.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

DELETE
distro/data/src/main/resources/sample-configs/apiman-ds_mysql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-manager" pool-name="apiman-manager-api" enabled="true"
- use-java-context="true">
- <connection-url>jdbc:mysql://MYSQLSERVER:3306/apiman</connection-url>
- <driver>mysql-connector-java-8.0.29.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

DELETE
distro/data/src/main/resources/sample-configs/apiman-ds_postgresql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-manager" pool-name="apiman-manager-api" enabled="true" use-java-context="true">
- <connection-url>jdbc:postgresql://POSTGRESQLSERVER:5432/apiman</connection-url>
- <driver>postgresql-42.3.0.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

DELETE
distro/data/src/main/resources/sample-configs/apiman_gw-ds_mssql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-gateway" pool-name="apiman-gateway" enabled="true" use-java-context="true">
- <connection-url>jdbc:sqlserver://SQLSERVER:1433;databaseName=apiman_gateway;</connection-url>
- <driver>mssql-jdbc-9.4.0.jre11.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

DELETE
distro/data/src/main/resources/sample-configs/apiman_gw-ds_mysql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-gateway" pool-name="apiman-gateway" enabled="true"
- use-java-context="true">
- <connection-url>jdbc:mysql://MYSQLSERVER:3306/apiman_gateway</connection-url>
- <driver>mysql-connector-java-8.0.29.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

DELETE
distro/data/src/main/resources/sample-configs/apiman_gw-ds_postgresql.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/apiman/datasources/apiman-gateway" pool-name="apiman-gateway" enabled="true" use-java-context="true">
- <connection-url>jdbc:postgresql://POSTGRESQLSERVER:5432/apiman_gateway</connection-url>
- <driver>postgresql-42.3.0.jar</driver>
- <pool>
- <max-pool-size>30</max-pool-size>
- </pool>
- <security>
- <user-name>DBUSER</user-name>
- <password>DBPASS</password>
- </security>
- </datasource>
-</datasources>

MODIFY
distro/ddl/pom.xml
distro/ddl/pom.xml
<goal>updateSQL</goal>
</goals>
<configuration>
- <migrationSqlOutputFile>${basedir}/target/apiman_postgresql10.ddl</migrationSqlOutputFile>
+ <migrationSqlOutputFile>${basedir}/target/apiman_postgresql11.ddl</migrationSqlOutputFile>
<driver>org.postgresql.Driver</driver>
<url>offline:postgresql?version=9.6.23&amp;caseSensitive=true&amp;changeLogFile=${basedir}/target/changelog/postgresql/databasechangelog.csv</url>
<username>apiman</username>

MODIFY
distro/wildfly/src/main/resources/overlay/standalone/configuration/standalone-apiman.xml
distro/wildfly/src/main/resources/overlay/standalone/configuration/standalone-apiman.xml
</security>
</datasource>
<drivers>
- <driver name="postgresql10" module="org.postgres">
+ <driver name="postgresql11" module="org.postgres">
<driver-class>org.postgresql.Driver</driver-class>
</driver>
<driver name="mysql8" module="com.mysql">

MODIFY
docs/modules/migration/pages/migrations.adoc
docs/modules/migration/pages/migrations.adoc
@@ -54,8 +54,8 @@ Please refer to the Apiman documentation for further information.
==== Minimum database versions
-For PostgreSQL, 10 is now the minimum required database version.
-All versions from 10 to 14 seem to work well.
+For PostgreSQL, 11 is now the minimum required database version.
+All versions from 11 to 14 seem to work well (the latest major version as of writing).
== Migrating to 2.2.3.Final

MODIFY
gateway/engine/jdbc/src/main/java/io/apiman/gateway/engine/jdbc/JdbcInitializer.java
gateway/engine/jdbc/src/main/java/io/apiman/gateway/engine/jdbc/JdbcInitializer.java
@@ -46,7 +46,7 @@ public class JdbcInitializer extends AbstractJdbcComponent implements IGatewayIn
super(config);
dbType = config.get("datasource.type"); //$NON-NLS-1$
if (dbType == null) {
- throw new IllegalArgumentException("Missing configuration parameter for JDBC Initializer: 'datasource.type', Sample values: h2, mysql5, postgresql10, oracle12"); //$NON-NLS-1$
+ throw new IllegalArgumentException("Missing configuration parameter for JDBC Initializer: 'datasource.type', Sample values: h2, mysql5, postgresql11, oracle12"); //$NON-NLS-1$
}
}

MODIFY
manager/api/jpa/src/main/java/io/apiman/manager/api/jpa/JpaDialectMapper.java
manager/api/jpa/src/main/java/io/apiman/manager/api/jpa/JpaDialectMapper.java
@@ -68,15 +68,15 @@ public class JpaDialectMapper {
DB_TYPE_MAP.put(Oracle8iDialect.class.getName(), NamePair.of("oracle19", Oracle8iDialect.class.getName()));
DB_TYPE_MAP.put(Oracle9iDialect.class.getName(), NamePair.of("oracle19", Oracle9iDialect.class.getName()));
- DB_TYPE_MAP.put("postgresql10", NamePair.of("postgresql10", ApimanPostgreSQLDialect.class.getName()));
- DB_TYPE_MAP.put(ApimanPostgreSQLDialect.class.getName(), NamePair.of("postgresql10",ApimanPostgreSQLDialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQLDialect.class.getName(), NamePair.of("postgresql10", PostgreSQLDialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL9Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL9Dialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL91Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL91Dialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL92Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL92Dialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL93Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL93Dialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL94Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL94Dialect.class.getName()));
- DB_TYPE_MAP.put(PostgreSQL95Dialect.class.getName(), NamePair.of("postgresql10", PostgreSQL95Dialect.class.getName()));
+ DB_TYPE_MAP.put("postgresql11", NamePair.of("postgresql11", ApimanPostgreSQLDialect.class.getName()));
+ DB_TYPE_MAP.put(ApimanPostgreSQLDialect.class.getName(), NamePair.of("postgresql11",ApimanPostgreSQLDialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQLDialect.class.getName(), NamePair.of("postgresql11", PostgreSQLDialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL9Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL9Dialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL91Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL91Dialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL92Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL92Dialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL93Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL93Dialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL94Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL94Dialect.class.getName()));
+ DB_TYPE_MAP.put(PostgreSQL95Dialect.class.getName(), NamePair.of("postgresql11", PostgreSQL95Dialect.class.getName()));
DB_TYPE_MAP.put("mssql15", NamePair.of(SQLServerDialect.class.getName(), "mssql15"));
DB_TYPE_MAP.put(SQLServerDialect.class.getName(), NamePair.of("mssql15", SQLServerDialect.class.getName()));

chore: bump minimum version of psql from 10 to 11

Mistaken in previous commit, should have been 11