Merge branch 'develop-acs25' into stable-acs25

This commit is contained in:
2026-04-22 12:16:16 -04:00
+50 -23
View File
@@ -46,31 +46,31 @@
<alfresco.platform.version>25.1.0</alfresco.platform.version> <alfresco.platform.version>25.1.0</alfresco.platform.version>
<jersey.version>3.1.8</jersey.version> <jersey.version>4.0.2</jersey.version>
<cxf.version>4.0.2</cxf.version> <cxf.version>4.1.5</cxf.version>
<jackson.version>2.17.2</jackson.version> <jackson.version>2.21.2</jackson.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.6.11</version> <version>1.6.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger.core.v3</groupId> <groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>2.2.11</version> <version>2.2.43</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.activation</groupId> <groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId> <artifactId>jakarta.activation-api</artifactId>
<version>2.1.3</version> <version>2.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>2.0.7</version> <version>2.0.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
@@ -80,7 +80,7 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version> <version>4.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.module</groupId> <groupId>com.fasterxml.jackson.module</groupId>
@@ -102,10 +102,42 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.5.0</version> <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.10.0</version>
</plugin>
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
<version>3.0.68</version>
</plugin>
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId>
<version>1.0.7</version>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.12.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
@@ -120,7 +152,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<executions> <executions>
<execution> <execution>
<id>download-api-explorer</id> <id>download-api-explorer</id>
@@ -136,7 +167,6 @@
<plugin> <plugin>
<groupId>io.swagger.codegen.v3</groupId> <groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId> <artifactId>swagger-codegen-maven-plugin</artifactId>
<version>3.0.61</version>
<configuration> <configuration>
<language>jaxrs-cxf-client</language> <language>jaxrs-cxf-client</language>
<configOptions> <configOptions>
@@ -218,7 +248,6 @@
<plugin> <plugin>
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId> <artifactId>regex-maven-plugin</artifactId>
<version>1.0.6</version>
<executions> <executions>
<execution> <execution>
<id>fix-baseUrl</id> <id>fix-baseUrl</id>
@@ -323,7 +352,6 @@
<plugin> <plugin>
<groupId>net.revelc.code</groupId> <groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId> <artifactId>impsort-maven-plugin</artifactId>
<version>1.9.0</version>
<executions> <executions>
<execution> <execution>
<id>organize-imports</id> <id>organize-imports</id>
@@ -344,7 +372,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
<executions> <executions>
<execution> <execution>
<id>add-gensrc</id> <id>add-gensrc</id>
@@ -365,7 +392,7 @@
<profiles> <profiles>
<profile> <profile>
<id>ossrh-release</id> <id>central-publish</id>
<properties> <properties>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
@@ -383,7 +410,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<executions> <executions>
<execution> <execution>
<id>javadoc</id> <id>javadoc</id>
@@ -407,19 +433,20 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.central</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>central-publishing-maven-plugin</artifactId>
<version>1.6.13</version> <version>0.10.0</version>
<extensions>true</extensions>
<configuration> <configuration>
<serverId>ossrh</serverId> <publishingServerId>central</publishingServerId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> <autoPublish>true</autoPublish>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration> </configuration>
<!-- for some reason this is required... -->
<executions> <executions>
<execution> <execution>
<id>ossrh-deploy</id> <id>deploy</id>
<phase>deploy</phase> <phase>deploy</phase>
<goals><goal>deploy</goal></goals> <goals><goal>publish</goal></goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>