From 68265cf9f3cad247f5a290e73fdf9dcc6eee8b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Mon, 24 Aug 2026 19:35:39 +0200 Subject: [PATCH 01/10] WIP --- Jenkinsfile | 5 +- base-lib/pom.xml | 34 ++++ .../testdb/initdb/01-gcn-testdb-accounts.sql | 15 ++ cms-core/pom.xml | 23 +++ cms-oss-server/pom.xml | 23 +++ pom.xml | 181 ++++++++++++++++++ 6 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 build/testdb/initdb/01-gcn-testdb-accounts.sql diff --git a/Jenkinsfile b/Jenkinsfile index ebf30e8097..82341e4b00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,9 +7,6 @@ JobContext.set(this) final def gitCommitTag = '[Jenkins | ' + env.JOB_BASE_NAME + ']'; -final def testDbManagerHost = "gcn-testdb-manager.gtx-dev.svc" -final def testDbManagerPort = "8080" - def branchName = null def version = null def releaseVersion = "" @@ -291,7 +288,7 @@ spec: // Login to docker.gentics.com so that the tests can pull all Mesh images authDockerRegistry("docker.gentics.com", "docker.gentics.com") authDockerRegistry("docker.gentics.com", "push.docker.gentics.com") - withEnv(["TESTMANAGER_HOSTNAME=" + testDbManagerHost, "TESTMANAGER_PORT=" + testDbManagerPort, "TESTCONTAINERS_RYUK_DISABLED=true"]) { + withEnv(["TESTCONTAINERS_RYUK_DISABLED=true"]) { sh "mvn -B -Dstyle.color=always -U -Dskip.integration.tests -Dui.skip.integrationTest=true " + " -fae -Dmaven.test.failure.ignore=true " + mvnArguments + mvnProjects + " clean " + mvnGoal } diff --git a/base-lib/pom.xml b/base-lib/pom.xml index e30c4cd1bc..b6c7a52a58 100644 --- a/base-lib/pom.xml +++ b/base-lib/pom.xml @@ -57,6 +57,40 @@ + + + io.fabric8 + docker-maven-plugin + + + + testdb-mariadb-start + generate-test-resources + + build + start + + + testdb-mariadb + + + + + testdb-stop + test + + stop + + + testdb-mariadb + + + + + org.codehaus.mojo build-helper-maven-plugin diff --git a/build/testdb/initdb/01-gcn-testdb-accounts.sql b/build/testdb/initdb/01-gcn-testdb-accounts.sql new file mode 100644 index 0000000000..aeff73e85f --- /dev/null +++ b/build/testdb/initdb/01-gcn-testdb-accounts.sql @@ -0,0 +1,15 @@ +-- +-- Account used by the Gentics CMS test suites on the local test database container. +-- See build/testdb/README.md. +-- +-- The gcn-testdb-manager hands this account out to the tests and runs +-- GRANT ALL PRIVILEGES ON *.* to node@'%' IDENTIFIED BY '' +-- for every database it prepares. Since MariaDB 10.4 that statement does not create the +-- account implicitly any more, so it is created here. The empty password is required: +-- the manager always reports an empty password back to the tests +-- (com.gentics.testutils.testdbmanager.ManagerResponse#toProperties). +-- +CREATE USER IF NOT EXISTS 'node'@'%'; +GRANT ALL PRIVILEGES ON *.* TO 'node'@'%' WITH GRANT OPTION; + +FLUSH PRIVILEGES; diff --git a/cms-core/pom.xml b/cms-core/pom.xml index 220caf9b3b..ffa73f4dd7 100644 --- a/cms-core/pom.xml +++ b/cms-core/pom.xml @@ -299,6 +299,29 @@ + + io.fabric8 + docker-maven-plugin + + + + testdb-start + generate-test-resources + + build + start + + + + + testdb-stop + test + + stop + + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/cms-oss-server/pom.xml b/cms-oss-server/pom.xml index 29c6a1143f..09ee330ad8 100644 --- a/cms-oss-server/pom.xml +++ b/cms-oss-server/pom.xml @@ -54,6 +54,29 @@ + + io.fabric8 + docker-maven-plugin + + + + testdb-start + generate-test-resources + + build + start + + + + + testdb-stop + test + + stop + + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/pom.xml b/pom.xml index 9e880ea1b9..9687128a61 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,21 @@ 5.8.1 2.7.2 + 0.49.0 + false + localhost + IfNotPresent + testdb-manager + 33306 + 38080 + mariadb:10.11 + root + ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql + docker.gentics.com/apps/gcn-testdb-manager:master> + 5 + 40 + 4 + 3.1.2 16 4 @@ -345,6 +360,90 @@ + + io.fabric8 + docker-maven-plugin + ${docker.maven.plugin.version} + + ${testdb.docker.skip} + ${testdb.showLogs} + true + + + testdb-mariadb + gentics/cms-oss-testdb-mariadb:local + + ${testdb.mariadb.image} + + /docker-entrypoint-initdb.d + + initdb + + + ${testdb.initdb.script} + . + + + + + + + + + --port=${testdb.mariadb.port} + --transaction-isolation=READ-COMMITTED + --binlog-format=ROW + --log-bin=mysqld-bin + --max-allowed-packet=67108864 + + + + Europe/Vienna + ${testdb.mariadb.password} + + + ${testdb.mariadb.port}:${testdb.mariadb.port} + ${testdb.manager.port}:${testdb.manager.port} + + + + mapped + + ${testdb.mariadb.port} + + + + + + + + testdb-manager + ${testdb.manager.image} + + ${testdb.pullPolicy} + + container + testdb-mariadb + + + Europe/Vienna + ${testdb.manager.port} + ${testdb.host} + ${testdb.mariadb.port} + ${testdb.mariadb.user} + ${testdb.manager.pool.capacity} + ${testdb.manager.gcndb.limit} + ${testdb.manager.filler.threads} + + + .*msg=Listening.* + + + + + + + org.codehaus.mojo jslint-maven-plugin @@ -435,6 +534,88 @@ + + + + local-testdb + + + !testdb.docker.skip + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + ${testdb.host} + ${testdb.manager.port} + + ${testdb.host} + ${testdb.mariadb.port} + ${testdb.mariadb.user} + ${testdb.mariadb.password} + ${testdb.host} + ${testdb.mariadb.port} + ${testdb.mariadb.user} + ${testdb.mariadb.password} + + + + + + + + + + + no-testdb-for-skipped-tests + + + skipTests + true + + + + true + + + + no-testdb-for-skipped-unit-tests + + + skip.unit.tests + true + + + + true + + + + no-testdb-for-skipped-test-compile + + + maven.test.skip + true + + + + true + + + + gentics.nexus.releases-oss From a26e6553dcd0a32af72b4f537593962f04ae2a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Tue, 25 Aug 2026 11:28:18 +0200 Subject: [PATCH 02/10] WIP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9687128a61..ded856f74d 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ mariadb:10.11 root ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql - docker.gentics.com/apps/gcn-testdb-manager:master> + docker.gentics.com/apps/gcn-testdb-manager:master 5 40 4 From 9af9a6145a2dfcd62e4841a0c1cdfd32c1559b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Tue, 25 Aug 2026 12:02:53 +0200 Subject: [PATCH 03/10] WIP --- pom.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index ded856f74d..9b6f70c325 100644 --- a/pom.xml +++ b/pom.xml @@ -110,11 +110,12 @@ false localhost IfNotPresent - testdb-manager + testdb-mariadb,testdb-manager 33306 38080 mariadb:10.11 root + testdb ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql docker.gentics.com/apps/gcn-testdb-manager:master 5 @@ -406,13 +407,8 @@ ${testdb.manager.port}:${testdb.manager.port} - - mapped - - ${testdb.mariadb.port} - - - + .*port: ${testdb.mariadb.port} mariadb.org binary distribution.* + @@ -431,13 +427,14 @@ ${testdb.host} ${testdb.mariadb.port} ${testdb.mariadb.user} + ${testdb.mariadb.password} ${testdb.manager.pool.capacity} ${testdb.manager.gcndb.limit} ${testdb.manager.filler.threads} .*msg=Listening.* - + From be0dc9779bdab45e195a276aff6cf4df29e1a1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Tue, 25 Aug 2026 13:08:11 +0200 Subject: [PATCH 04/10] WIP --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 9b6f70c325..aea48a3f6b 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,7 @@ 33306 38080 mariadb:10.11 + 500 root testdb ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql @@ -396,6 +397,7 @@ --binlog-format=ROW --log-bin=mysqld-bin --max-allowed-packet=67108864 + --max-connections=${testdb.mariadb.maxConnections} From 01ea3f55ae5e07daff5786c8ae02f4b84e3d77c8 Mon Sep 17 00:00:00 2001 From: patrickhoefer Date: Sun, 30 Aug 2026 09:59:49 +0200 Subject: [PATCH 05/10] WIP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aea48a3f6b..2c6d5e6a10 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 33306 38080 mariadb:10.11 - 500 + 1000 root testdb ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql From 580c70a8ca18b55e6580fde658193693a55e803d Mon Sep 17 00:00:00 2001 From: patrickhoefer Date: Sun, 30 Aug 2026 10:24:30 +0200 Subject: [PATCH 06/10] WIP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c6d5e6a10..40d4dfbf27 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 33306 38080 mariadb:10.11 - 1000 + 3000 root testdb ${maven.multiModuleProjectDirectory}/build/testdb/initdb/01-gcn-testdb-accounts.sql From 90760ec1c652725ac35e0e690d529bf3483a5577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Mon, 31 Aug 2026 10:48:53 +0200 Subject: [PATCH 07/10] docs --- cms-oss-doc/src/main/source/gcn_compatibility_list.textile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms-oss-doc/src/main/source/gcn_compatibility_list.textile b/cms-oss-doc/src/main/source/gcn_compatibility_list.textile index 877b9fb365..ed0f5420e5 100644 --- a/cms-oss-doc/src/main/source/gcn_compatibility_list.textile +++ b/cms-oss-doc/src/main/source/gcn_compatibility_list.textile @@ -13,8 +13,9 @@ h4. MariaDB Gentics CMS supports the Long Term Support (LTS) versions of MariaDB. |_.Major Version |_.Minor Versions |_.Supported |_.Notes | +| 12 | 12.3 | Yes[1] | | | 11 | 11.4 | Yes | | -| 10 | 10.6, 10.11 | Yes[1] | Since Gentics CMS 6.0.0 | +| 10 | 10.6, 10.11 | Yes | Since Gentics CMS 6.0.0 | NOTE: For MariaDB versions 11.6 and up, the setting @innodb_snapshot_isolation@ must be disabled in the configuration. From 76bf949309bf1aaf844dfd4d5444ba30cb43cadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Mon, 31 Aug 2026 10:51:19 +0200 Subject: [PATCH 08/10] changelog --- .../src/changelog/entries/2026/08/8893.GPU-2602.enhancement | 1 + 1 file changed, 1 insertion(+) create mode 100644 cms-oss-changelog/src/changelog/entries/2026/08/8893.GPU-2602.enhancement diff --git a/cms-oss-changelog/src/changelog/entries/2026/08/8893.GPU-2602.enhancement b/cms-oss-changelog/src/changelog/entries/2026/08/8893.GPU-2602.enhancement new file mode 100644 index 0000000000..72198bf869 --- /dev/null +++ b/cms-oss-changelog/src/changelog/entries/2026/08/8893.GPU-2602.enhancement @@ -0,0 +1 @@ +Gentics CMS is now tested against MariaDB 12.3 automatically \ No newline at end of file From 2fcb4df6b48c6816ad9e4922e16f6d940bd6398e Mon Sep 17 00:00:00 2001 From: patrickhoefer Date: Mon, 31 Aug 2026 14:50:19 +0200 Subject: [PATCH 09/10] WIP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40d4dfbf27..2217a6a11a 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ testdb-mariadb,testdb-manager 33306 38080 - mariadb:10.11 + mariadb:12.3 3000 root testdb From bb34241b4782ca969dcdc34c8236201d17de3612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6fer=20Patrick?= Date: Tue, 1 Sep 2026 16:06:37 +0200 Subject: [PATCH 10/10] WIP --- base-lib/pom.xml | 35 ++------------------------------- cms-core/pom.xml | 23 ---------------------- cms-js-lib/pom.xml | 2 ++ cms-oss-server/pom.xml | 23 ---------------------- pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 79 deletions(-) diff --git a/base-lib/pom.xml b/base-lib/pom.xml index b6c7a52a58..223529923a 100644 --- a/base-lib/pom.xml +++ b/base-lib/pom.xml @@ -22,6 +22,8 @@ UTF-8 yyyyMMdd-HHmmss + + testdb-mariadb 8 @@ -57,39 +59,6 @@ - - - io.fabric8 - docker-maven-plugin - - - - testdb-mariadb-start - generate-test-resources - - build - start - - - testdb-mariadb - - - - - testdb-stop - test - - stop - - - testdb-mariadb - - - - org.codehaus.mojo diff --git a/cms-core/pom.xml b/cms-core/pom.xml index ffa73f4dd7..220caf9b3b 100644 --- a/cms-core/pom.xml +++ b/cms-core/pom.xml @@ -299,29 +299,6 @@ - - io.fabric8 - docker-maven-plugin - - - - testdb-start - generate-test-resources - - build - start - - - - - testdb-stop - test - - stop - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/cms-js-lib/pom.xml b/cms-js-lib/pom.xml index be7cff30ef..bedd30c776 100644 --- a/cms-js-lib/pom.xml +++ b/cms-js-lib/pom.xml @@ -19,6 +19,8 @@ UTF-8 yyyyMMdd-HHmmss + + true diff --git a/cms-oss-server/pom.xml b/cms-oss-server/pom.xml index 09ee330ad8..29c6a1143f 100644 --- a/cms-oss-server/pom.xml +++ b/cms-oss-server/pom.xml @@ -54,29 +54,6 @@ - - io.fabric8 - docker-maven-plugin - - - - testdb-start - generate-test-resources - - build - start - - - - - testdb-stop - test - - stop - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/pom.xml b/pom.xml index 2217a6a11a..9417cb9f66 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ false localhost IfNotPresent + testdb-mariadb,testdb-manager testdb-mariadb,testdb-manager 33306 38080 @@ -368,6 +369,7 @@ ${docker.maven.plugin.version} ${testdb.docker.skip} + ${testdb.docker.images} ${testdb.showLogs} true @@ -534,6 +536,48 @@ + + + testdb-containers + + + src/test/java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + io.fabric8 + docker-maven-plugin + + + + testdb-start + generate-test-resources + + build + start + + + + + testdb-stop + test + + stop + + + + + + +