From 5446fe63ab23f8c8f13268a7f0753cea369d0664 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Tue, 30 Jun 2026 20:04:51 +0200 Subject: [PATCH 1/5] BOM and parent migration --- celements-base-test/pom.xml | 6 +----- celements-common-test-deprecated/pom.xml | 21 +------------------- celements-common-test/pom.xml | 25 +++++------------------- 3 files changed, 7 insertions(+), 45 deletions(-) diff --git a/celements-base-test/pom.xml b/celements-base-test/pom.xml index b306ae5..6e2b831 100644 --- a/celements-base-test/pom.xml +++ b/celements-base-test/pom.xml @@ -23,12 +23,11 @@ com.celements - base-pom + celements-parent 7.1-SNAPSHOT 4.0.0 celements-base-tests - 7.1-SNAPSHOT Celements Base Tests scm:git:git@github.com:celements/celements-shared-tests.git @@ -42,7 +41,6 @@ com.celements celements-component - 7.1-SNAPSHOT @@ -53,7 +51,6 @@ org.springframework spring-test - ${spring.version} @@ -75,7 +72,6 @@ com.celements celements-commons - 7.1-SNAPSHOT provided diff --git a/celements-common-test-deprecated/pom.xml b/celements-common-test-deprecated/pom.xml index 7f20721..e85b1b9 100644 --- a/celements-common-test-deprecated/pom.xml +++ b/celements-common-test-deprecated/pom.xml @@ -23,12 +23,11 @@ com.celements - base-pom + celements-parent 7.1-SNAPSHOT 4.0.0 celements-shared-tests-deprecated - 7.1-SNAPSHOT Celements Shared Tests Deprecated Classes scm:git:git@github.com:celements/celements-shared-tests.git @@ -41,62 +40,52 @@ com.celements celements-shared-tests - 7.1-SNAPSHOT com.celements celements-commons - 7.1-SNAPSHOT provided com.celements celements-component - 7.1-SNAPSHOT provided com.celements celements-config-source-api - 7.1-SNAPSHOT provided com.celements celements-reference - 7.1-SNAPSHOT provided com.celements celements-observation - 7.1-SNAPSHOT provided com.celements celements-servlet - 7.1-SNAPSHOT provided com.celements celements-xwiki-core - 7.1-SNAPSHOT provided com.celements celements-xwiki-velocity - 7.1-SNAPSHOT provided com.celements celements-xwiki-rendering-api - 7.1-SNAPSHOT provided @@ -172,14 +161,6 @@ - - junit - junit - - - org.easymock - easymock - org.seleniumhq.selenium selenium-java diff --git a/celements-common-test/pom.xml b/celements-common-test/pom.xml index 4154b62..0400f6e 100644 --- a/celements-common-test/pom.xml +++ b/celements-common-test/pom.xml @@ -23,12 +23,11 @@ com.celements - base-pom + celements-parent 7.1-SNAPSHOT 4.0.0 celements-shared-tests - 7.1-SNAPSHOT Celements Shared Tests scm:git:git@github.com:celements/celements-shared-tests.git @@ -41,43 +40,36 @@ com.celements celements-base-tests - 7.1-SNAPSHOT com.celements celements-commons - 7.1-SNAPSHOT provided com.celements celements-component - 7.1-SNAPSHOT provided com.celements celements-config-source-api - 7.1-SNAPSHOT provided com.celements celements-reference - 7.1-SNAPSHOT provided com.celements celements-observation - 7.1-SNAPSHOT provided com.celements celements-servlet - 7.1-SNAPSHOT provided @@ -87,19 +79,16 @@ com.celements celements-xwiki-core - 7.1-SNAPSHOT provided com.celements celements-xwiki-velocity - 7.1-SNAPSHOT provided com.celements celements-xwiki-rendering-api - 7.1-SNAPSHOT provided @@ -197,18 +186,14 @@ org.slf4j slf4j-api - - junit - junit - - - org.easymock - easymock - org.seleniumhq.selenium selenium-java + + net.bytebuddy + byte-buddy + org.mutabilitydetector MutabilityDetector From 8ee58f7a0f632e06e6e7f0eced7940775871ecb8 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Sat, 4 Jul 2026 04:17:23 +0200 Subject: [PATCH 2/5] fix AbstractComponentTest --- .../com/celements/common/test/AbstractComponentTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/celements-common-test/src/main/java/com/celements/common/test/AbstractComponentTest.java b/celements-common-test/src/main/java/com/celements/common/test/AbstractComponentTest.java index ec124f9..230fdc8 100644 --- a/celements-common-test/src/main/java/com/celements/common/test/AbstractComponentTest.java +++ b/celements-common-test/src/main/java/com/celements/common/test/AbstractComponentTest.java @@ -41,6 +41,7 @@ import org.xwiki.context.Execution; import org.xwiki.context.ExecutionContext; import org.xwiki.context.ExecutionContextManager; +import org.xwiki.model.reference.WikiReference; import org.xwiki.test.MockConfigurationSource; import com.celements.execution.XWikiExecutionProp; @@ -84,8 +85,9 @@ public final void setUpXWiki() throws Exception { .setApplicationContext(new TestXWikiApplicationContext()); registerComponentMock(XWikiStubContextProvider.class, "default", execCtx -> { XWikiContext context = new XWikiContext(); - context.setDatabase(DEFAULT_DB); - context.setMainXWiki(DEFAULT_MAIN_WIKI); + WikiReference wikiRef = execCtx.computeIfAbsent(XWikiExecutionProp.WIKI, + () -> new WikiReference(DEFAULT_DB)); + context.setDatabase(wikiRef.getName()); context.setLanguage(DEFAULT_LANG); return context; }); From 8e042c40de4de50356d8feecf4780c5e1ff1e0e0 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Mon, 6 Jul 2026 15:55:20 +0200 Subject: [PATCH 3/5] add celements-wiki-api --- celements-common-test/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/celements-common-test/pom.xml b/celements-common-test/pom.xml index 0400f6e..358f4f9 100644 --- a/celements-common-test/pom.xml +++ b/celements-common-test/pom.xml @@ -81,6 +81,11 @@ celements-xwiki-core provided + + com.celements + celements-wiki-api + provided + com.celements celements-xwiki-velocity From 0c4910071d67065751fb28fa86f15461f95e13da Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Mon, 6 Jul 2026 16:29:01 +0200 Subject: [PATCH 4/5] remove provided scopes --- celements-common-test-deprecated/pom.xml | 15 --------------- celements-common-test/pom.xml | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/celements-common-test-deprecated/pom.xml b/celements-common-test-deprecated/pom.xml index e85b1b9..78d2c48 100644 --- a/celements-common-test-deprecated/pom.xml +++ b/celements-common-test-deprecated/pom.xml @@ -46,81 +46,66 @@ com.celements celements-commons - provided com.celements celements-component - provided com.celements celements-config-source-api - provided com.celements celements-reference - provided com.celements celements-observation - provided com.celements celements-servlet - provided com.celements celements-xwiki-core - provided com.celements celements-xwiki-velocity - provided com.celements celements-xwiki-rendering-api - provided org.xwiki.platform xwiki-core-cache-api - provided org.xwiki.platform xwiki-core-bridge - provided org.xwiki.platform xwiki-core-query-manager - provided org.springframework spring-context - provided org.springframework spring-web - provided org.springframework spring-webmvc - provided diff --git a/celements-common-test/pom.xml b/celements-common-test/pom.xml index 358f4f9..d079316 100644 --- a/celements-common-test/pom.xml +++ b/celements-common-test/pom.xml @@ -45,32 +45,26 @@ com.celements celements-commons - provided com.celements celements-component - provided com.celements celements-config-source-api - provided com.celements celements-reference - provided com.celements celements-observation - provided com.celements celements-servlet - provided javax.servlet @@ -79,51 +73,42 @@ com.celements celements-xwiki-core - provided com.celements celements-wiki-api - provided com.celements celements-xwiki-velocity - provided com.celements celements-xwiki-rendering-api - provided org.xwiki.platform xwiki-core-cache-api - provided org.xwiki.platform xwiki-core-bridge - provided org.xwiki.platform xwiki-core-query-manager - provided org.springframework spring-context - provided org.springframework spring-web - provided From e90662247b6f6b989dd698831a63a0f67e47e7db Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Tue, 7 Jul 2026 20:28:51 +0200 Subject: [PATCH 5/5] add version tag --- celements-base-test/pom.xml | 22 +--------------------- celements-common-test-deprecated/pom.xml | 22 +--------------------- celements-common-test/pom.xml | 22 +--------------------- 3 files changed, 3 insertions(+), 63 deletions(-) diff --git a/celements-base-test/pom.xml b/celements-base-test/pom.xml index 6e2b831..7ef78dd 100644 --- a/celements-base-test/pom.xml +++ b/celements-base-test/pom.xml @@ -1,25 +1,4 @@ - com.celements @@ -28,6 +7,7 @@ 4.0.0 celements-base-tests + 7.1-SNAPSHOT Celements Base Tests scm:git:git@github.com:celements/celements-shared-tests.git diff --git a/celements-common-test-deprecated/pom.xml b/celements-common-test-deprecated/pom.xml index 78d2c48..c97195c 100644 --- a/celements-common-test-deprecated/pom.xml +++ b/celements-common-test-deprecated/pom.xml @@ -1,25 +1,4 @@ - com.celements @@ -28,6 +7,7 @@ 4.0.0 celements-shared-tests-deprecated + 7.1-SNAPSHOT Celements Shared Tests Deprecated Classes scm:git:git@github.com:celements/celements-shared-tests.git diff --git a/celements-common-test/pom.xml b/celements-common-test/pom.xml index d079316..9e2714f 100644 --- a/celements-common-test/pom.xml +++ b/celements-common-test/pom.xml @@ -1,25 +1,4 @@ - com.celements @@ -28,6 +7,7 @@ 4.0.0 celements-shared-tests + 7.1-SNAPSHOT Celements Shared Tests scm:git:git@github.com:celements/celements-shared-tests.git