Merge branch 'master' of github.com:Alfresco/alfresco-community-repo …

…into feature/MNT-24127-AddSizeEndpoint
Alfresco · Mar 19, 2024 · 3f6fa3d · 3f6fa3d
2 parents 68153fb + af94063
commit 3f6fa3d
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 53 deletions.
diff --git 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.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <build>

diff --git 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.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <properties>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/amps/pom.xml b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.3.0.9-SNAPSHOT</version>
+      <version>23.3.0.12-SNAPSHOT</version>
    </parent>
 
    <dependencies>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/mmt/pom.xml b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 </project>
diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <organization>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git 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.3.0.9-SNAPSHOT</version>
+    <version>23.3.0.12-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -57,7 +57,7 @@
         <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
 
         <dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
-        <dependency.spring.version>6.0.14</dependency.spring.version>
+        <dependency.spring.version>6.0.17</dependency.spring.version>
         <dependency.spring-security.version>6.2.2</dependency.spring-security.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.15.2</dependency.jackson.version>
@@ -114,7 +114,7 @@
         <dependency.json-smart.version>2.5.0</dependency.json-smart.version>
         <alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
         <alfresco.aos-module.version>3.0.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>23.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>23.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.0.1</license-maven-plugin.version>
@@ -328,7 +328,7 @@
             <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
-                <version>2.7.2-alfresco</version>
+                <version>2.7.3-alfresco</version>
                 <exclusions>
                     <!-- [ACS-544] Excluded to avoid conflict in JDK9+ as it includes javax.xml and w3c.org -->
                     <exclusion>

diff --git 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.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/repository/pom.xml b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.9-SNAPSHOT</version>
+        <version>23.3.0.12-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.template;
 
 import java.io.IOException;
@@ -59,6 +59,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.apache.xml.utils.Constants;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -142,6 +143,7 @@ private void process(TemplateSource templateSource, Object model, Writer out)
 
         XSLTemplateModel xsltModel = (XSLTemplateModel) model;
         System.setProperty("org.apache.xalan.extensions.bsf.BSFManager", BSFManager.class.getName());
+        System.setProperty("javax.xml.transform.TransformerFactory", TransformerFactoryImpl.class.getName());
 
         Document xslTemplate;
         try

diff --git a/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
@@ -263,7 +263,7 @@ public void testImportXMLDocument() throws Exception
             fail();
         }
     }
-    
+
     private FileInfo createXmlFile(NodeRef folder)
     {
         return createXmlFile(folder, sampleXML);
-Original file line number
+Diff line change
@@ Expand Up / @@ -263,7 +263,7 @@ public void testImportXMLDocument() throws Exception @@
                 fail();
             }
         }
         private FileInfo createXmlFile(NodeRef folder)
         {
             return createXmlFile(folder, sampleXML);
@@ Expand Down @@