#214: Handle javax.servlet vs. jakarta.servlet use

OrderOfTheBee · Feb 19, 2024 · 2099800 · 2099800
1 parent 5458db2
commit 2099800
Show file tree

Hide file tree

Showing 20 changed files with 1,316 additions and 502 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.orderofthebee.support-tools</groupId>
     <artifactId>support-tools-parent</artifactId>
-    <version>1.2.1.0</version>
+    <version>1.2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>OOTBee Support Tools - Parent</name>
@@ -702,5 +702,28 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>acs-docker-23.1</id>
+
+            <properties>
+                <alfresco.docker.platform.version>23.1.0</alfresco.docker.platform.version>
+                <alfresco.docker.share.version>23.1.0</alfresco.docker.share.version>
+                <docker.acs.dockerfile>DockerfileWithBuildUser</docker.acs.dockerfile>
+                <docker.acs.opts>-Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding -Dencryption.keyAlgorithm=DESede -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.password=oKIWzVdEdA -Dmetadata-keystore.metadata.algorithm=DESede -Dsolr.secureComms=secret -Dsolr.sharedSecret=secret -Dalfresco.restApi.basicAuthScheme=true</docker.acs.opts>
+                <alfresco.search.version>2.0.8.2</alfresco.search.version>
+                <docker.search.opts>-Dalfresco.secureComms=secret -Dalfresco.secureComms.secret=secret</docker.search.opts>
+            </properties>
+
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-broker</artifactId>
+                        <version>5.18.3</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
 </project>
diff --git a/repository/pom.xml b/repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.orderofthebee.support-tools</groupId>
         <artifactId>support-tools-parent</artifactId>
-        <version>1.2.1.0</version>
+        <version>1.2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>support-tools-repo</artifactId>

diff --git a/share/pom.xml b/share/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.orderofthebee.support-tools</groupId>
         <artifactId>support-tools-parent</artifactId>
-        <version>1.2.1.0</version>
+        <version>1.2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>support-tools-share</artifactId>
@@ -42,6 +42,14 @@
                 <version>3.0.1</version>
                 <scope>provided</scope>
             </dependency>
+
+            <!-- used since ACS 23.1 -->
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>5.0.0</version>
+                <scope>provided</scope>
+            </dependency>
 
             <!-- no longer provided via Alfresco BOM -->
             <dependency>
@@ -79,6 +87,11 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>