Skip to content

[prepare-major] update to major version 7.0-SNAPSHOT #503

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 7 commits into
base: dev
Choose a base branch
from
Open

[prepare-major] update to major version 7.0-SNAPSHOT #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d221629
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
08c8d89
update docker/Dockerfile-local
msladek Jan 2, 2026
9109f1f
Merge remote-tracking branch 'origin/dev' into major-7
msladek Jan 4, 2026
fd5b29e
Merge branch 'dev' into major-7
msladek Jan 11, 2026
32e89c4
update maven-enforcer-plugin
msladek Jan 11, 2026
37107d7
remove src/main/webapp/WEB-INF/xwiki.properties
msladek Jan 12, 2026
507fd5e
Merge remote-tracking branch 'origin/dev' into major-7
msladek Jan 15, 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
13 changes: 8 additions & 5 deletions docker/Dockerfile-local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,28 @@
# \___\___|_|\___|_| |_| |_|\___|_| |_|\__|___/ #
# #

FROM tomcat:9-jdk11-temurin
FROM tomcat:10-jdk21-temurin

# environment variables, may be overridden from the .env file
# celements
ENV CELEMENTS_DATA=/usr/local/celements
ENV CONF_DIR=/usr/local/conf
# tomcat
ENV CATALINA_XMX="2g"
# tomcat jpda debugging
ENV JPDA_ADDRESS="8000"
ENV JPDA_TRANSPORT="dt_socket"

# copy configurations / scripts
COPY docker/tomcat /usr/local/config
COPY docker/tomcat ${CONF_DIR}

# installs and setup
RUN mkdir -p \
${CELEMENTS_DATA} \
${CATALINA_HOME}/temp \
&& cp /usr/local/config/setenv.sh ${CATALINA_HOME}/bin/
${CELEMENTS_DATA} \
${CATALINA_HOME}/temp \
${CATALINA_HOME}/conf/Catalina/localhost \
&& cp ${CONF_DIR}/setenv.sh ${CATALINA_HOME}/bin/ \
&& cp ${CONF_DIR}/jakarta.converter.xml ${CATALINA_HOME}/conf/Catalina/localhost/ROOT.xml

# define custom command (with remote debugging)
CMD ["catalina.sh", "jpda", "run"]
4 changes: 4 additions & 0 deletions docker/tomcat/jakarta.converter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<!-- Run legacy javax.* on Tomcat 10 -->
<Context>
<Loader jakartaConverter="TOMCAT" />
</Context>
68 changes: 35 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@
*
-->

<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">
<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">
<url>https://github.com/celements/celements-web</url>
<parent>
<groupId>com.celements</groupId>
<artifactId>celementsweb</artifactId>
<version>6.3</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-web</artifactId>
<packaging>war</packaging>
<version>6.11-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<name>Celements Webapplication</name>
<licenses>
<license>
Expand Down Expand Up @@ -100,12 +102,12 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-scheduler</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-mailsender</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
Expand All @@ -130,43 +132,43 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>blog-web</artifactId>
<version>6.6</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>calendar-web</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>image-web</artifactId>
<version>6.5</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>tinymce-langs</artifactId>
<version>3.4.3.2-celRTE</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>tinymce-langs-v4</artifactId>
<version>4.9.11-CEL5</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>tinymce-langs-v6</artifactId>
<version>6.8.3-CEL6</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-richtext-web</artifactId>
<version>6.4</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
Expand All @@ -176,107 +178,107 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-wiki-manager-web</artifactId>
<version>6.1</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-user-manager-web</artifactId>
<version>6.3</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-layout-web</artifactId>
<version>6.4</version>
<version>7.0-SNAPSHOT</version>
<type>war</type>
</dependency>

<!-- celements dependencies -->
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-commons</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-xwiki-core</artifactId>
<version>6.11</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-global-redirect</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-component</artifactId>
<version>6.1</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-reference</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-observation</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-servlet</artifactId>
<version>6.3</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-config-source-api</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-config-source</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.8</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.17</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-search</artifactId>
<version>6.5</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-captcha</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-subsystem-migration-manager</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-spring-mvc</artifactId>
<version>6.3</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-spring-security</artifactId>
<version>6.4</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-keycloak</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</dependency>

<!-- Spring -->
Expand Down Expand Up @@ -445,7 +447,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce-dependency-convergence</id>
Expand Down
2 changes: 2 additions & 0 deletions sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ TZ=Europe/Zurich
CATALINA_XMX=2g

# celements
APP_NAME=celements
CLUSTER_NAME=local
NODE_NAME=local1
CELEMENTS_DATA=/usr/local/celements
2 changes: 0 additions & 2 deletions src/main/webapp/WEB-INF/xwiki.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ kafka.servers=
#-------------------------------------------------------------------------------------
# empty->disable remote observation, kafka->use kafka
celements.observation.remote=
# kafka topic name
celements.observation.remote.kafka.topic=
# kafka payload encryption (optional)
# openssl rand -base64 32
celements.observation.remote.kafka.crypto.pass=
Expand Down