Skip to content

Commit

Permalink
Merge branch 'master' into fix/MNT-23960_add-notosans-and-font-options
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiagosalvado10
tiagosalvado10 committed Nov 14, 2023
2 parents 8240521 + a823455 commit 67cd4c3
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 18 deletions.
2 changes: 1 addition & 1 deletion deprecated/alfresco-transformer-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions engines/aio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -243,7 +243,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>
Expand Down
2 changes: 1 addition & 1 deletion engines/base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions engines/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions engines/imagemagick/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -109,7 +109,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>
Expand Down
4 changes: 2 additions & 2 deletions engines/libreoffice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -113,7 +113,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>
Expand Down
4 changes: 2 additions & 2 deletions engines/misc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -157,7 +157,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>
Expand Down
4 changes: 2 additions & 2 deletions engines/pdfrenderer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -105,7 +105,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>
Expand Down
4 changes: 2 additions & 2 deletions engines/tika/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -201,7 +201,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>
Expand Down
2 changes: 1 addition & 1 deletion model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.0.1-A2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
16 changes: 15 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-A2-SNAPSHOT</version>
<name>Alfresco Transform Core</name>
<packaging>pom</packaging>

Expand Down Expand Up @@ -184,6 +184,20 @@
<artifactId>snakeyaml</artifactId>
<version>${dependency.snakeyaml.version}</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>

Expand Down

0 comments on commit 67cd4c3

Please sign in to comment.