Merge branch 'develop-acs7' into stable-acs7

This commit is contained in:
Brian Long 2023-05-28 12:15:22 -04:00
commit b835a9c145

View File

@ -46,8 +46,9 @@
<alfresco.platform.version>7.0.0</alfresco.platform.version>
<jersey.version>2.35</jersey.version>
<cxf.version>3.4.7</cxf.version>
<jersey.version>2.39.1</jersey.version>
<cxf.version>3.5.6</cxf.version>
<jackson.version>2.15.1</jackson.version>
</properties>
<dependencies>
@ -70,7 +71,7 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.12.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@ -189,7 +190,7 @@
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<executions>
<execution>
<id>fix-baseUrl</id>