Jakarta migration (#2040)

* MNT-23451 filterQuery for facet Null (#1764)

After MNT-23276, a "Null" value was introduced but the facetQuery does not reflect how to query nodes with that facet

* [maven-release-plugin][skip ci] prepare release 23.1.0.153

* [maven-release-plugin][skip ci] prepare for next development iteration

* ACS-4799: E2Es - Elasticsearch query feature expansion - boosts (#2034)

- bump TAS Utility version

* [maven-release-plugin][skip ci] prepare release 23.1.0.154

* [maven-release-plugin][skip ci] prepare for next development iteration

---------

Co-authored-by: Nicolas Barithel <nicolas.barithel@hyland.com>
Co-authored-by: alfresco-build <8039454+alfresco-build@users.noreply.github.com>
Co-authored-by: Krystian Dabrowski <98942253+krdabrowski@users.noreply.github.com>
Co-authored-by: pzurek <Piotr.Zurek@hyland.com>

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ on:
 env:
   DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  GIT_HTTP_CREDENTIALS: "${{ secrets.BOT_GITHUB_USERNAME }}:${{ secrets.BOT_GITHUB_TOKEN }}"
   GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
   LOG_WARN: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
   MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
@@ -66,6 +67,20 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
+  pmd_scan:
+    name: "PMD Scan"
+    runs-on: ubuntu-latest
+    needs: [prepare]
+    if: >
+      github.event_name == 'pull_request' &&
+      !contains(github.event.head_commit.message, '[skip pmd]') &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force]')
+    steps:
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pmd@v2.5.0
+        with:
+          fail-on-new-issues: "false"
+
   all_unit_tests_suite:
     name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
     runs-on: ubuntu-latest
@@ -547,3 +562,27 @@ jobs:
           aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
+
+  ags_start_api_explorer:
+    name: "Test Tomcat deployment of api explorer"
+    runs-on: ubuntu-latest
+    needs: [ prepare ]
+    if: >
+      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      !contains(github.event.head_commit.message, '[skip ags]')) ||
+      contains(github.event.head_commit.message, '[ags]')) &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force]')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - name: "Build"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: |
+          bash ./scripts/ci/init.sh
+          bash ./scripts/ci/build.sh
+      - name: "Test Tomcat deployment"
+        run: |
+          mvn verify -Pags,start-api-explorer -DskipTests &
+          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java

@@ -28,7 +28,7 @@ package org.alfresco.rest.core;
 
 import static lombok.AccessLevel.PROTECTED;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import lombok.Getter;
 import lombok.Setter;

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java

@@ -512,7 +512,12 @@ public abstract class BaseAPI
         try
         {
             HttpResponse httpResponse = doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams);
-            assertEquals("POST request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
+            if (httpResponse.getStatusLine().getStatusCode() != expectedStatusCode)
+            {
+                // It's only possible to stream the response body once, so ensure we only do this if the test has failed.
+                JSONObject responseJson = responseBodyToJson(httpResponse);
+                assertEquals("POST request to " + requestUrl + " was not successful. Response: " + responseJson, expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
+            }
             return httpResponse;
         }
         catch (InstantiationException | IllegalAccessException error)
@@ -521,6 +526,32 @@ public abstract class BaseAPI
         }
     }
 
+    /**
+     * Try to convert the response body to a JSON object.
+     *
+     * @param response The response.
+     * @return The JSON object or null if it was not possible to convert the response.
+     */
+    private JSONObject responseBodyToJson(HttpResponse response)
+    {
+        try
+        {
+            try
+            {
+                return new JSONObject(EntityUtils.toString(response.getEntity()));
+            }
+            catch (JSONException error)
+            {
+                LOGGER.error("Converting message body to JSON failed. Body: {}", response.getEntity().getContent(), error);
+            }
+        }
+        catch (ParseException | IOException error)
+        {
+            LOGGER.error("Parsing message body failed.", error);
+        }
+        return null;
+    }
+
     /**
      * Helper method for handling generic HTTP requests
      * @param requestType request type (a subclass of {@link HttpRequestBase})
@@ -558,18 +589,7 @@ public abstract class BaseAPI
             HttpResponse response = client.execute(adminUser, adminPassword, request);
             LOGGER.info("Response: {}", response.getStatusLine());
 
-            try
-            {
-                responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
-            }
-            catch (JSONException error)
-            {
-                LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
-            }
-            catch (ParseException | IOException error)
-            {
-                LOGGER.error("Parsing message body failed.", error);
-            }
+            responseBody = responseBodyToJson(response);
 
             switch (response.getStatusLine().getStatusCode())
             {

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/Dockerfile

@@ -25,7 +25,7 @@ COPY target/alfresco-share-services-*.amp /usr/local/tomcat/amps/
 # Install amps on alfresco.war
 RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
               /usr/local/tomcat/amps \
-              /usr/local/tomcat/webapps/alfresco -directory -nobackup
+              /usr/local/tomcat/webapps/alfresco -directory -nobackup -force
 
 ### Copy gs-api-explorer
 COPY --chown=root:Alfresco --from=AGSBUILDER /build/gs-api-explorer /usr/local/tomcat/webapps/gs-api-explorer

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -60,9 +60,12 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>javax.servlet-api</artifactId>
-         <scope>provided</scope>
+         <groupId>jakarta.servlet</groupId>
+         <artifactId>jakarta.servlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.mail</groupId>
+         <artifactId>jakarta.mail-api</artifactId>
       </dependency>
       <dependency>
          <groupId>org.alfresco.surf</groupId>
@@ -436,7 +439,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
@@ -507,7 +510,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java

@@ -39,12 +39,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeUtility;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java

@@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 
 import static org.alfresco.util.WebScriptUtils.getTemplateVars;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java

@@ -27,7 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.script;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java

@@ -30,7 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java

@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java

@@ -34,7 +34,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java

@@ -33,7 +33,7 @@ import static org.alfresco.util.WebScriptUtils.getTemplateVars;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService;
 import org.alfresco.service.cmr.repository.NodeRef;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java

@@ -27,7 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.script;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java

@@ -32,7 +32,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java

@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java

@@ -44,7 +44,7 @@
  */
 package org.alfresco.repo.web.scripts.roles;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java

@@ -54,7 +54,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;

amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -37,21 +37,37 @@
          <build>
             <plugins>
                 <plugin>
-                  <groupId>org.apache.tomcat.maven</groupId>
-                  <artifactId>tomcat7-maven-plugin</artifactId>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven3-plugin</artifactId>
                     <executions>
                         <execution>
                             <id>run-war</id>
-                        <goals>
-                           <goal>run-war</goal>
-                        </goals>
                             <phase>verify</phase>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
                         </execution>
                     </executions>
                     <configuration>
-                     <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                     <path>/api-explorer</path>
-                     <port>8085</port>
+                        <container>
+                            <containerId>tomcat9x</containerId>
+                            <type>embedded</type>
+                            <log>target/cargo.log</log>
+                        </container>
+                        <configuration>
+                            <properties>
+                                <cargo.servlet.port>8085</cargo.servlet.port>
+                            </properties>
+                        </configuration>
+                        <deployables>
+                            <deployable>
+                                <type>war</type>
+                                <properties>
+                                    <context>/api-explorer</context>
+                                </properties>
+                                <pingURL>http://localhost:8085/api-explorer</pingURL>
+                            </deployable>
+                        </deployables>
                     </configuration>
                 </plugin>
             </plugins>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -128,9 +128,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- SHA-2432 -->

amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java

@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.repo.web.scripts.admin.NodeBrowserPost;

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js

@@ -23,6 +23,10 @@ function runAction(p_params)
       if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
       {
          p_params.destNode.unlock();
+         if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
+         {
+             p_params.destNode.removeAspect("gd2:editingInGoogle");
+         }
       }
 
       var resultId = originalDoc.name,

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.116</version>
+      <version>23.1.0.155-SNAPSHOT</version>
    </parent>
 
    <dependencies>
@@ -111,9 +111,8 @@
 
       <!-- provided dependencies -->
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>javax.servlet-api</artifactId>
-         <scope>provided</scope>
+         <groupId>jakarta.servlet</groupId>
+         <artifactId>jakarta.servlet-api</artifactId>
       </dependency>
 
       <!-- Test only dependencies, as popped up while running mvn test -->

core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java

@@ -26,8 +26,8 @@ import java.net.UnknownHostException;
 import java.security.AlgorithmParameters;
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.encryption.MACUtils.MACInput;
 import org.alfresco.error.AlfrescoRuntimeException;

core/src/main/java/org/alfresco/encryption/EncryptionUtils.java

@@ -21,8 +21,8 @@ package org.alfresco.encryption;
 import java.io.IOException;
 import java.security.AlgorithmParameters;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.httpclient.HttpMethod;
 

core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java

@@ -20,13 +20,13 @@ package org.alfresco.web.scripts.servlet;
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Simple servlet filter to add a 'Cache-Control' HTTP header to a response.
@@ -48,7 +48,7 @@ public class StaticAssetCacheFilter implements Filter
     
     
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+     * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig)
      */
     public void init(FilterConfig config) throws ServletException
     {
@@ -60,7 +60,7 @@ public class StaticAssetCacheFilter implements Filter
     }
     
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain)
      */
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException,
             ServletException
@@ -70,7 +70,7 @@ public class StaticAssetCacheFilter implements Filter
     }
     
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#destroy()
+     * @see jakarta.servlet.Filter#destroy()
      */
     public void destroy()
     {

core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java

@@ -21,9 +21,9 @@ package org.alfresco.web.scripts.servlet;
 
 import javax.management.*;
 import javax.security.auth.x500.X500Principal;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.Set;
@@ -134,7 +134,7 @@ public abstract class X509ServletFilterBase implements Filter
                 logger.debug("Enforcing X509 request");
             }
 
-            X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("javax.servlet.request.X509Certificate");
+            X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("jakarta.servlet.request.X509Certificate");
             if(validCert(certs))
             {
 

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -90,9 +90,8 @@
             | see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope
             -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- Jakarta... -->
@@ -100,7 +99,6 @@
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
         </dependency>
-        <!-- REPO-5047 - Replaces com.sun.activation:javax.activation -->
         <dependency>
             <groupId>com.sun.activation</groupId>
             <artifactId>jakarta.activation</artifactId>
@@ -119,7 +117,7 @@
         <dependency>
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
-            <version>1.3.3</version>
+            <version>1.4.2</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 
@@ -142,53 +140,11 @@
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-commons-impl</artifactId>
             <version>${dependency.opencmis.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.xml.messaging.saaj</groupId>
-                    <artifactId>saaj-impl</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from com.fasterxml.woodstox:woodstox-core -->
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>woodstox-core-asl</artifactId>
-                </exclusion>
-                <!-- [ACS-544] Excluded as conflicts with JDK9+ as it includes javax.transaction -->
-                <exclusion>
-                  <groupId>org.apache.geronimo.specs</groupId>
-                  <artifactId>geronimo-jta_1.1_spec</artifactId>
-                </exclusion>
-             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-server-bindings</artifactId>
             <version>${dependency.opencmis.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-lang</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.jws:jakarta.jws-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.annotation:jakarta.annotation-api -->
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from com.sun.activation:jakarta.activation -->
-                <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>javax.activation</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!-- This is now deployed at:
             | http://artifacts.alfresco.com/nexus/content/repositories/thirdparty/org/acegisecurity/acegi-security/0.8.2_patched/

data-model/src/main/java/org/alfresco/util/WebApplicationContextLoader.java

@@ -27,7 +27,7 @@ package org.alfresco.util;
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
 import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;

jakarta-dependencies/.gitignore

@@ -0,0 +1 @@
+/projects

jakarta-dependencies/README.MD

@@ -0,0 +1,19 @@
+## How to build dependencies
+```shell
+cd jakarta-dependencies
+./build-dependencies.sh
+```
+
+## How to build the repo
+```shell
+#Use jakarta-migration branch
+mvn clean package -DskipTests -Dmaven.javadoc.skip=true -Pags
+```
+
+## With TAS tests compilation
+```shell
+ mvn clean package -DskipTests -Dmaven.javadoc.skip=true -Pags -Pall-tas-tests
+```
+* requires TAS test framework migration (similar approach to the greenmail/webscripts )
+* Search for `//JAKARTA_TO_DO|` in all repositories
+* Try running tests

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-client-api/pom.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-client-api</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-commons-api</artifactId>
+         <version>${version}</version>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-client-api</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-client-bindings/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-client-bindings</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-commons-impl</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-transports-http</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-client-bindings</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-client-impl/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-client-impl</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-client-api</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-commons-impl</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-client-bindings</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-transports-http</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-ws-policy</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-client-impl</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-commons-api/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-commons-api</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-commons-api</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-commons-impl/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-commons-impl</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-commons-api</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.woodstox</groupId>
+         <artifactId>woodstox-core</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-commons-impl</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-server-bindings/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-server-bindings</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-server-support</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.cxf</groupId>
+         <artifactId>cxf-rt-transports-http</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-lang3</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-server-bindings</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-server-support/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-server-support</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-commons-impl</artifactId>
+         <version>${version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.antlr</groupId>
+         <artifactId>antlr-runtime</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-server-support</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/chemistry-opencmis-test-tck/pom.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>apache-chemistry</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>chemistry-opencmis-test-tck</artifactId>
+   <packaging>jar</packaging>
+   <version>1.0.0-jakarta</version>
+
+   <dependencies>
+      <dependency>
+         <groupId>${groupId}</groupId>
+         <artifactId>chemistry-opencmis-client-impl</artifactId>
+         <version>${version}</version>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>org.apache.chemistry.opencmis</groupId>
+                        <artifactId>chemistry-opencmis-test-tck</artifactId>
+                        <version>${dependency.opencmis.version}</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/apache-chemistry/pom.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>binary-transformed-to-jakarta</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <groupId>org.apache.chemistry.opencmis</groupId>
+   <artifactId>apache-chemistry</artifactId>
+   <packaging>pom</packaging>
+   <version>1.0-SNAPSHOT</version>
+
+   <licenses>
+      <license>
+         <name>Apache 2</name>
+         <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+         <distribution>repo</distribution>
+      </license>
+   </licenses>
+
+   <properties>
+      <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
+      <dependency.cxf.version>4.0.2</dependency.cxf.version>
+      <dependency.woodstox-core.version>6.5.1</dependency.woodstox-core.version>
+      <dependency.antlr.version>3.5.3</dependency.antlr.version>
+      <dependency.commons-lang3.version>3.12.0</dependency.commons-lang3.version>
+   </properties>
+
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-server-bindings</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-server-support</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-test-tck</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-commons-impl</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-commons-api</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-client-api</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-client-impl</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-client-bindings</artifactId>
+            <version>${dependency.opencmis.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${dependency.cxf.version}</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>org.eclipse.angus</groupId>
+                  <artifactId>*</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${dependency.cxf.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${dependency.cxf.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>${dependency.woodstox-core.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-runtime</artifactId>
+            <version>${dependency.antlr.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${dependency.commons-lang3.version}</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
+   <modules>
+      <module>chemistry-opencmis-server-bindings</module>
+      <module>chemistry-opencmis-server-support</module>
+      <module>chemistry-opencmis-test-tck</module>
+      <module>chemistry-opencmis-commons-impl</module>
+      <module>chemistry-opencmis-commons-api</module>
+      <module>chemistry-opencmis-client-api</module>
+      <module>chemistry-opencmis-client-impl</module>
+      <module>chemistry-opencmis-client-bindings</module>
+   </modules>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/commons-fileupload/pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>binary-transformed-to-jakarta</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <groupId>commons-fileupload</groupId>
+   <artifactId>commons-fileupload</artifactId>
+   <packaging>jar</packaging>
+   <version>1.5-jakarta</version>
+
+   <licenses>
+      <license>
+         <name>Apache 2</name>
+         <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+         <distribution>repo</distribution>
+      </license>
+   </licenses>
+
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.5</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-jar</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                     <artifact>
+                        <groupId>commons-fileupload</groupId>
+                        <artifactId>commons-fileupload</artifactId>
+                        <version>1.5</version>
+                     </artifact>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/direct-rules.properties

@@ -0,0 +1,74 @@
+# Jakarta SOAP with Attachments string constants from jakarta.xml.soap-api-1.4.2.jar
+javax.xml.soap=jakarta.xml.soap
+javax.xml.soap.MetaFactory=jakarta.xml.soap.MetaFactory
+javax.xml.soap.character-set-encoding=jakarta.xml.soap.character-set-encoding
+javax.xml.soap.write-xml-declaration=jakarta.xml.soap.write-xml-declaration
+# Other
+javax.xml.soap.SOAPMessage=jakarta.xml.soap.SOAPMessage
+
+# Jakarta XML Binding string constants from jakarta.xml.bind-api-2.3.3.jar
+javax.xml.bind=jakarta.xml.bind
+javax.xml.bind.JAXBContext=jakarta.xml.bind.JAXBContext
+javax.xml.bind.JAXBContextFactory=jakarta.xml.bind.JAXBContextFactory
+javax.xml.bind.context.factory=jakarta.xml.bind.context.factory
+javax/xml/bind/JAXBContext.class=jakarta/xml/bind/JAXBContext.class
+# Other
+javax.xml.bind.JAXBElement=jakarta.xml.bind.JAXBElement
+javax.xml.bind.annotation.XmlEnum=jakarta.xml.bind.annotation.XmlEnum
+com.sun.xml.bind.defaultNamespaceRemap=org.glassfish.jaxb.defaultNamespaceRemap
+com.sun.xml.internal.bind.defaultNamespaceRemap=org.glassfish.jaxb.defaultNamespaceRemap
+http\://java.sun.com/xml/ns/jaxb=https://jakarta.ee/xml/ns/jaxb
+
+# Jakarta XML Web Services string constants from jakarta.xml.ws-api-2.3.3.jar
+javax.xml.ws=jakarta.xml.ws
+javax.xml.ws.RespectBindingFeature=jakarta.xml.ws.RespectBindingFeature
+javax.xml.ws.binding.attachments.inbound=jakarta.xml.ws.binding.attachments.inbound
+javax.xml.ws.binding.attachments.outbound=jakarta.xml.ws.binding.attachments.outbound
+javax.xml.ws.handler.message.outbound=jakarta.xml.ws.handler.message.outbound
+javax.xml.ws.http.request.headers=jakarta.xml.ws.http.request.headers
+javax.xml.ws.http.request.method=jakarta.xml.ws.http.request.method
+javax.xml.ws.http.request.pathinfo=jakarta.xml.ws.http.request.pathinfo
+javax.xml.ws.http.request.querystring=jakarta.xml.ws.http.request.querystring
+javax.xml.ws.http.response.code=jakarta.xml.ws.http.response.code
+javax.xml.ws.http.response.headers=jakarta.xml.ws.http.response.headers
+javax.xml.ws.reference.parameters=jakarta.xml.ws.reference.parameters
+javax.xml.ws.security.auth.password=jakarta.xml.ws.security.auth.password
+javax.xml.ws.security.auth.username=jakarta.xml.ws.security.auth.username
+javax.xml.ws.service.endpoint.address=jakarta.xml.ws.service.endpoint.address
+javax.xml.ws.servlet.context=jakarta.xml.ws.servlet.context
+javax.xml.ws.servlet.request=jakarta.xml.ws.servlet.request
+javax.xml.ws.servlet.response=jakarta.xml.ws.servlet.response
+javax.xml.ws.session.maintain=jakarta.xml.ws.session.maintain
+javax.xml.ws.soap.http.soapaction.uri=jakarta.xml.ws.soap.http.soapaction.uri
+javax.xml.ws.soap.http.soapaction.use=jakarta.xml.ws.soap.http.soapaction.use
+javax.xml.ws.spi.http.request.cert.X509Certificate=jakarta.xml.ws.spi.http.request.cert.X509Certificate
+javax.xml.ws.spi.http.request.cipher.suite=jakarta.xml.ws.spi.http.request.cipher.suite
+javax.xml.ws.spi.http.request.key.size=jakarta.xml.ws.spi.http.request.key.size
+javax.xml.ws.wsdl.description=jakarta.xml.ws.wsdl.description
+javax.xml.ws.wsdl.interface=jakarta.xml.ws.wsdl.interface
+javax.xml.ws.wsdl.operation=jakarta.xml.ws.wsdl.operation
+javax.xml.ws.wsdl.port=jakarta.xml.ws.wsdl.port
+javax.xml.ws.wsdl.service=jakarta.xml.ws.wsdl.service
+# Other
+javax.xml.ws.addressing.context=jakarta.xml.ws.addressing.context
+javax.xml.ws.addressing.context.inbound=jakarta.xml.ws.addressing.context.inbound
+javax.xml.ws.addressing.context.outbound=jakarta.xml.ws.addressing.context.outbound
+javax.jws.HandlerChain=jakarta.jws.HandlerChain
+javax.jws.WebService=jakarta.jws.WebService
+javax.xml.ws.Action=jakarta.xml.ws.Action
+javax.xml.ws.AsyncHandler=jakarta.xml.ws.AsyncHandler
+javax.xml.ws.BindingType=jakarta.xml.ws.BindingType
+javax.xml.ws.FaultAction=jakarta.xml.ws.FaultAction
+javax.xml.ws.Holder=jakarta.xml.ws.Holder
+javax.xml.ws.RespectBinding=jakarta.xml.ws.RespectBinding
+javax.xml.ws.Response=jakarta.xml.ws.Response
+javax.xml.ws.Service=jakarta.xml.ws.Service
+javax.xml.ws.ServiceMode=jakarta.xml.ws.ServiceMode
+javax.xml.ws.soap.Addressing=jakarta.xml.ws.soap.Addressing
+javax.xml.ws.soap.MTOM=jakarta.xml.ws.soap.MTOM
+javax.xml.ws.spi.Provider=jakarta.xml.ws.spi.Provider
+javax.xml.ws.WebServiceProvider=jakarta.xml.ws.WebServiceProvider
+javax.xml.ws.wsaddressing.W3CEndpointReference=jakarta.xml.ws.wsaddressing.W3CEndpointReference
+
+com.ibm.xml.xlxp2.jaxb.JAXBContextFactory=org.glassfish.jaxb.runtime.v2.JAXBContextFactory
+com.sun.xml.bind.v2.ContextFactory=org.glassfish.jaxb.runtime.v2.ContextFactory

jakarta-dependencies/binary-transformed-to-jakarta/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>jakarta-dependencies</artifactId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>binary-transformed-to-jakarta</artifactId>
+   <packaging>pom</packaging>
+   <properties>
+      <rules.path>${maven.multiModuleProjectDirectory}/binary-transformed-to-jakarta</rules.path>
+   </properties>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <extensions>true</extensions>
+            <configuration>
+               <rules>
+                  <renames>${rules.path}/rename-rules.properties</renames>
+                  <versions>${rules.path}/version-rules.properties</versions>
+                  <directs>${rules.path}/direct-rules.properties</directs>
+               </rules>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
+
+   <modules>
+      <module>apache-chemistry</module>
+      <module>commons-fileupload</module>
+   </modules>
+</project>

jakarta-dependencies/binary-transformed-to-jakarta/rename-rules.properties

@@ -0,0 +1,40 @@
+javax.activation=jakarta.activation
+
+javax.annotation.security=jakarta.annotation.security
+javax.annotation.sql=jakarta.annotation.sql
+javax.annotation=jakarta.annotation
+
+javax.mail.event=jakarta.mail.event
+javax.mail.internet=jakarta.mail.internet
+javax.mail.search=jakarta.mail.search
+javax.mail.util=jakarta.mail.util
+javax.mail=jakarta.mail
+
+javax.servlet.annotation=jakarta.servlet.annotation
+javax.servlet.descriptor=jakarta.servlet.descriptor
+javax.servlet.http=jakarta.servlet.http
+javax.servlet.resources=jakarta.servlet.resources
+javax.servlet=jakarta.servlet
+
+javax.jms=jakarta.jms
+
+javax.jws.soap=jakarta.jws.soap
+javax.jws=jakarta.jws
+
+javax.xml.bind.annotation.adapters=jakarta.xml.bind.annotation.adapters
+javax.xml.bind.annotation=jakarta.xml.bind.annotation
+javax.xml.bind.attachment=jakarta.xml.bind.attachment
+javax.xml.bind.helpers=jakarta.xml.bind.helpers
+javax.xml.bind.util=jakarta.xml.bind.util
+javax.xml.bind=jakarta.xml.bind
+
+javax.xml.soap=jakarta.xml.soap
+
+javax.xml.ws.handler.soap=jakarta.xml.ws.handler.soap
+javax.xml.ws.handler=jakarta.xml.ws.handler
+javax.xml.ws.http=jakarta.xml.ws.http
+javax.xml.ws.soap=jakarta.xml.ws.soap
+javax.xml.ws.spi.http=jakarta.xml.ws.spi.http
+javax.xml.ws.spi=jakarta.xml.ws.spi
+javax.xml.ws.wsaddressing=jakarta.xml.ws.wsaddressing
+javax.xml.ws=jakarta.xml.ws

jakarta-dependencies/binary-transformed-to-jakarta/version-rules.properties

@@ -0,0 +1,40 @@
+jakarta.activation=[2.0,3)
+
+jakarta.annotation.security=[2.0,3)
+jakarta.annotation.sql=[2.0,3)
+jakarta.annotation=[2.0,3)
+
+javax.mail.event=[2.0,3)
+javax.mail.internet=[2.0,3)
+javax.mail.search=[2.0,3)
+javax.mail.util=[2.0,3)
+javax.mail=[2.0,3)
+
+jakarta.servlet.annotation=[5.0,6)
+jakarta.servlet.descriptor=[5.0,6)
+jakarta.servlet.http=[5.0,6)
+jakarta.servlet.resources=[5.0,6)
+jakarta.servlet=[5.0,6)
+
+jakarta.jms=[3.0,4)
+
+jakarta.jws.soap=[3.0,4)
+jakarta.jws=[3.0,4)
+
+jakarta.xml.bind.annotation.adapters=[3.0,4)
+jakarta.xml.bind.annotation=[3.0,4)
+jakarta.xml.bind.attachment=[3.0,4)
+jakarta.xml.bind.helpers=[3.0,4)
+jakarta.xml.bind.util=[3.0,4)
+jakarta.xml.bind=[3.0,4)
+
+jakarta.xml.soap=[3.0,4)
+
+jakarta.xml.ws.handler.soap=[3.0,4)
+jakarta.xml.ws.handler=[3.0,4)
+jakarta.xml.ws.http=[3.0,4)
+jakarta.xml.ws.soap=[3.0,4)
+jakarta.xml.ws.spi.http=[3.0,4)
+jakarta.xml.ws.spi=[3.0,4)
+jakarta.xml.ws.wsaddressing=[3.0,4)
+jakarta.xml.ws=[3.0,4)

jakarta-dependencies/build-dependencies.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -e
+
+HTTP_CREDENTIALS=$1
+DEPENDENCIES_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
+mvn -f $DEPENDENCIES_DIR -B clean install
+
+function clone_and_install {
+  local project_path=$DEPENDENCIES_DIR/projects/$1
+  local branch_name=${2:-jakarta-migration}
+  if [ ! -d "$project_path" ]; then
+    if [ -z "$HTTP_CREDENTIALS" ]; then
+      git clone --single-branch --branch $branch_name git@github.com:Alfresco/$1.git $project_path
+    else
+      git clone --single-branch --branch $branch_name https://${HTTP_CREDENTIALS}@github.com/Alfresco/$1.git $project_path
+    fi
+  fi
+  mvn -f $project_path -B clean install -DskipTests -Dmaven.javadoc.skip=true
+}
+
+clone_and_install surf-webscripts
+clone_and_install alfresco-greenmail
+clone_and_install alfresco-tas-utility
+clone_and_install alfresco-tas-email
+clone_and_install alfresco-office-services
+
+#Ugly hack to deal with AOS<->REPO circular dependencies
+mvn -f $DEPENDENCIES_DIR/.. install -pl :alfresco-remote-api -am -DskipTests -Dmaven.javadoc.skip=true
+clone_and_install alfresco-aos-module

jakarta-dependencies/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.alfresco</groupId>
+   <artifactId>jakarta-dependencies</artifactId>
+   <version>1.0-SNAPSHOT</version>
+   <packaging>pom</packaging>
+
+   <build>
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.eclipse.transformer</groupId>
+               <artifactId>transformer-maven-plugin</artifactId>
+               <version>0.5.0</version>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
+
+   <modules>
+      <module>binary-transformed-to-jakarta</module>
+   </modules>
+</project>

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -31,6 +31,11 @@
             <artifactId>maven-artifact</artifactId>
             <version>${dependency.maven-artifact.version}</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/Dockerfile

@@ -1,6 +1,6 @@
 # Fetch image based on Tomcat 9.0, Java 17 and Rocky Linux 8
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202303081618
+FROM quay.io/alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux8
 
 # Set default docker_context.
 ARG resource_path=target
@@ -48,7 +48,7 @@ COPY ${resource_path}/amps ${TOMCAT_DIR}/amps
 # Install amps on alfresco.war
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \
               ${TOMCAT_DIR}/amps \
-              ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup
+              ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force
 
 # Move the log file
 RUN sed -i -e "s_appender.rolling.fileName\=alfresco.log_appender.rolling.fileName\=${TOMCAT_DIR}/logs\/alfresco.log_" \

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <organization>
@@ -18,7 +18,6 @@
     <properties>
         <maven.build.sourceVersion>17</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <chemistry-opencmis-commons-api>1.1.0</chemistry-opencmis-commons-api>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-release.version>2.5.3</maven-release.version>
         <java.version>17</java.version>
@@ -69,13 +68,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <!-- open cmis settings -->
-        <dependency>
-            <groupId>org.apache.chemistry.opencmis</groupId>
-            <artifactId>chemistry-opencmis-commons-api</artifactId>
-            <version>${chemistry-opencmis-commons-api}</version>
-        </dependency>
     </dependencies>
 
     <build>

packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java

@@ -280,16 +280,26 @@ public class CmisUtil
 
     protected boolean isPrivateWorkingCopy()
     {
-        boolean result;
+        final Document document;
         try
         {
-            result = getPWCDocument().isVersionSeriesPrivateWorkingCopy();
+            document = getPWCDocument();
         }
         catch (CmisVersioningException cmisVersioningException)
         {
-            result = false;
+            return false;
         }
-        return result;
+
+        if (Boolean.FALSE.equals(document.isVersionable())) return false;
+        if (Boolean.FALSE.equals(document.isVersionSeriesCheckedOut())) return false;
+
+        final Boolean isPWC = document.isPrivateWorkingCopy();
+        if (isPWC != null) return isPWC;
+
+        final String vsCoId = document.getVersionSeriesCheckedOutId();
+        if (vsCoId == null) return false;
+
+        return vsCoId.equals(document.getId());
     }
 
     /**

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -31,6 +31,11 @@
             <artifactId>email</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java

@@ -11,8 +11,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.FolderNotFoundException;
-import javax.mail.MessagingException;
+import jakarta.mail.FolderNotFoundException;
+import jakarta.mail.MessagingException;
 
 public class ImapCheckFolderTests extends EmailTest
 {

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java

@@ -10,8 +10,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.FolderNotFoundException;
-import javax.mail.MessagingException;
+import jakarta.mail.FolderNotFoundException;
+import jakarta.mail.MessagingException;
 
 public class ImapCopyFolderTests extends EmailTest
 {

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java

@@ -1,6 +1,6 @@
 package org.alfresco.email.imap;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.email.EmailTest;

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java

@@ -12,7 +12,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.FolderNotFoundException;
+import jakarta.mail.FolderNotFoundException;
 
 /**
  * Tests for Create Folder action using IMAP client

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java

@@ -10,7 +10,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.FolderNotFoundException;
+import jakarta.mail.FolderNotFoundException;
 
 public class ImapDeleteFolderTests extends EmailTest
 {

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java

@@ -9,7 +9,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 public class ImapDeleteMessagesTests extends EmailTest
 {

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java

@@ -8,7 +8,7 @@ import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.Test;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 
 public class ImapMessageFlagsTests extends EmailTest
 {

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java

@@ -1,6 +1,6 @@
 package org.alfresco.email.imap;
 
-import javax.mail.FolderNotFoundException;
+import jakarta.mail.FolderNotFoundException;
 
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.email.EmailTest;

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java

@@ -10,8 +10,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.Flags;
-import javax.mail.MessagingException;
+import jakarta.mail.Flags;
+import jakarta.mail.MessagingException;
 import java.io.IOException;
 
 public class ImapReadMessagesTests extends EmailTest

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java

@@ -1,6 +1,6 @@
 package org.alfresco.email.imap;
 
-import javax.mail.FolderNotFoundException;
+import jakarta.mail.FolderNotFoundException;
 
 import org.alfresco.email.EmailTest;
 import org.alfresco.utility.constants.UserRole;

packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java

@@ -8,8 +8,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.mail.FolderNotFoundException;
-import javax.mail.MessagingException;
+import jakarta.mail.FolderNotFoundException;
+import jakarta.mail.MessagingException;
 
 public class ImapSitesTests extends EmailTest
 {

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java

@@ -2,7 +2,7 @@ package org.alfresco.tas.integration;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
-import javax.mail.FolderNotFoundException;
+import jakarta.mail.FolderNotFoundException;
 
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.model.RestDeploymentModel;

packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java

@@ -8,8 +8,8 @@ import io.restassured.RestAssured;
 import java.io.File;
 
 import javax.json.JsonObject;
-import javax.mail.Flags;
-import javax.mail.MessagingException;
+import jakarta.mail.Flags;
+import jakarta.mail.MessagingException;
 
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.dataprep.SiteService.Visibility;

packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java

@@ -5,7 +5,7 @@ import static org.alfresco.utility.report.log.Step.STEP;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.model.RestErrorModel;

packaging/tests/tas-restapi/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -16,7 +16,7 @@
         <maven.build.sourceVersion>17</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <rest.api.explorer.branch>master</rest.api.explorer.branch>
-        <httpclient-osgi-version>4.5.14</httpclient-osgi-version>
+        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
         <org.glassfish.version>1.1.4</org.glassfish.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <scribejava-apis.version>8.3.3</scribejava-apis.version>
@@ -45,13 +45,9 @@
     </profiles>
 
     <dependencies>
-        <!-- fix the info log messages related to Could not instantiate TestExecutionListener 
-            [org.springframework.test.context.web.ServletTestExecutionListener -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- alfresco tester settings -->

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java

@@ -86,6 +86,7 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.testng.Assert;
@@ -630,37 +631,27 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
         STEP(restRequest.toString());
 
-        Response returnedResponse;
-        switch (restRequest.getHttpMethod())
-        {
-            case GET:
+        final Response returnedResponse;
+        HttpMethod httpMethod = restRequest.getHttpMethod();
+        if (HttpMethod.GET.equals(httpMethod))
             returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case DELETE:
+        else if (HttpMethod.DELETE.equals(httpMethod))
             returnedResponse = onRequest().delete(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case HEAD:
+        else if (HttpMethod.HEAD.equals(httpMethod))
             returnedResponse = onRequest().head(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case OPTIONS:
+        else if (HttpMethod.OPTIONS.equals(httpMethod))
             returnedResponse = onRequest().options(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case POST:
+        else if (HttpMethod.POST.equals(httpMethod))
             returnedResponse = onRequest().body(restRequest.getBody())
                     .post(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case PUT:
+        else if (HttpMethod.PUT.equals(httpMethod))
             returnedResponse = onRequest().body(restRequest.getBody())
                     .contentType(ContentType.JSON.withCharset(restRequest.getContentType()))
                     .put(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            case TRACE:
+        else if (HttpMethod.TRACE.equals(httpMethod))
             returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-            default:
+        else
             returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-                break;
-        }
 
         logResponseInformation(restRequest, returnedResponse);
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestDefaultsModel.java

@@ -0,0 +1,190 @@
+package org.alfresco.rest.search;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
+ */
+public class RestRequestDefaultsModel extends TestModel implements IRestModel<RestRequestDefaultsModel>
+{
+    @JsonProperty(value = "entry")
+    RestRequestDefaultsModel model;
+
+    @Override
+    public RestRequestDefaultsModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    A list of query fields/properties used to expand TEXT: queries.
+The default is cm:content.
+You could include all content properties using d:content or list all individual content properties or types.
+As more terms are included the query size, complexity, memory impact and query time will increase.
+
+    */	        
+
+    private List<String> textAttributes;	    
+    /**
+    The default way to combine query parts when AND or OR is not explicitly stated - includes ! - +
+one two three
+(one two three)
+
+    */	        
+
+    private String defaultFTSOperator;	    
+    /**
+    The default way to combine query parts in field query groups when AND or OR is not explicitly stated - includes ! - +
+FIELD:(one two three)
+
+    */	        
+
+    private String defaultFTSFieldOperator;	    
+    /**
+    The default name space to use if one is not provided
+    */	        
+
+    private String namespace;	    
+
+    private String defaultFieldName;	    
+
+    public List<String> getTextAttributes()
+    {
+        return this.textAttributes;
+    }
+
+    public void setTextAttributes(List<String> textAttributes)
+    {
+        this.textAttributes = textAttributes;
+    }				
+
+    public String getDefaultFTSOperator()
+    {
+        return this.defaultFTSOperator;
+    }
+
+    public void setDefaultFTSOperator(String defaultFTSOperator)
+    {
+        this.defaultFTSOperator = defaultFTSOperator;
+    }				
+
+    public String getDefaultFTSFieldOperator()
+    {
+        return this.defaultFTSFieldOperator;
+    }
+
+    public void setDefaultFTSFieldOperator(String defaultFTSFieldOperator)
+    {
+        this.defaultFTSFieldOperator = defaultFTSFieldOperator;
+    }				
+
+    public String getNamespace()
+    {
+        return this.namespace;
+    }
+
+    public void setNamespace(String namespace)
+    {
+        this.namespace = namespace;
+    }				
+
+    public String getDefaultFieldName()
+    {
+        return this.defaultFieldName;
+    }
+
+    public void setDefaultFieldName(String defaultFieldName)
+    {
+        this.defaultFieldName = defaultFieldName;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "RestRequestDefaultsModel{" + "textAttributes=" + textAttributes + ", defaultFTSOperator='" + defaultFTSOperator + '\'' + ", defaultFTSFieldOperator='"
+            + defaultFTSFieldOperator + '\'' + ", namespace='" + namespace + '\'' + ", defaultFieldName='" + defaultFieldName + '\'' + '}';
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        RestRequestDefaultsModel that = (RestRequestDefaultsModel) o;
+        return Objects.equals(textAttributes, that.textAttributes) && Objects.equals(defaultFTSOperator, that.defaultFTSOperator) && Objects.equals(
+            defaultFTSFieldOperator, that.defaultFTSFieldOperator) && Objects.equals(namespace, that.namespace) && Objects.equals(defaultFieldName, that.defaultFieldName);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(textAttributes, defaultFTSOperator, defaultFTSFieldOperator, namespace, defaultFieldName);
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private List<String> textAttributes;
+        private String defaultFTSOperator;
+        private String defaultFTSFieldOperator;
+        private String namespace;
+        private String defaultFieldName;
+
+        public Builder textAttributes(List<String> textAttributes)
+        {
+            this.textAttributes = textAttributes;
+            return this;
+        }
+
+        public Builder defaultFTSOperator(String defaultFTSOperator)
+        {
+            this.defaultFTSOperator = defaultFTSOperator;
+            return this;
+        }
+
+        public Builder defaultFTSFieldOperator(String defaultFTSFieldOperator)
+        {
+            this.defaultFTSFieldOperator = defaultFTSFieldOperator;
+            return this;
+        }
+
+        public Builder namespace(String namespace)
+        {
+            this.namespace = namespace;
+            return this;
+        }
+
+        public Builder defaultFieldName(String defaultFieldName)
+        {
+            this.defaultFieldName = defaultFieldName;
+            return this;
+        }
+
+        public RestRequestDefaultsModel create()
+        {
+            RestRequestDefaultsModel defaults = new RestRequestDefaultsModel();
+            defaults.setTextAttributes(this.textAttributes);
+            defaults.setDefaultFTSOperator(this.defaultFTSOperator);
+            defaults.setDefaultFTSFieldOperator(this.defaultFTSFieldOperator);
+            defaults.setNamespace(this.namespace);
+            defaults.setDefaultFieldName(this.defaultFieldName);
+
+            return defaults;
+        }
+    }
+}
+ 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestTemplatesModel.java

@@ -0,0 +1,105 @@
+package org.alfresco.rest.search;
+
+import java.util.Objects;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
+ */
+public class RestRequestTemplatesModel extends TestModel implements IRestModel<RestRequestTemplatesModel>
+{
+    @JsonProperty(value = "entry")
+    RestRequestTemplatesModel model;
+
+    @Override
+    public RestRequestTemplatesModel onModel()
+    {
+        return model;
+    }
+
+    private String name;
+
+    private String template;
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getTemplate()
+    {
+        return template;
+    }
+
+    public void setTemplate(String template)
+    {
+        this.template = template;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "RestRequestTemplatesModel{" + "name='" + name + '\'' + ", template='" + template + '\'' + '}';
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        RestRequestTemplatesModel that = (RestRequestTemplatesModel) o;
+        return Objects.equals(name, that.name) && Objects.equals(template, that.template);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, template);
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private String name;
+        private String template;
+
+        public Builder name(String name)
+        {
+            this.name = name;
+            return this;
+        }
+
+        public Builder template(String template)
+        {
+            this.template = template;
+            return this;
+        }
+
+        public RestRequestTemplatesModel create()
+        {
+            RestRequestTemplatesModel template = new RestRequestTemplatesModel();
+            template.setName(this.name);
+            template.setTemplate(this.template);
+
+            return template;
+        }
+    }
+}
+ 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java

@@ -43,14 +43,15 @@
  */
 package org.alfresco.rest.search;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.model.RestRequestRangesModel;
 import org.alfresco.rest.model.RestRequestSpellcheckModel;
 import org.alfresco.utility.model.TestModel;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Search Query object.
  * @author msuzuki
@@ -76,6 +77,8 @@ public class SearchRequest extends TestModel
     String facetFormat;
     List<String> include;
     List<SortClause> sort;
+    RestRequestDefaultsModel defaults;
+    List<RestRequestTemplatesModel> templates;
 
     public SearchRequest()
     {
@@ -255,6 +258,26 @@ public class SearchRequest extends TestModel
         this.fields = fields;
     }
 
+    public RestRequestDefaultsModel getDefaults()
+    {
+        return defaults;
+    }
+
+    public void setDefaults(RestRequestDefaultsModel defaults)
+    {
+        this.defaults = defaults;
+    }
+
+    public List<RestRequestTemplatesModel> getTemplates()
+    {
+        return templates;
+    }
+
+    public void setTemplates(List<RestRequestTemplatesModel> templates)
+    {
+        this.templates = templates;
+    }
+
     public List<SortClause> getSort()
     {
         if (sort == null)

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -30,10 +30,6 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-trashcan-cleaner</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco.services</groupId>
-            <artifactId>alfresco-messaging-repo</artifactId>
-        </dependency>
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
@@ -63,9 +59,8 @@
         </dependency>
         <!-- 'provided' dependencies, not packaged in war -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <!-- Test dependencies -->
         <dependency>

packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.web.app;
 
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java

@@ -30,9 +30,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.surf.util.URLDecoder;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.StringTokenizer;
 
@@ -66,7 +66,7 @@ public class DownloadContentServlet extends HttpServlet
    private static final String URL_DIRECT_LONG = "direct";
 
    /**
-    * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
+    * @see jakarta.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
     */
    protected void doGet(final HttpServletRequest req, final HttpServletResponse res)
       throws IOException

pom.xml

@@ -2,7 +2,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>23.1.0.116</version>
+    <version>23.1.0.155-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -45,50 +45,51 @@
 
         <dir.root>${project.build.directory}/alf_data</dir.root>
 
-        <dependency.alfresco-hb-data-sender.version>1.1.0</dependency.alfresco-hb-data-sender.version>
-        <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
-        <dependency.alfresco-jlan.version>7.4</dependency.alfresco-jlan.version>
+        <dependency.alfresco-hb-data-sender.version>1.1.1</dependency.alfresco-hb-data-sender.version>
+        <dependency.alfresco-trashcan-cleaner.version>2.4.2</dependency.alfresco-trashcan-cleaner.version>
+        <dependency.alfresco-jlan.version>7.5</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.21</dependency.alfresco-messaging-repo.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>2.2.0-A1</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>3.2.0-A1</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-greenmail.version>6.8</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.21</dependency.acs-event-model.version>
+        <dependency.alfresco-transform-service.version>3.0.0</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>4.0.0</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-greenmail.version>6.10-SNAPSHOT</dependency.alfresco-greenmail.version>
+        <dependency.acs-event-model.version>0.0.22</dependency.acs-event-model.version>
 
-        <dependency.spring.version>5.3.27</dependency.spring.version>
+        <dependency.spring.version>6.0.9</dependency.spring.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.15.1</dependency.jackson.version>
-        <dependency.cxf.version>3.5.5</dependency.cxf.version>
-        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.40</dependency.webscripts.version>
+        <dependency.cxf.version>4.0.2</dependency.cxf.version>
+        <dependency.opencmis.version>1.0.0-jakarta</dependency.opencmis.version>
+        <dependency.webscripts.version>8.43-SNAPSHOT</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
         <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
         <dependency.assertj.version>3.24.2</dependency.assertj.version>
-        <dependency.org-json.version>20230227</dependency.org-json.version>
+        <dependency.org-json.version>20230618</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
         <dependency.gson.version>2.8.9</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
+        <dependency.httpcomponents-httpclient5.version>5.2.1</dependency.httpcomponents-httpclient5.version>
+        <dependency.httpcomponents-httpcore5.version>5.2.1</dependency.httpcomponents-httpcore5.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
         <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
         <dependency.log4j.version>2.20.0</dependency.log4j.version>
-        <dependency.gytheio.version>0.18</dependency.gytheio.version>
+        <dependency.gytheio.version>0.20.0-A1</dependency.gytheio.version>
         <dependency.groovy.version>3.0.17</dependency.groovy.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>5.8.3</dependency.spring-security.version>
+        <dependency.spring-security.version>6.1.0</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.2.2</dependency.poi.version>
         <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.20.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
+        <dependency.camel.version>4.0.0-M3</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
         <dependency.netty.version>4.1.87.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
         <dependency.netty.qpid.version>4.1.82.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
         <dependency.netty-tcnative.version>2.0.56.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
-        <dependency.activemq.version>5.17.4</dependency.activemq.version>
+        <dependency.activemq.version>5.18.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.23.0</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
@@ -97,23 +98,27 @@
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
+        <dependency.pooled-jms.version>3.1.0</dependency.pooled-jms.version>
 
-        <dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version>
-        <dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version>
-        <dependency.jakarta-soap-api.version>1.4.2</dependency.jakarta-soap-api.version>
-        <dependency.jakarta-activation-api.version>1.2.2</dependency.jakarta-activation-api.version>
+        <dependency.jakarta-ee-jaxb-api.version>3.0.1</dependency.jakarta-ee-jaxb-api.version>
+        <dependency.java-ee-jaxb-api.version>2.3.3</dependency.java-ee-jaxb-api.version>
+        <dependency.jakarta-ws-api.version>3.0.1</dependency.jakarta-ws-api.version>
+        <dependency.jakarta-soap-api.version>2.0.1</dependency.jakarta-soap-api.version>
         <dependency.jakarta-annotation-api.version>2.1.1</dependency.jakarta-annotation-api.version>
         <dependency.jakarta-transaction-api.version>1.3.3</dependency.jakarta-transaction-api.version>
-        <dependency.jakarta-jws-api.version>2.1.0</dependency.jakarta-jws-api.version>
-        <dependency.jakarta-mail-api.version>1.6.5</dependency.jakarta-mail-api.version>
+        <dependency.jakarta-jws-api.version>3.0.0</dependency.jakarta-jws-api.version>
+        <dependency.jakarta-ee-mail.version>2.0.1</dependency.jakarta-ee-mail.version>
+        <dependency.jakarta-ee-activation.version>2.0.1</dependency.jakarta-ee-activation.version>
+        <dependency.jakarta-ee-jms.version>3.0.0</dependency.jakarta-ee-jms.version>
+        <dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
         <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
         <dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
         <dependency.json-smart.version>2.4.11</dependency.json-smart.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.4.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.googledrive.version>3.4.1</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.6.1-A2-SNAPSHOT</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.0.1</license-maven-plugin.version>
@@ -122,9 +127,9 @@
         <dependency.mysql.version>8.0.30</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
-        <dependency.tas-utility.version>4.0.3</dependency.tas-utility.version>
-        <dependency.rest-assured.version>5.3.0</dependency.rest-assured.version>
-        <dependency.tas-email.version>1.21</dependency.tas-email.version>
+        <dependency.tas-utility.version>4.0.4-SNAPSHOT</dependency.tas-utility.version>
+        <dependency.rest-assured.version>5.3.1</dependency.rest-assured.version>
+        <dependency.tas-email.version>1.23-SNAPSHOT</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.16</dependency.tas-webdav.version>
         <dependency.tas-ftp.version>1.17</dependency.tas-ftp.version>
         <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>
@@ -150,7 +155,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.1.0.116</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -170,12 +175,12 @@
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>${dependency.jakarta-jaxb-api.version}</version>
+                <version>${dependency.jakarta-ee-jaxb-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
-                <version>${dependency.jakarta-jaxb-api.version}</version>
+                <version>${dependency.jakarta-ee-jaxb-api.version}</version>
             </dependency>
 
             <dependency>
@@ -190,17 +195,6 @@
                 <version>${dependency.jakarta-soap-api.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>jakarta.activation</groupId>
-                <artifactId>jakarta.activation-api</artifactId>
-                <version>${dependency.jakarta-activation-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.activation</groupId>
-                <artifactId>jakarta.activation</artifactId>
-                <version>${dependency.jakarta-activation-api.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.annotation</groupId>
                 <artifactId>jakarta.annotation-api</artifactId>
@@ -219,15 +213,51 @@
                 <version>${dependency.jakarta-jws-api.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>jakarta.mail</groupId>
-                <artifactId>jakarta.mail-api</artifactId>
-                <version>${dependency.jakarta-mail-api.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.sun.mail</groupId>-->
+<!--                <artifactId>javax.mail</artifactId>-->
+<!--                <version>${dependency.java-ee-mail.version}</version>-->
+<!--            </dependency>-->
+
             <dependency>
                 <groupId>com.sun.mail</groupId>
                 <artifactId>jakarta.mail</artifactId>
-                <version>${dependency.jakarta-mail-api.version}</version>
+                <version>${dependency.jakarta-ee-mail.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>${dependency.jakarta-ee-mail.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.activation</groupId>
+                <artifactId>jakarta.activation</artifactId>
+                <version>${dependency.jakarta-ee-activation.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${dependency.jakarta-ee-activation.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>javax.activation-api</artifactId>
+                <version>${dependency.java-ee-activation.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.jms</groupId>
+                <artifactId>jakarta.jms-api</artifactId>
+                <version>${dependency.jakarta-ee-jms.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.messaginghub</groupId>
+                <artifactId>pooled-jms</artifactId>
+                <version>${dependency.pooled-jms.version}</version>
             </dependency>
 
             <dependency>
@@ -263,6 +293,33 @@
                 <version>${dependency.jakarta-rpc-api.version}</version>
             </dependency>
 
+            <!--CMIS-->
+            <dependency>
+                <groupId>org.apache.chemistry.opencmis</groupId>
+                <artifactId>chemistry-opencmis-client-api</artifactId>
+                <version>${dependency.opencmis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.chemistry.opencmis</groupId>
+                <artifactId>chemistry-opencmis-client-bindings</artifactId>
+                <version>${dependency.opencmis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.chemistry.opencmis</groupId>
+                <artifactId>chemistry-opencmis-client-impl</artifactId>
+                <version>${dependency.opencmis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.chemistry.opencmis</groupId>
+                <artifactId>chemistry-opencmis-commons-api</artifactId>
+                <version>${dependency.opencmis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.chemistry.opencmis</groupId>
+                <artifactId>chemistry-opencmis-commons-impl</artifactId>
+                <version>${dependency.opencmis.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-jlan-embed</artifactId>
@@ -297,17 +354,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.alfresco.services</groupId>
-                <artifactId>alfresco-messaging-repo</artifactId>
-                <version>${dependency.alfresco-messaging-repo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-broker</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-server-root</artifactId>
@@ -358,6 +404,16 @@
                 <artifactId>commons-httpclient</artifactId>
                 <version>${dependency.commons-httpclient.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${dependency.httpcomponents-httpclient5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5</artifactId>
+                <version>${dependency.httpcomponents-httpcore5.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -397,7 +453,7 @@
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
-                <version>1.5</version>
+                <version>1.5-jakarta</version>
             </dependency>
 
             <dependency>
@@ -746,9 +802,16 @@
 
             <!-- provided dependencies -->
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.0.1</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>6.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.servlet.jsp</groupId>
+                <artifactId>jakarta.servlet.jsp-api</artifactId>
+                <version>3.1.1</version>
+                <scope>provided</scope>
             </dependency>
 
             <!-- Test only dependencies, as popped up while running mvn test -->
@@ -803,22 +866,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-activemq</artifactId>
-                <version>${dependency.camel.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-broker</artifactId>
-                    </exclusion>
-                    <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jta_1.1_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <!--  If you are going to bump dependency.camel.version, please check if the netty-codec-http has higher version that the one above.-->
                 <groupId>org.apache.camel</groupId>
@@ -837,11 +884,6 @@
                 <artifactId>camel-jackson</artifactId>
                 <version>${dependency.camel.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-directvm</artifactId>
-                <version>${dependency.camel.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-direct</artifactId>
@@ -936,7 +978,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.42.1</version>
+                    <version>0.43.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -1015,6 +1057,11 @@
                         <skipDeploy>true</skipDeploy>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven3-plugin</artifactId>
+                    <version>1.10.7</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.116</version>
+        <version>23.1.0.155-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -36,9 +36,12 @@
             <artifactId>jackson-annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -59,22 +62,8 @@
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-test-tck</artifactId>
             <version>${dependency.opencmis.version}</version>
-            <exclusions>
-                <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
-                <exclusion>
-                  <groupId>org.apache.geronimo.specs</groupId>
-                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </exclusion>
-                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
-            <!-- <scope>test</scope> -->
+            <scope>test</scope>
         </dependency>
-        <!-- the cxf libs were updated, see dependencyManagement section -->
-
 
         <!-- Test dependencies -->
         <dependency>
@@ -130,7 +119,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>10.0.14</version>
+            <version>11.0.15</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -142,35 +131,24 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>10.0.11</version>
+            <version>11.0.15</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>10.0.11</version>
+            <version>11.0.15</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
             <scope>test</scope>
             <exclusions>
-              <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
                 <exclusion>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-              </exclusion>
-              <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
-              <exclusion>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-              </exclusion>
-              <!-- MNT-20557: Excluding javax.annotation:javax.annotation-api, jakarta.annotation:jakarta.annotation-api will be used instead -->
-              <exclusion>
-                  <groupId>javax.annotation</groupId>
-                  <artifactId>javax.annotation-api</artifactId>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.alfresco.repo.tenant.TenantUtil;

remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;

remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 

remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet;

remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java

@@ -25,31 +25,14 @@
  */
 package org.alfresco.opencmis;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -70,10 +53,9 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime
  * Wraps an OpenCMIS HttpServletRequest, mapping urls and adding servlet attributes specific to the Alfresco implementation of OpenCMIS.
  */
 @SuppressWarnings("rawtypes")
-public class CMISHttpServletRequest implements HttpServletRequest
+public class CMISHttpServletRequest extends HttpServletRequestWrapper
 {
 	protected WebScriptRequest req;
-	protected HttpServletRequest httpReq;
 	protected String networkId;
 	protected String operation;
 	protected String id; // object id (or path for browser binding)
@@ -85,6 +67,7 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	public CMISHttpServletRequest(WebScriptRequest req, String serviceName, BaseUrlGenerator baseUrlGenerator, Binding binding, Descriptor currentDescriptor,
 	        TenantAdminService tenantAdminService)
 	{
+		super(WebScriptServletRuntime.getHttpServletRequest(req));
 		this.req = req;
 		this.serviceName = serviceName;
 		this.baseUrlGenerator = baseUrlGenerator;
@@ -119,14 +102,18 @@ public class CMISHttpServletRequest implements HttpServletRequest
 		Match match = req.getServiceMatch();
 		Map<String, String> templateVars = match.getTemplateVars();
 
-        HttpServletRequest httpReq = WebScriptServletRuntime.getHttpServletRequest(req);
-		this.httpReq = httpReq;
 		this.operation = templateVars.get("operation");
 		this.id = templateVars.get("id");
 
     	addAttributes();
 	}
 
+	@Override
+	public HttpServletRequest getRequest()
+	{
+		return (HttpServletRequest) super.getRequest();
+	}
+	
 	/*
 	 * Recursively unwrap req if it is a WrappingWebScriptRequest
 	 */
@@ -145,9 +132,9 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	{
 		if(networkId != null)
 		{
-			httpReq.setAttribute(Constants.PARAM_REPOSITORY_ID, networkId);
+			super.setAttribute(Constants.PARAM_REPOSITORY_ID, networkId);
 		}
-		httpReq.setAttribute("serviceName", serviceName);
+		super.setAttribute("serviceName", serviceName);
 	}
 
 	@Override
@@ -155,11 +142,11 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	{
 		if(arg0.equals(Dispatcher.BASE_URL_ATTRIBUTE))
 		{
-			return baseUrlGenerator.getBaseUrl(this, networkId, binding);
+			return baseUrlGenerator.getBaseUrl(getRequest(), networkId, binding);
 		}
 		else
 		{
-			return httpReq.getAttribute(arg0);
+			return super.getAttribute(arg0);
 		}
 	}
 
@@ -167,7 +154,7 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	@Override
 	public Enumeration getAttributeNames()
 	{
-		Enumeration e = httpReq.getAttributeNames();
+		Enumeration e = super.getAttributeNames();
 		List attrNames = new ArrayList();
 		while(e.hasMoreElements())
 		{
@@ -190,60 +177,6 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	    };
 	}
 
-	@Override
-	public String getCharacterEncoding()
-	{
-		return httpReq.getCharacterEncoding();
-	}
-
-	@Override
-	public int getContentLength()
-	{
-		return httpReq.getContentLength();
-	}
-
-	@Override
-	public String getContentType()
-	{
-		return httpReq.getContentType();
-	}
-
-	@Override
-	public ServletInputStream getInputStream() throws IOException
-	{
-		return httpReq.getInputStream();
-	}
-
-	@Override
-	public String getLocalAddr()
-	{
-		return httpReq.getLocalAddr();
-	}
-
-	@Override
-	public String getLocalName()
-	{
-		return httpReq.getLocalName();
-	}
-
-	@Override
-	public int getLocalPort()
-	{
-		return httpReq.getLocalPort();
-	}
-	
-	@Override
-	public Locale getLocale()
-	{
-		return httpReq.getLocale();
-	}
-
-	@Override
-	public Enumeration getLocales()
-	{
-		return httpReq.getLocales();
-	}
-
 	@Override
 	public String getParameter(String arg0)
 	{
@@ -251,14 +184,14 @@ public class CMISHttpServletRequest implements HttpServletRequest
 		{
 			return networkId;
 		}
-		return httpReq.getParameter(arg0);
+		return super.getParameter(arg0);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public Map getParameterMap()
 	{
-		Map map = httpReq.getParameterMap();
+		Map map = super.getParameterMap();
 		Map ret = new HashedMap(map);
 		if(networkId != null)
 		{
@@ -271,7 +204,7 @@ public class CMISHttpServletRequest implements HttpServletRequest
 	@Override
 	public Enumeration getParameterNames()
 	{
-		final Enumeration e = httpReq.getParameterNames();
+		final Enumeration e = super.getParameterNames();
 		List l = new ArrayList();
 		while(e.hasMoreElements())
 		{
@@ -300,152 +233,13 @@ public class CMISHttpServletRequest implements HttpServletRequest
 		return ret;
 	}
 
-	@Override
-	public String[] getParameterValues(String arg0)
-	{
-		return httpReq.getParameterValues(arg0);
-	}
-
-	@Override
-	public String getProtocol()
-	{
-		return httpReq.getProtocol();
-	}
-
-	@Override
-	public BufferedReader getReader() throws IOException
-	{
-		return httpReq.getReader();
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public String getRealPath(String arg0)
-	{
-		return httpReq.getRealPath(arg0);
-	}
-
-	@Override
-	public String getRemoteAddr()
-	{
-		return httpReq.getRemoteAddr();
-	}
-
-	@Override
-	public String getRemoteHost()
-	{
-		return httpReq.getRemoteHost();
-	}
-
-	@Override
-	public int getRemotePort()
-	{
-		return httpReq.getRemotePort();
-	}
-
-	@Override
-	public RequestDispatcher getRequestDispatcher(String arg0)
-	{
-		return httpReq.getRequestDispatcher(arg0);
-	}
-
-	@Override
-	public String getScheme()
-	{
-		return httpReq.getScheme();
-	}
-
-	@Override
-	public String getServerName() 
-	{
-		return httpReq.getServerName();
-	}
-
-	@Override
-	public int getServerPort()
-	{
-		return httpReq.getServerPort();
-	}
-
-	@Override
-	public boolean isSecure()
-	{
-		return httpReq.isSecure();
-	}
-
-	@Override
-	public void removeAttribute(String arg0)
-	{
-		httpReq.removeAttribute(arg0);
-	}
-
-	@Override
-	public void setAttribute(String arg0, Object arg1)
-	{
-		httpReq.setAttribute(arg0, arg1);
-	}
-
-	@Override
-	public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
-	{
-		httpReq.setCharacterEncoding(arg0);
-	}
-
-	@Override
-	public String getAuthType()
-	{
-		return httpReq.getAuthType();
-	}
-
 	@Override
 	public String getContextPath()
 	{
-		String contextPath = baseUrlGenerator.getContextPath(httpReq);
+		String contextPath = baseUrlGenerator.getContextPath(getRequest());
 		return contextPath;
 	}
 
-	@Override
-	public Cookie[] getCookies()
-	{
-		return httpReq.getCookies();
-	}
-
-	@Override
-	public long getDateHeader(String arg0)
-	{
-		return httpReq.getDateHeader(arg0);
-	}
-
-	@Override
-	public String getHeader(String arg0)
-	{
-		return httpReq.getHeader(arg0);
-	}
-
-	@Override
-	public Enumeration getHeaderNames()
-	{
-		return httpReq.getHeaderNames();
-	}
-
-	@Override
-	public Enumeration getHeaders(String arg0)
-	{
-		return httpReq.getHeaders(arg0);
-	}
-
-	@Override
-	public int getIntHeader(String arg0)
-	{
-		return httpReq.getIntHeader(arg0);
-	}
-
-	@Override
-	public String getMethod()
-	{
-		return httpReq.getMethod();
-	}
-
 	@Override
 	public String getPathInfo()
 	{
@@ -459,17 +253,11 @@ public class CMISHttpServletRequest implements HttpServletRequest
 		return sb.toString();
 	}
 
-	@Override
-	public String getPathTranslated()
-	{
-		return httpReq.getPathTranslated();
-	}
-
 	@Override
 	public String getQueryString()
 	{
         StringBuilder queryString = new StringBuilder();
-        String reqQueryString = httpReq.getQueryString();
+        String reqQueryString = super.getQueryString();
 
         if(networkId != null && networkId.length() > 0)
         {
@@ -488,156 +276,17 @@ public class CMISHttpServletRequest implements HttpServletRequest
         return reqQueryString;
 	}
 
-	@Override
-	public String getRemoteUser()
-	{
-		return httpReq.getRemoteUser();
-	}
-
 	@Override
 	public String getRequestURI()
 	{
-		String requestURI = baseUrlGenerator.getRequestURI(httpReq, networkId, operation, id);
+		String requestURI = baseUrlGenerator.getRequestURI(getRequest(), networkId, operation, id);
 		return requestURI;
 	}
 
-	@Override
-	public StringBuffer getRequestURL()
-	{
-		return httpReq.getRequestURL();
-	}
-
-	@Override
-	public String getRequestedSessionId()
-	{
-		return httpReq.getRequestedSessionId();
-	}
-
 	@Override
 	public String getServletPath()
 	{
-		String servletPath = baseUrlGenerator.getServletPath(httpReq);
+		String servletPath = baseUrlGenerator.getServletPath(getRequest());
 		return servletPath;
 	}
-
-	@Override
-	public HttpSession getSession()
-	{
-		return httpReq.getSession();
-	}
-
-	@Override
-	public HttpSession getSession(boolean arg0)
-	{
-		return httpReq.getSession(arg0);
-	}
-
-	@Override
-	public Principal getUserPrincipal()
-	{
-		return httpReq.getUserPrincipal();
-	}
-
-	@Override
-	public boolean isRequestedSessionIdFromCookie()
-	{
-		return httpReq.isRequestedSessionIdFromCookie();
-	}
-
-	@Override
-	public boolean isRequestedSessionIdFromURL()
-	{
-		return httpReq.isRequestedSessionIdFromURL();
-	}
-
-	@Override
-	public boolean isRequestedSessionIdFromUrl()
-	{
-		return httpReq.isRequestedSessionIdFromURL();
-	}
-	
-	@Override
-	public boolean isRequestedSessionIdValid()
-	{
-		return httpReq.isRequestedSessionIdValid();
-	}
-
-	@Override
-	public boolean isUserInRole(String arg0)
-	{
-		return httpReq.isUserInRole(arg0);
-	}
-
-	@Override
-	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
-	{
-		return httpReq.authenticate(response);
-	}
-
-	@Override
-	public void login(String username, String password) throws ServletException
-	{
-		httpReq.login(username, password);
-	}
-
-	@Override
-	public void logout() throws ServletException
-	{
-		httpReq.logout();
-	}
-
-	@Override
-	public Collection<Part> getParts() throws IOException, ServletException
-	{
-		return httpReq.getParts();
-	}
-
-	@Override
-	public Part getPart(String name) throws IOException, ServletException
-	{
-		return httpReq.getPart(name);
-	}
-
-	@Override
-	public ServletContext getServletContext()
-	{
-		return httpReq.getServletContext();
-	}
-
-	@Override
-	public AsyncContext startAsync() throws IllegalStateException
-	{
-		return httpReq.startAsync();
-	}
-
-	@Override
-	public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException
-	{
-		return httpReq.startAsync(servletRequest, servletResponse);
-	}
-
-	@Override
-	public boolean isAsyncStarted()
-	{
-		return httpReq.isAsyncStarted();
-	}
-
-	@Override
-	public boolean isAsyncSupported()
-	{
-		return httpReq.isAsyncSupported();
-	}
-
-	@Override
-	public AsyncContext getAsyncContext()
-	{
-		return httpReq.getAsyncContext();
-	}
-
-	@Override
-	public DispatcherType getDispatcherType()
-	{
-		return httpReq.getDispatcherType();
-	}
-
 }

remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java

@@ -25,18 +25,12 @@
  */
 package org.alfresco.opencmis;
 
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.springframework.extensions.webscripts.WebScriptResponse;
 import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -44,10 +38,8 @@ import java.util.Set;
  * 
  * @author janv
  */
-public class CMISHttpServletResponse implements HttpServletResponse
+public class CMISHttpServletResponse extends HttpServletResponseWrapper
 {
-    protected HttpServletResponse httpResp;
-
     protected Set<String> nonAttachContentTypes = Collections.emptySet(); // pre-configured whitelist, eg. images & pdf
 
     private final static String HDR_CONTENT_DISPOSITION = "Content-Disposition";
@@ -57,90 +49,22 @@ public class CMISHttpServletResponse implements HttpServletResponse
 
 	public CMISHttpServletResponse(WebScriptResponse res, Set<String> nonAttachContentTypes)
 	{
-		httpResp = WebScriptServletRuntime.getHttpServletResponse(res);
+		super(WebScriptServletRuntime.getHttpServletResponse(res));
         this.nonAttachContentTypes = nonAttachContentTypes;
 	}
 
-    @Override
-    public void addCookie(Cookie cookie)
-    {
-        httpResp.addCookie(cookie);
-    }
-
-    @Override
-    public boolean containsHeader(String name)
-    {
-        return httpResp.containsHeader(name);
-    }
-
-    @Override
-    public String encodeURL(String url)
-    {
-        return httpResp.encodeURL(url);
-    }
-
-    @Override
-    public String encodeRedirectURL(String url)
-    {
-        return httpResp.encodeRedirectURL(url);
-    }
-
-    @Override
-    public String encodeUrl(String url)
-    {
-        return encodeUrl(url);
-    }
-
-    @Override
-    public String encodeRedirectUrl(String url)
-    {
-        return httpResp.encodeRedirectUrl(url);
-    }
-
-    @Override
-    public void sendError(int sc, String msg) throws IOException
-    {
-        httpResp.sendError(sc, msg);
-    }
-
-    @Override
-    public void sendError(int sc) throws IOException
-    {
-        httpResp.sendError(sc);
-    }
-
-    @Override
-    public void sendRedirect(String location) throws IOException
-    {
-        httpResp.sendRedirect(location);
-    }
-
-    @Override
-    public void setDateHeader(String name, long date)
-    {
-        httpResp.setDateHeader(name, date);
-    }
-
-    @Override
-    public void addDateHeader(String name, long date)
-    {
-        httpResp.addDateHeader(name, date);
-    }
-
     @Override
     public void setHeader(String name, String value)
     {
-        httpResp.setHeader(name, getStringHeaderValue(name, value, httpResp.getContentType()));
+        super.setHeader(name, getStringHeaderValue(name, value, super.getContentType()));
     }
 
     @Override
     public void addHeader(String name, String value)
     {
-        httpResp.addHeader(name, getStringHeaderValue(name, value, httpResp.getContentType()));
+        super.addHeader(name, getStringHeaderValue(name, value, super.getContentType()));
     }
 
-    
-
     private String getStringHeaderValue(String name, String value, String contentType)
     {
         if (HDR_CONTENT_DISPOSITION.equals(name))
@@ -161,142 +85,4 @@ public class CMISHttpServletResponse implements HttpServletResponse
 
         return value;
     }
-
-    @Override
-    public void setIntHeader(String name, int value)
-    {
-        httpResp.setIntHeader(name, value);
-    }
-
-    @Override
-    public void addIntHeader(String name, int value)
-    {
-        httpResp.addIntHeader(name, value);
-    }
-
-    @Override
-    public void setStatus(int sc)
-    {
-        httpResp.setStatus(sc);
-    }
-
-    @Override
-    public void setStatus(int sc, String sm)
-    {
-        httpResp.setStatus(sc, sm);
-    }
-
-    @Override
-    public int getStatus()
-    {
-        return httpResp.getStatus();
-    }
-
-    @Override
-    public String getHeader(String name)
-    {
-        return httpResp.getHeader(name);
-    }
-
-    @Override
-    public Collection<String> getHeaders(String name)
-    {
-        return httpResp.getHeaders(name);
-    }
-
-    @Override
-    public Collection<String> getHeaderNames()
-    {
-        return httpResp.getHeaderNames();
-    }
-
-    @Override
-    public String getCharacterEncoding()
-    {
-        return httpResp.getCharacterEncoding();
-    }
-
-    @Override
-    public String getContentType()
-    {
-        return httpResp.getContentType();
-    }
-
-    @Override
-    public ServletOutputStream getOutputStream() throws IOException
-    {
-        return httpResp.getOutputStream();
-    }
-
-    @Override
-    public PrintWriter getWriter() throws IOException
-    {
-        return httpResp.getWriter();
-    }
-
-    @Override
-    public void setCharacterEncoding(String charset)
-    {
-        httpResp.setCharacterEncoding(charset);
-    }
-
-    @Override
-    public void setContentLength(int len)
-    {
-        httpResp.setContentLength(len);
-    }
-
-    @Override
-    public void setContentType(String type)
-    {
-        httpResp.setContentType(type);
-    }
-
-    @Override
-    public void setBufferSize(int size)
-    {
-        httpResp.setBufferSize(size);
-    }
-
-    @Override
-    public int getBufferSize()
-    {
-        return httpResp.getBufferSize();
-    }
-
-    @Override
-    public void flushBuffer() throws IOException
-    {
-        httpResp.flushBuffer();
-    }
-
-    @Override
-    public void resetBuffer()
-    {
-        httpResp.resetBuffer();
-    }
-
-    @Override
-    public boolean isCommitted()
-    {
-        return httpResp.isCommitted();
-    }
-
-    @Override
-    public void reset()
-    {
-        httpResp.reset();
-    }
-
-    @Override
-    public void setLocale(Locale loc)
-    {
-        httpResp.setLocale(loc);
-    }
-
-    @Override
-    public Locale getLocale()
-    {
-        return httpResp.getLocale();
-    }
 }

remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java

@@ -38,18 +38,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.http.HttpServlet;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
@@ -306,6 +307,8 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 		@Override
 		public ServletContext getServletContext()
 		{
+
+
 			return new ServletContext()
 			{
 
@@ -423,12 +426,6 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 					return null;
 				}
 
-				@Override
-				public Servlet getServlet(String arg0) throws ServletException
-				{
-					return null;
-				}
-
 				@Override
 				public String getServletContextName()
 				{
@@ -453,6 +450,12 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 					return null;
 				}
 
+				@Override
+				public Dynamic addJspFile(String servletName, String jspFile)
+				{
+					return null;
+				}
+
 				@Override
 				public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
 				{
@@ -574,27 +577,52 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 				}
 
 				@Override
-				public Enumeration getServletNames()
+				public String getVirtualServerName()
 				{
 					return null;
 				}
 
 				@Override
-				public Enumeration getServlets()
+				public int getSessionTimeout()
+				{
+					return 0;
+				}
+
+				@Override
+				public void setSessionTimeout(int sessionTimeout)
+				{
+
+				}
+
+				@Override
+				public String getRequestCharacterEncoding()
 				{
 					return null;
 				}
 
+				@Override
+				public void setRequestCharacterEncoding(String encoding)
+				{
+
+				}
+
+				@Override
+				public String getResponseCharacterEncoding()
+				{
+					return null;
+				}
+
+				@Override
+				public void setResponseCharacterEncoding(String encoding)
+				{
+
+				}
+
 				@Override
 				public void log(String arg0)
 				{
 				}
 
-				@Override
-				public void log(Exception arg0, String arg1)
-				{
-				}
-
 				@Override
 				public void log(String arg0, Throwable arg1)
 				{

remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port

remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.alfresco.repo.tenant.TenantUtil;

remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 

remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port

remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java

@@ -55,12 +55,12 @@ public class PublicApiCMISHttpServletRequest extends CMISHttpServletRequest
 
 		if(apiScope != null)
 		{
-			httpReq.setAttribute("apiScope", apiScope);
+			setAttribute("apiScope", apiScope);
 		}
 
 		if(apiVersion != null)
 		{
-			httpReq.setAttribute("apiVersion", apiVersion);
+			setAttribute("apiVersion", apiVersion);
 		}
 	}
 

remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 

remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java

@@ -25,7 +25,7 @@
  */
 package org.alfresco.opencmis;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.repo.admin.SysAdminParams;