Merge pull request #2530 from Alfresco/feature/MNT-24250_xalan_7.3.N

MNT-24250: bump xalan version (#2497)

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java

@@ -133,7 +133,7 @@ public void setupDispositionScheduleLinkedRecordsTest() {
      * <p>
      * <p/> TestRail Test C775<p/>
      **/
-    @Test
+    @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest(jira = "RM-1622")
     public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
         STEP("Create record category");
@@ -199,7 +199,7 @@ public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingExcepti
      * Check the disposition steps for a record can be executed
      * When the record is linked to a folder with the same disposition schedule
      * */
-    @Test
+    @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest (jira = "RM-3060")
     public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
 

pom.xml

@@ -276,7 +276,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>

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

repository/src/main/resources/alfresco/repository.properties

@@ -813,13 +813,6 @@ solr6.store.mappings.value.solrMappingHistory.baseUrl=/solr/history
 solr6.store.mappings.value.solrMappingHistory.protocol=workspace
 solr6.store.mappings.value.solrMappingHistory.identifier=history
 
-#
-# URL Shortening Properties
-#
-urlshortening.bitly.username=brianalfresco
-urlshortening.bitly.api.key=R_ca15c6c89e9b25ccd170bafd209a0d4f
-urlshortening.bitly.url.length=20
-
 #
 # Bulk Filesystem Importer
 #

repository/src/test/java/org/alfresco/AllUnitTestsSuite.java

@@ -83,7 +83,6 @@
     org.alfresco.repo.transfer.HttpClientTransmitterImplTest.class,
     org.alfresco.repo.transfer.manifest.TransferManifestTest.class,
     org.alfresco.repo.transfer.TransferVersionCheckerImplTest.class,
-    org.alfresco.repo.urlshortening.BitlyUrlShortenerTest.class,
     org.alfresco.service.cmr.calendar.CalendarRecurrenceHelperTest.class,
     org.alfresco.service.cmr.calendar.CalendarTimezoneHelperTest.class,
     org.alfresco.tools.RenameUserTest.class,

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);