Merge branch 'develop-acs25' into develop-acs26

Merge branch 'develop-acs23' into develop-acs25
Merge branch 'develop-acs7' into develop-acs23
2026-06-02 13:06:26 -04:00 · 2026-06-02 13:06:17 -04:00 · 2026-06-02 13:06:04 -04:00 · 2026-06-02 13:05:50 -04:00 · 2026-04-22 12:13:48 -04:00
1 changed files with 2 additions and 2 deletions
@@ -44,7 +44,7 @@

 		<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
 		
-		<alfresco.platform.version>25.1.0</alfresco.platform.version>
+		<alfresco.platform.version>26.1.0</alfresco.platform.version>

 		<jersey.version>4.0.2</jersey.version>
 		<cxf.version>4.1.5</cxf.version>
@@ -84,7 +84,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
Author	SHA1	Message	Date
brian.long	3e0019a9c3	Merge branch 'develop-acs25' into develop-acs26	2026-06-02 13:06:26 -04:00
brian.long	88579b62f2	Merge branch 'develop-acs23' into develop-acs25	2026-06-02 13:06:17 -04:00
brian.long	cfaebfdc35	Merge branch 'develop-acs7' into develop-acs23	2026-06-02 13:06:04 -04:00
brian.long	bd5e8192c4	jakarta-module jaxb to jakarta	2026-06-02 13:05:50 -04:00
brian.long	8398cf7a02	acs v26.1.0	2026-04-22 12:13:48 -04:00