MNT-24250: bump xalan version (#2497)

* MNT-24250: bump xalan version * MNT-24250: bump xalan version * bump xalan * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: bump xalan version * MNT-24250: alfresco.3 * MNT-24250: alfresco.3 * MNT-24250: alfresco.3 * MNT-24250: alfresco.3 * MNT-24250: alfresco.3 * MNT-24250: 2.7.3 official * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco.3 * MNT-24250: 2.7.3-alfresco * MNT-24250: 2.7.3-alfresco * MNT-24250: 2.7.3-alfresco * MNT-24250: 2.7.3-alfresco (cherry picked from commit 1bdd6c0)
Alfresco · Mar 20, 2024 · 9d892d0 · 9d892d0
1 parent dcc398a
commit 9d892d0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -329,7 +329,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/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 @@