Skip to content

CELDEV-1319 parent/BOM restructuring #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msladek wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

CELDEV-1319 parent/BOM restructuring #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5446fe6
BOM and parent migration
msladek Jun 30, 2026
8ee58f7
fix AbstractComponentTest
msladek Jul 4, 2026
8e042c4
add celements-wiki-api
msladek Jul 6, 2026
0c49100
remove provided scopes
msladek Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions celements-base-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.celements</groupId>
<artifactId>base-pom</artifactId>
<artifactId>celements-parent</artifactId>
<version>7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-base-tests</artifactId>
<version>7.1-SNAPSHOT</version>
<description>Celements Base Tests</description>
<scm>
<connection>scm:git:git@github.com:celements/celements-shared-tests.git</connection>
Expand All @@ -42,7 +41,6 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-component</artifactId>
<version>7.1-SNAPSHOT</version>
</dependency>

<!-- Spring -->
Expand All @@ -53,7 +51,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>

<!-- Commons -->
Expand All @@ -75,7 +72,6 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-commons</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
36 changes: 1 addition & 35 deletions celements-common-test-deprecated/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.celements</groupId>
<artifactId>base-pom</artifactId>
<artifactId>celements-parent</artifactId>
<version>7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-shared-tests-deprecated</artifactId>
<version>7.1-SNAPSHOT</version>
<description>Celements Shared Tests Deprecated Classes</description>
<scm>
<connection>scm:git:git@github.com:celements/celements-shared-tests.git</connection>
Expand All @@ -41,97 +40,72 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-shared-tests</artifactId>
<version>7.1-SNAPSHOT</version>
</dependency>

<!-- Celements -->
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-commons</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-component</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-config-source-api</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-reference</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-observation</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-servlet</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-core</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-velocity</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-rendering-api</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<!-- XWiki -->
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-cache-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-bridge</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-query-manager</artifactId>
<scope>provided</scope>
</dependency>

<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<scope>provided</scope>
</dependency>

<!-- Storage -->
Expand Down Expand Up @@ -172,14 +146,6 @@
</dependency>

<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
Expand Down
43 changes: 9 additions & 34 deletions celements-common-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.celements</groupId>
<artifactId>base-pom</artifactId>
<artifactId>celements-parent</artifactId>
<version>7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-shared-tests</artifactId>
<version>7.1-SNAPSHOT</version>
<description>Celements Shared Tests</description>
<scm>
<connection>scm:git:git@github.com:celements/celements-shared-tests.git</connection>
Expand All @@ -41,44 +40,31 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-base-tests</artifactId>
<version>7.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-commons</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-component</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-config-source-api</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-reference</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-observation</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-servlet</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -87,49 +73,42 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-core</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-wiki-api</artifactId>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-velocity</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-rendering-api</artifactId>
<version>7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<!-- Other XWiki modules -->
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-cache-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-bridge</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-query-manager</artifactId>
<scope>provided</scope>
</dependency>

<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>

<!-- Storage -->
Expand Down Expand Up @@ -197,18 +176,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>
<dependency>
<groupId>org.mutabilitydetector</groupId>
<artifactId>MutabilityDetector</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions celements-common-test/src/main/java/com/celements/common/test/AbstractComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
});
Expand Down