From d2216290919c268ca58a91cff1dfce12a21bf39a Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 17:01:08 +0100 Subject: [PATCH 1/4] [prepare-major] update to major version 7.0-SNAPSHOT --- pom.xml | 62 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index df5517d5d..87fff9a62 100644 --- a/pom.xml +++ b/pom.xml @@ -29,12 +29,12 @@ com.celements celementsweb - 6.3-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 celements-web war - 6.10-SNAPSHOT + 7.0-SNAPSHOT Celements Webapplication @@ -102,12 +102,12 @@ com.celements celements-scheduler - 6.2 + 7.0-SNAPSHOT com.celements celements-mailsender - 6.0 + 7.0-SNAPSHOT com.xpn.xwiki.platform.plugins @@ -132,43 +132,43 @@ com.celements blog-web - 6.6 + 7.0-SNAPSHOT war com.celements calendar-web - 6.2 + 7.0-SNAPSHOT war com.celements image-web - 6.5 + 7.0-SNAPSHOT war com.celements tinymce-langs - 3.4.3.2-celRTE + 7.0-SNAPSHOT war com.celements tinymce-langs-v4 - 4.9.11-CEL5 + 7.0-SNAPSHOT war com.celements tinymce-langs-v6 - 6.8.3-CEL6 + 7.0-SNAPSHOT war com.celements celements-richtext-web - 6.4 + 7.0-SNAPSHOT war @@ -178,19 +178,19 @@ com.celements celements-wiki-manager-web - 6.1 + 7.0-SNAPSHOT war com.celements celements-user-manager-web - 6.3 + 7.0-SNAPSHOT war com.celements celements-layout-web - 6.4 + 7.0-SNAPSHOT war @@ -198,87 +198,87 @@ com.celements celements-commons - 6.2 + 7.0-SNAPSHOT com.celements celements-xwiki-core - 6.11-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-global-redirect - 6.0 + 7.0-SNAPSHOT com.celements celements-component - 6.1 + 7.0-SNAPSHOT com.celements celements-reference - 6.0 + 7.0-SNAPSHOT com.celements celements-observation - 6.2-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-servlet - 6.2 + 7.0-SNAPSHOT com.celements celements-config-source-api - 6.2 + 7.0-SNAPSHOT com.celements celements-config-source - 6.2 + 7.0-SNAPSHOT com.celements celements-model - 6.8-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-core - 6.17-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-search - 6.5-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-captcha - 6.0 + 7.0-SNAPSHOT com.celements celements-subsystem-migration-manager - 6.0 + 7.0-SNAPSHOT com.celements celements-spring-mvc - 6.3 + 7.0-SNAPSHOT com.celements celements-spring-security - 6.3-SNAPSHOT + 7.0-SNAPSHOT com.celements celements-keycloak - 6.2 + 7.0-SNAPSHOT From 08c8d89522f7975ce84c19503ea3ead78800049d Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Fri, 2 Jan 2026 04:32:12 +0100 Subject: [PATCH 2/4] update docker/Dockerfile-local --- docker/Dockerfile-local | 13 ++++++++----- docker/tomcat/jakarta.converter.xml | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 docker/tomcat/jakarta.converter.xml diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index a146a060c..ee95ad1d7 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -5,11 +5,12 @@ # \___\___|_|\___|_| |_| |_|\___|_| |_|\__|___/ # # # -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 @@ -17,13 +18,15 @@ 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"] diff --git a/docker/tomcat/jakarta.converter.xml b/docker/tomcat/jakarta.converter.xml new file mode 100644 index 000000000..ab2aed44d --- /dev/null +++ b/docker/tomcat/jakarta.converter.xml @@ -0,0 +1,4 @@ + + + + From 32e89c484baefab45818685952b3e428949aa9ca Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Sun, 11 Jan 2026 20:35:00 +0100 Subject: [PATCH 3/4] update maven-enforcer-plugin --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1aaec541b..f9562f7c9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,9 @@ * --> - + https://github.com/celements/celements-web com.celements @@ -445,7 +447,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.6.2 enforce-dependency-convergence From 37107d736605dde785945a07449e0da90db9585b Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Mon, 12 Jan 2026 19:07:30 +0100 Subject: [PATCH 4/4] remove src/main/webapp/WEB-INF/xwiki.properties --- sample.env | 2 ++ src/main/webapp/WEB-INF/xwiki.properties | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample.env b/sample.env index 89811fa9e..6c717c77d 100644 --- a/sample.env +++ b/sample.env @@ -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 diff --git a/src/main/webapp/WEB-INF/xwiki.properties b/src/main/webapp/WEB-INF/xwiki.properties index 27907cd08..a08f9fea5 100644 --- a/src/main/webapp/WEB-INF/xwiki.properties +++ b/src/main/webapp/WEB-INF/xwiki.properties @@ -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=