Merge branch 'master' into acs-6151-create-ats-liveness-readiness-probes-tests

This commit is contained in:
pzurek 2023-11-29 14:19:09 +01:00
commit 7682a66a80
11 changed files with 30 additions and 18 deletions

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -248,7 +248,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -117,7 +117,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -114,7 +114,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -118,7 +118,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -162,7 +162,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -110,7 +110,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -206,7 +206,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
</parent>
<properties>

14
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.2-SNAPSHOT</version>
<name>Alfresco Transform Core</name>
<packaging>pom</packaging>
@ -189,6 +189,18 @@
<artifactId>testcontainers</artifactId>
<version>1.19.1</version>
</dependency>
<!-- PRODSEC-7375 / CVE-2023-46604-->
<!-- Both dependencies can be removed once spring-boot-starter-activemq has secure versions of those dependencies-->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.18.3</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client-jakarta</artifactId>
<version>5.18.3</version>
</dependency>
</dependencies>
</dependencyManagement>