diff --git a/.gitignore b/.gitignore
index 7cef82ca7e..e0d09cd6ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 
 /build/
 /*/build/
+target
+core/target
+servlet/target
 
 /examples/geoserver-data/.updatepassword.lock
 /examples/geoserver-data/controlflow.properties
@@ -20,3 +23,5 @@
 /examples/geoserver-data/wps.xml
 
 /CI.asc
+*~
+
diff --git a/Dockerfile b/Dockerfile
index 5064cfee81..ca7a7e22f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,47 @@
-FROM gradle:6.9-jdk11 AS builder
+#FROM maven:3.8.5-eclipse-temurin-11-alpine@sha256:b4083a13f534f6256179802b3deaeadccf4b8eb9bcb4c8a35b78919624b18448 AS builder
+FROM maven:3.8.5-eclipse-temurin-11-focal@sha256:a5a8b7b6ae4b7045c42ab9c21b72cdffe43db8eebf8bbf5a741f2660453c86ba AS base
 
 RUN apt-get update && \
   apt-get install --yes --no-install-recommends fonts-liberation gettext curl && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \
-  gradle --version
+  mvn --version
 
 WORKDIR /src
 
-COPY gradle/ ./gradle/
-COPY gradle.properties build.gradle settings.gradle CI.asc ./
-COPY examples/build.gradle ./examples/
-COPY docs/build.gradle ./docs/
-COPY publish/build.gradle ./publish/
+COPY pom.xml ./
 COPY core ./core
-COPY checkstyle_* ./
+COPY servlet ./servlet
+
+FROM base AS builder
+RUN mvn -B dependency:resolve -projects core
+
+FROM builder AS cachedbuiler
+
+# COPY checkstyle_* ./
+# COPY gradle.properties build.gradle settings.gradle CI.asc ./
+# COPY examples/build.gradle ./examples/
+# COPY docs/build.gradle ./docs/
+# COPY publish/build.gradle ./publish/
 
 # '&& touch success || true' is a trick to be able to get out some artifacts
-RUN (gradle :core:build :core:explodedWar :core:libSourcesJar :core:libJavadocJar && touch success) || true
+#RUN (gradle :core:build :core:explodedWar :core:libSourcesJar :core:libJavadocJar && touch success) || true
+RUN mvn -B clean install
 
-ARG GIT_HEAD
-ENV GIT_HEAD=${GIT_HEAD}
+# ARG GIT_HEAD
+# ENV GIT_HEAD=${GIT_HEAD}
 
-COPY publish ./publish
+# COPY publish ./publish
 
-RUN ([ -e success ] && (gradle :publish:build && touch success-publish)) || true
+# RUN ([ -e success ] && (gradle :publish:build && touch success-publish)) || true
 
-COPY examples ./examples
-COPY docs ./docs
+# COPY examples ./examples
+# COPY docs ./docs
 
-RUN ([ -e success ] && (gradle :examples:build buildDocs && touch success-examples-docs)) || true
+# RUN ([ -e success ] && (gradle :examples:build buildDocs && touch success-examples-docs)) || true
 
-FROM builder AS test-builder
+# FROM builder AS test-builder
 
-RUN [ -e success ] && [ -e success-publish ] && [ -e success-examples-docs ]
+# RUN [ -e success ] && [ -e success-publish ] && [ -e success-examples-docs ]
 
-VOLUME [ "/src/core" ]
+# VOLUME [ "/src/core" ]
diff --git a/build.gradle b/build.gradle
index 107b562324..d5577679b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,7 @@ configurations.all {
 apply plugin: 'org.owasp.dependencycheck'
 
 configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
+    apply plugin: 'maven'
     apply plugin: 'java'
     apply plugin: 'com.github.spotbugs'
     apply plugin: 'eclipse'
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000000..80c4fc75c4
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>print-lib</artifactId>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.mapfish.print</groupId>
+    <artifactId>mapfish-print</artifactId>
+    <version>3.29.0-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+
+    <!-- Force it to higher version, to prevent an Exception Exception was: 
+      ClassNotFoundException: AnnotationIntrospector$XmlExtensions -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <version>2.13.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ar.com.fdvs</groupId>
+      <artifactId>DynamicJasper</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-epsg-hsql</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-render</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-coverage</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-geojson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-geotiff</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-wms</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-svg</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-cql</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geotools.xsd</groupId>
+      <artifactId>gt-xsd-gml3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-healthchecks</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-servlets</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-servlet</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jmx</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-logback</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.readytalk</groupId>
+      <artifactId>metrics3-statsd</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.thetransactioncompany</groupId>
+      <artifactId>cors-filter</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.vladmihalcea</groupId>
+      <artifactId>hibernate-types-52</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.mchange</groupId>
+      <artifactId>c3p0</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-access</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.spullara.cli-parser</groupId>
+      <artifactId>cli-parser</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>javax.mail</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-s3</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.adobe.xmp</groupId>
+      <artifactId>xmpcore</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.sentry</groupId>
+      <artifactId>sentry-logback</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.logstash.logback</groupId>
+      <artifactId>logstash-logback-encoder</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>xmlgraphics-commons</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-transcoder</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+          <!-- 1.4.01 -->
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-bridge</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+          <!-- 1.4.01 -->
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-codec</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-svg-dom</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+          <!-- 1.4.01 -->
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>de.saly</groupId>
+      <artifactId>javamail-mock2-fullmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000..50ed2a4727
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,67 @@
+FROM mapfish_print_builder AS builder
+
+
+
+FROM tomcat:9.0-jdk17-openjdk-slim-bullseye AS runner
+LABEL maintainer="Camptocamp <info@camptocamp.com>"
+
+RUN perl -0777 -i -pe 's/(<Valve className="org.apache.catalina.valves.AccessLogValve"[^>]*>)/<Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"\/>/s' "${CATALINA_HOME}/conf/server.xml" && \
+  echo "tomcat.util.scan.StandardJarScanFilter.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \
+  echo "org.apache.catalina.startup.TldConfig.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \
+  echo "tomcat.util.scan.DefaultJarScanner.jarsToSkip=*" >> "${CATALINA_HOME}/conf/catalina.properties" && \
+  perl -0777 -i -pe 's/<\/Context>/<Resources cachingAllowed="true" cacheMaxSize="102400"\/><\/Context>/' "${CATALINA_HOME}/conf/context.xml" && \
+  mkdir --parent /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work/Catalina && \
+  chmod -R g+rwx /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work && \
+  chgrp -R root /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work && \
+  chmod g+r /usr/local/tomcat/conf/* && \
+  apt-get update && \
+  apt-get upgrade --assume-yes && \
+  apt-get install --assume-yes --no-install-recommends curl \
+  fonts-liberation fonts-dejavu fontconfig && \
+  apt-get clean && \
+  rm --recursive --force /var/lib/apt/lists/*
+
+#COPY --from=builder /src/core/build/webapp "${CATALINA_HOME}/webapps/ROOT/"
+#COPY --from=builder /src/examples/build/classes/java/test/org/mapfish/print/HumanAlphaSerie.class "${CATALINA_HOME}/webapps/ROOT/WEB-INF/classes/org/mapfish/print/"
+COPY docker /
+
+RUN mkdir -p "${CATALINA_HOME}/extlib/classes/org/mapfish/print" && \
+  cp -r "${CATALINA_HOME}/webapps/ROOT/WEB-INF/classes/org/mapfish/print/url" "${CATALINA_HOME}/extlib/classes/org/mapfish/print/" && \
+  perl -0777 -i -pe 's/<Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"\/>//s' "${CATALINA_HOME}/conf/server.xml" && \
+  chmod g+r -R /usr/local/tomcat/conf/ && \
+  chmod g+rw /usr/local/tomcat/temp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib && \
+  chmod g+rw /usr/local/tomcat/webapps/ROOT/WEB-INF/classes /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/*.xml && \
+  adduser www-data root
+
+ENV LOG_LEVEL=INFO \
+  SPRING_LOG_LEVEL=WARN \
+  JASPER_LOG_LEVEL=WARN \
+  APACHE_LOG_LEVEL=WARN \
+  SQL_LOG_LEVEL=WARN \
+  CATALINA_OPTS= \
+  DEFAULT_LOG_LEVEL=INFO \
+  TOMCAT_LOG_LEVEL=INFO \
+  SENTRY_LOG_LEVEL=ERROR \
+  SENTRY_REPORTING_LOG_LEVEL=WARN \
+  TOMCAT_LOG_TYPE=classic \
+  EXTRA_JARS= \
+  PRINT_YAML_MAX_ALIASES=50 \
+  JAVA_OPTS=-Dsun.net.inetaddr.ttl=30 \
+  SENTRY_DSN=
+
+CMD ["/usr/local/tomcat/bin/docker-start-print"]
+
+#FROM runner AS tester
+
+#COPY jettyRunExtraFiles/mapfish-spring-application-context-override-acceptencetests.xml \
+#  webapps/ROOT/WEB-INF/classes/mapfish-spring-application-context-override.xml
+
+#FROM runner AS watcher
+
+RUN apt-get update && \
+    apt-get install --yes --no-install-recommends python3-pip rsync python3-setuptools && \
+    apt-get clean && \
+    rm --recursive --force /var/lib/apt/lists/* && \
+    python3 -m pip --disable-pip-version-check --no-cache-dir install inotify
+
+FROM runner AS final
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..dc385f2bbf
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,505 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.mapfish.print</groupId>
+  <artifactId>mapfish-print</artifactId>
+  <version>3.29.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <geotools.version>26.4</geotools.version>
+    <spring.version>5.3.20</spring.version>
+    <spring-security.version>5.7.1</spring-security.version>
+    <batik.version>1.14</batik.version>
+    <spotbugsVersion>4.7.0</spotbugsVersion>
+    <dropvizard.version>4.2.9</dropvizard.version>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>osgeo-release</id>
+      <name>OSGeo Repository</name>
+      <url>https://repo.osgeo.org/repository/release/</url>
+      <!-- Contains releases for OSGeo projects: GeoTools, GeoWebCache, GeoServer, 
+        ... -->
+      <!-- Includes third-party-dependences, and caches of: -->
+      <!-- ucar (https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases) -->
+      <!-- geosolutions (http://maven.geo-solutions.it/) -->
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+
+    <!-- for statsd -->
+    <repository>
+      <id>readytalk</id>
+      <name>Spring Plugins</name>
+      <url>https://artifactory.georchestra.org/artifactory/bintray-readytalk-cache/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+
+      <dependency>
+        <groupId>ar.com.fdvs</groupId>
+        <artifactId>DynamicJasper</artifactId>
+        <version>5.3.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.sf.jasperreports</groupId>
+        <artifactId>jasperreports-fonts</artifactId>
+        <version>6.19.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.sf.jasperreports</groupId>
+        <artifactId>jasperreports-functions</artifactId>
+        <version>6.19.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.10.14</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-epsg-hsql</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-render</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-coverage</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-geojson</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-geotiff</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-wms</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-svg</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-cql</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.geotools.xsd</groupId>
+        <artifactId>gt-xsd-gml3</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-annotations</artifactId>
+        <version>${spotbugsVersion}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-healthchecks</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-servlets</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-servlet</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-httpclient</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-jmx</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-logback</artifactId>
+        <version>${dropvizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.readytalk</groupId>
+        <artifactId>metrics3-statsd</artifactId>
+        <version>4.2.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>4.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.sf.jasperreports</groupId>
+        <artifactId>jasperreports</artifactId>
+        <version>6.19.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-config</artifactId>
+        <version>${spring-security.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-web</artifactId>
+        <version>${spring-security.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.thetransactioncompany</groupId>
+        <artifactId>cors-filter</artifactId>
+        <version>2.10</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>5.6.9.Final</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>42.3.6</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.vladmihalcea</groupId>
+        <artifactId>hibernate-types-52</artifactId>
+        <version>2.16.2</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.mchange</groupId>
+        <artifactId>c3p0</artifactId>
+        <version>0.9.5.5</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${spring.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>30.1.1-jre</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.36</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>1.7.36</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>1.7.36</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>1.2.11</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-access</artifactId>
+        <version>1.2.11</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20220320</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>1.30</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.github.spullara.cli-parser</groupId>
+        <artifactId>cli-parser</artifactId>
+        <version>1.1.6</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.13</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.mail</groupId>
+        <artifactId>javax.mail</artifactId>
+        <version>1.6.2</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.amazonaws</groupId>
+        <artifactId>aws-java-sdk-s3</artifactId>
+        <version>1.12.230</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>com.adobe.xmp</groupId>
+        <artifactId>xmpcore</artifactId>
+        <version>6.1.11</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>io.sentry</groupId>
+        <artifactId>sentry-logback</artifactId>
+        <version>5.7.4</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>net.logstash.logback</groupId>
+        <artifactId>logstash-logback-encoder</artifactId>
+        <version>7.2</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>xmlgraphics-commons</artifactId>
+        <version>2.7</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-transcoder</artifactId>
+        <version>1.14</version>
+        <scope>compile</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- 1.4.01 -->
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-bridge</artifactId>
+        <version>1.14</version>
+        <scope>compile</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- 1.4.01 -->
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-codec</artifactId>
+        <version>1.14</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-svg-dom</artifactId>
+        <version>1.14</version>
+        <scope>compile</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- 1.4.01 -->
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>4.0.1</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.2</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>3.9.0</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>de.saly</groupId>
+        <artifactId>javamail-mock2-fullmock</artifactId>
+        <version>0.5-beta4</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <modules>
+    <module>core</module>
+    <module>servlet</module>
+
+  </modules>
+
+</project>
diff --git a/servlet/pom.xml b/servlet/pom.xml
new file mode 100644
index 0000000000..fd7c377aff
--- /dev/null
+++ b/servlet/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>print-servlet</artifactId>
+  <packaging>war</packaging>
+
+  <parent>
+    <groupId>org.mapfish.print</groupId>
+    <artifactId>mapfish-print</artifactId>
+    <version>3.29.0-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.mapfish.print</groupId>
+      <artifactId>print-lib</artifactId>
+      <version>3.29.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/core/src/main/webapp/WEB-INF/classes/logback.xml b/servlet/src/main/webapp/WEB-INF/classes/logback.xml
similarity index 100%
rename from core/src/main/webapp/WEB-INF/classes/logback.xml
rename to servlet/src/main/webapp/WEB-INF/classes/logback.xml
diff --git a/core/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml b/servlet/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml
similarity index 100%
rename from core/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml
rename to servlet/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml
diff --git a/core/src/main/webapp/WEB-INF/mapfish-print-servlet.xml b/servlet/src/main/webapp/WEB-INF/mapfish-print-servlet.xml
similarity index 100%
rename from core/src/main/webapp/WEB-INF/mapfish-print-servlet.xml
rename to servlet/src/main/webapp/WEB-INF/mapfish-print-servlet.xml
diff --git a/core/src/main/webapp/WEB-INF/web.xml b/servlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from core/src/main/webapp/WEB-INF/web.xml
rename to servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/core/src/main/webapp/favicon.ico b/servlet/src/main/webapp/favicon.ico
similarity index 100%
rename from core/src/main/webapp/favicon.ico
rename to servlet/src/main/webapp/favicon.ico
diff --git a/core/src/main/webapp/index.html b/servlet/src/main/webapp/index.html
similarity index 100%
rename from core/src/main/webapp/index.html
rename to servlet/src/main/webapp/index.html
diff --git a/core/src/main/webapp/mapfish_transparent.png b/servlet/src/main/webapp/mapfish_transparent.png
similarity index 100%
rename from core/src/main/webapp/mapfish_transparent.png
rename to servlet/src/main/webapp/mapfish_transparent.png