bugfix: support MySQL up to 9.4 and PostgreSQL up to 17 [JENKINS-75858] (#928)

Author: bguerin

README.adoc

@@ -535,7 +535,7 @@ By default, the Jenkins Pipeline Maven Plugin uses an H2 embedded database, but
 Configuration steps to use a MySQL:
 
 * Create an empty MySQL database with a dedicated MySQL user with permissions for Data Manipulation Language actions (DML) and Data Definition Language (DDL) actions
-** Tested with MySQL up to 8.1, with MariaDB up to 11.1 and with Amazon Aurora MySQL 5.6
+** Tested with MySQL up to 9.4, with MariaDB up to 11.1 and with Amazon Aurora MySQL 5.6
 * Install the Jenkins `MySQL Database` plugin
 ** Navigate to `Manage Jenkins / Manage Plugins / Available`, select the `MySQL Database` plugin and click on `Download now and install after restart`
 *  Configure the Pipeline Maven Plugin to use the created MySQL database
@@ -564,7 +564,7 @@ By default, the Jenkins Pipeline Maven Plugin uses an H2 embedded database, but
 Configuration steps to use a PostgreSQL:
 
 * Create an empty PostgreSQL database with a dedicated PostgreSQL user with permissions for Data Manipulation Language actions (DML) and Data Definition Language (DDL) actions
-** Tested with PostgreSQL up to 16
+** Tested with PostgreSQL up to 17
 * Install the Jenkins the https://plugins.jenkins.io/postgresql-api/[PostgreSQL API] plugin
 ** Navigate to `Manage Jenkins / Manage Plugins / Available`, select the `PostgreSQL API` plugin and click on `Download now and install after restart`.
 *  Configure the Pipeline Maven Plugin to use the created PostgreSQL database

pipeline-maven-database/src/main/java/org/jenkinsci/plugins/pipeline/maven/db/AbstractPipelineMavenPluginDao.java

@@ -296,7 +296,7 @@ public FormValidation validateConfiguration(Config config) {
                                 metaData.getDatabaseProductName() + " " + metaData.getDatabaseProductVersion();
                         LOGGER.log(Level.INFO, "Checking JDBC connection against " + databaseVersionDescription);
                         String databaseRequirement =
-                                "MySQL Server up to 8.1 or Amazon Aurora MySQL 5.6+ or MariaDB up to 11.1 or PostgreSQL up to 16 is required";
+                                "MySQL Server up to 8.1 or Amazon Aurora MySQL 5.6+ or MariaDB up to 11.1 or PostgreSQL up to 17 is required";
                         if ("MariaDB".equals(metaData.getDatabaseProductName())) {
                             @Nullable
                             String mariaDbVersion = PipelineMavenPluginMySqlDao.extractMariaDbVersion(
@@ -327,6 +327,9 @@ public FormValidation validateConfiguration(Config config) {
                                     metaData.getDatabaseProductVersion());
 
                             switch (metaData.getDatabaseMajorVersion()) {
+                                case 9:
+                                    // OK
+                                    break;
                                 case 8:
                                     // OK
                                     break;
@@ -380,6 +383,7 @@ public FormValidation validateConfiguration(Config config) {
                                 }
                             }
                             switch (metaData.getDatabaseMajorVersion()) {
+                                case 17:
                                 case 16:
                                 case 15:
                                 case 14:

pipeline-maven-database/src/test/java/org/jenkinsci/plugins/pipeline/maven/db/PipelineMavenPluginMySqlDaoIT.java

@@ -56,7 +56,7 @@
 public class PipelineMavenPluginMySqlDaoIT extends PipelineMavenPluginDaoAbstractTest {
 
     @Container
-    public static MySQLContainer<?> DB = new MySQLContainer<>(MySQLContainer.NAME).withImagePullPolicy(alwaysPull());
+    public static LatestMySQLContainer DB = new LatestMySQLContainer().withImagePullPolicy(alwaysPull());
 
     @Override
     public DataSource before_newDataSource() {
@@ -112,4 +112,23 @@ public void ensureValidateConfiguration() throws Exception {
             assertThat(result.toString()).isEqualTo("OK: MySQL " + version + " is a supported database");
         }
     }
+
+    // Need
+    // https://github.com/testcontainers/testcontainers-java/issues/10184
+    // https://github.com/testcontainers/testcontainers-java/pull/10185
+    // to be fixed
+    static class LatestMySQLContainer extends MySQLContainer<LatestMySQLContainer> {
+
+        public LatestMySQLContainer() {
+            super(MySQLContainer.NAME + ":9");
+        }
+
+        protected void configure() {
+            addEnv("MYSQL_DATABASE", getDatabaseName());
+            addEnv("MYSQL_USER", getUsername());
+            addEnv("MYSQL_PASSWORD", getPassword());
+            addEnv("MYSQL_ROOT_PASSWORD", getPassword());
+            setStartupAttempts(3);
+        }
+    }
 }

pipeline-maven-database/src/test/java/org/jenkinsci/plugins/pipeline/maven/db/PipelineMavenPluginPostgreSqlDaoIT.java

@@ -57,7 +57,7 @@ public class PipelineMavenPluginPostgreSqlDaoIT extends PipelineMavenPluginDaoAb
 
     @Container
     public static PostgreSQLContainer<?> DB =
-            new PostgreSQLContainer<>(PostgreSQLContainer.IMAGE).withImagePullPolicy(alwaysPull());
+            new PostgreSQLContainer<>(PostgreSQLContainer.IMAGE + ":17").withImagePullPolicy(alwaysPull());
 
     @Override
     public DataSource before_newDataSource() throws Exception {