From 74cba1a2338eb926a68cb1190a9ffac8e86bcc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Rainer?= <62990104+Pawel-608@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:34:09 +0100 Subject: [PATCH] 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 1bdd6c022c01ce79330936d128dffa398f7b9faf) --- pom.xml | 2 +- .../alfresco/repo/template/XSLTProcessor.java | 52 ++++++++++--------- .../executer/XSLTRenderingEngineTest.java | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 66e4e4b8b03..9a7866d7b7e 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ xalan xalan - 2.7.2-alfresco + 2.7.3-alfresco diff --git a/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java index 7c0947a7ea2..e810a38c216 100644 --- 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 . - * #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 . + * #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 index b4993312cbc..98d89f3bd5e 100644 --- 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);