diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 204b6c5fe98..8894359a60a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index bc561a4a2c0..2e5b60232c6 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT 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 index 55a705acb9b..139688321c8 100644 --- 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 @@ org.alfresco alfresco-governance-services-automation-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 0629da3150d..4c815db775f 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1745979c2b1..b064ade653a 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT 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 index 7c7552959e2..89c43b1bdb2 100644 --- 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 @@ org.alfresco alfresco-governance-services-community-repo-parent - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 21a5e024720..c82b74c6e5e 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 24cf76eed11..78a85a149b0 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 715d45a9c39..ef8753f370f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 731a5d1ec8a..069b6e11ddc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index c5e6f6b4e8a..00827bbdcdb 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 84c6136f6d0..2d82db2e79e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6c7c98559af..2128db7677e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 2329dc71c55..3121b3759af 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7f0dde7488b..824a38431b5 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 4182721373e..d0dac687dda 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b1363dc7044..5ffca3750b8 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 29f4553b9ea..bc0d1a63aa7 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d01ee59146e..89e5733b4b9 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d085ec9ac26..4050b5c1cbe 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6b671fd0702..e0c52979290 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/pom.xml b/pom.xml index a12a907a87a..9e513e9a9c0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT pom Alfresco Community Repo Parent @@ -57,7 +57,7 @@ 0.0.27 1.9.20.1 - 6.0.14 + 6.0.17 6.2.2 3.5.3 2.15.2 @@ -114,7 +114,7 @@ 2.5.0 4.1.0 3.0.0 - 23.1.0 + 23.2.0 2.2.0 2.0.1 @@ -328,7 +328,7 @@ xalan xalan - 2.7.2-alfresco + 2.7.3-alfresco diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ea87a60493d..399f23e8864 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 081e153a6b4..9eb8d100f87 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.9-SNAPSHOT + 23.3.0.12-SNAPSHOT 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);