Scope provided for spring dependency

.github/workflows/ci.yml

@@ -83,6 +83,12 @@ jobs:
           - name: "26.1 Community Java 21"
             java-version: 21
             suite: -Pcommunity-261-tests
+          - name: "25.4 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-254-tests
+          - name: "25.4 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-254-tests
           - name: "25.2 Enterprise Java 17"
             java-version: 17
             suite: -Penterprise-252-tests

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.15.0</version>
+    <version>4.16.0-A2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

@@ -5,8 +5,8 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>AIO - SDK 4.15.0</name>
-    <description>All-In-One (AIO) project for SDK 4.15.0</description>
+    <name>AIO - SDK 4.16.0-A2</name>
+    <description>All-In-One (AIO) project for SDK 4.16.0-A2</description>
     <packaging>pom</packaging>
 
     <prerequisites>

archetypes/alfresco-platform-jar-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.15.0</version>
+    <version>4.16.0-A2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/alfresco-share-jar-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.15.0</version>
+        <version>4.16.0-A2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

archetypes/archetypes-it/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.15.0</version>
+        <version>4.16.0-A2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/alfresco-rad/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.15.0</version>
+        <version>4.16.0-A2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -38,13 +38,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Access to JUnit runner classes -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
             <scope>compile</scope>
         </dependency>
 

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.15.0</version>
+        <version>4.16.0-A2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.15.0</version>
+    <version>4.16.0-A2</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
@@ -290,6 +290,32 @@
             </properties>
         </profile>
 
+        <!-- 25.4 -->
+        <profile>
+            <id>community-254-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.4.0-A.10</alfresco.platform.version>
+                <alfresco.share.docker.version>25.4.0-A.10</alfresco.share.docker.version>
+                <alfresco.share.version>25.4.0.53</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-254-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.4.0-A.10</alfresco.platform.version>
+                <alfresco.share.docker.version>25.4.0-A.10</alfresco.share.docker.version>
+                <alfresco.share.version>25.4.0.53</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
         <!-- 26.1 -->
         <profile>
             <id>community-261-tests</id>