mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-08-14 17:58:27 +00:00
Merge branch 'master' into ATS-0000_refactor_packages
This commit is contained in:
@@ -170,7 +170,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
|
@@ -114,7 +114,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.16.1 .* started</log>
|
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@@ -106,7 +106,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.16.1 .* started</log>
|
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@@ -110,7 +110,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -119,7 +119,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.16.1 .* started</log>
|
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@@ -102,7 +102,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -111,7 +111,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.16.1 .* started</log>
|
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@@ -198,7 +198,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.16.1</name>
|
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@@ -207,7 +207,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.16.1 .* started</log>
|
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
4
pom.xml
4
pom.xml
@@ -10,7 +10,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>2.7.1</version>
|
<version>2.7.2</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
<dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
|
<dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
|
||||||
<dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version>
|
<dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version>
|
||||||
<env.project_version>${project.version}</env.project_version>
|
<env.project_version>${project.version}</env.project_version>
|
||||||
<dependency.activemq.version>5.16.4</dependency.activemq.version>
|
<dependency.activemq.version>5.17.1</dependency.activemq.version>
|
||||||
<dependency.jackson.version>2.13.3</dependency.jackson.version>
|
<dependency.jackson.version>2.13.3</dependency.jackson.version>
|
||||||
<dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
|
<dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
|
||||||
<dependency.junit.version>4.13.2</dependency.junit.version>
|
<dependency.junit.version>4.13.2</dependency.junit.version>
|
||||||
|
Reference in New Issue
Block a user