[maven-release-plugin][skip ci] prepare release 23.1.1.2

[MNT-23478] AsynchronousExtractor - Fix rendition obtaining (#2288 ) (#2293 )
* [MNT-23478] AsynchronousExtractor - Fix rendition obtaining * [MNT-23478] Only use default options if no rendition is found. PMD scan change. (cherry picked from commit 3bd3689d80)
2025-09-10 14:11:58 +00:00 · 2023-11-07 11:25:13 +00:00 · 2023-11-07 10:41:32 +00:00 · 2023-10-31 19:30:28 +00:00 · 2023-10-31 19:30:24 +00:00 · 2023-10-31 19:36:50 +01:00
27 changed files with 42 additions and 32 deletions
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -5,7 +5,7 @@
 # Version label
 version.major=23
 version.minor=1
-version.revision=0
+version.revision=1
 version.label=

 # Edition label
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.255</version>
+      <version>23.1.1.2</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>23.1.0.255</version>
+    <version>23.1.1.2</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -25,7 +25,7 @@
    <properties>
        <acs.version.major>23</acs.version.major>
        <acs.version.minor>1</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>

@@ -152,7 +152,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.1.0.255</tag>
+        <tag>23.1.1.2</tag>
    </scm>

    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.255</version>
+        <version>23.1.1.2</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/content/metadata/AsynchronousExtractor.java
+++ b/repository/src/main/java/org/alfresco/repo/content/metadata/AsynchronousExtractor.java
@@ -31,6 +31,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.ContentMetadataExtracter;
 import org.alfresco.repo.content.transform.TransformerDebug;
+import org.alfresco.repo.rendition2.RenditionDefinition2;
 import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl;
 import org.alfresco.repo.rendition2.RenditionService2;
 import org.alfresco.repo.rendition2.TransformDefinition;
@@ -411,12 +412,21 @@ public class AsynchronousExtractor extends AbstractMappingMetadataExtracter
        // is used to cache the transform name that will be used.
        String transformName = targetMimetype + '/' + sourceMimetype;
        String renditionName = TransformDefinition.convertToRenditionName(transformName);
-        TransformDefinition transformDefinition = (TransformDefinition) renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
-        if (transformDefinition == null)
+
+        Map<String, String> transformOptions = new HashMap<>();
+        RenditionDefinition2 renditionDefinition2 = renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
+
+        if (renditionDefinition2 != null)
        {
-            transformDefinition = new TransformDefinition(transformName, targetMimetype,
-                    options, null, null, null, renditionDefinitionRegistry2);
+            transformOptions.putAll(renditionDefinition2.getTransformOptions());
        }
+        else
+        {
+            transformOptions.putAll(options);
+        }
+
+        TransformDefinition transformDefinition = new TransformDefinition(transformName, targetMimetype, transformOptions, null,
+                null, null, renditionDefinitionRegistry2);

        if (logger.isTraceEnabled())
        {
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository

 # Schema number
-version.schema=19000
+version.schema=19100

 # Directory configuration
Author	SHA1	Message	Date
alfresco-build	193386e640	[maven-release-plugin][skip ci] prepare release 23.1.1.2	2023-11-07 11:25:13 +00:00
tiagosalvado10	d3dcfd0b6a	[MNT-23478] AsynchronousExtractor - Fix rendition obtaining (#2288 ) (#2293 ) * [MNT-23478] AsynchronousExtractor - Fix rendition obtaining * [MNT-23478] Only use default options if no rendition is found. PMD scan change. (cherry picked from commit `3bd3689d80`)	2023-11-07 10:41:32 +00:00
alfresco-build	b4241eaf90	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-31 19:30:28 +00:00
alfresco-build	d14ba74727	[maven-release-plugin][skip ci] prepare release 23.1.1.1	2023-10-31 19:30:24 +00:00
mpichura	e2b4e2c020	Create ServicePack branch release/23.1.N	2023-10-31 19:36:50 +01:00