From a7a125669ec5652387b1337b83fc65a3ea0c4641 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Fri, 8 Mar 2024 10:58:27 +0100 Subject: [PATCH 01/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d048d166b06..e3039036526 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.2-alfresco + 2.7.3-alfresco From 1d2b5a6d7a69e9a2f826fe1d29224d7376149b1f Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 15:42:12 +0100 Subject: [PATCH 02/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3039036526..faba4140012 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco + 2.7.3-alfresco.6 From ad3f4d4692e86e9118e3985b0b83f1ee61c05131 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 15:57:21 +0100 Subject: [PATCH 03/40] bump xalan From ae676036ce6657dbd2e85667549f1bb0aff07706 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:19:54 +0100 Subject: [PATCH 04/40] MNT-24250: bump xalan version --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index faba4140012..f4084442a98 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.6 + 2.7.3-alfresco @@ -1045,8 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties - + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties From 356cd461a280eed82b2ca6985a7055fd695dbfa5 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:21:39 +0100 Subject: [PATCH 05/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4084442a98..32f4116b2d6 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco + 2.7.3-alfresco.1 From 3114d4756aa0f0cb888a3220b324f8d34e2f2333 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:23:13 +0100 Subject: [PATCH 06/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32f4116b2d6..bb0fc37f0af 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.1 + 2.7.3-alfresco.2 From f83f84b7cb50a59a4cc5831cc47c578c17f706b4 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:23:37 +0100 Subject: [PATCH 07/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb0fc37f0af..8a6783842b7 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.2 + 2.7.3-alfresco.3 From a72d9cfc42505c6a79d7c6a7e0807437f18e9e11 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:50:42 +0100 Subject: [PATCH 08/40] MNT-24250: bump xalan version --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8a6783842b7..faba4140012 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.3 + 2.7.3-alfresco.6 @@ -1045,7 +1045,8 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties + From dd3482b013b8916e0b0cd3a54c4446dd4ae16545 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 16:53:23 +0100 Subject: [PATCH 09/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index faba4140012..10ec269287c 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.6 + 2.7.3-alfresco.3 From 7128cd9713467266516ca7f4fdf4e6b842521eef Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 17:05:44 +0100 Subject: [PATCH 10/40] MNT-24250: bump xalan version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 10ec269287c..133873f60ea 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.3 + 2.7.3-alfresco.6 @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties From 39debf29dc6c88f0e74a3e49966f6fb4cc28df5c Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 19:16:12 +0100 Subject: [PATCH 11/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 133873f60ea..03e2e73f8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.6 + 2.7.3-alfresco.3 From f975fc3faac7a9bb6b9030a6bc7b895fbe3196d6 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 19:19:08 +0100 Subject: [PATCH 12/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03e2e73f8fa..10ec269287c 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties From 5f63d215db194fbe2c8ee888dd502524a265600a Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 20:21:13 +0100 Subject: [PATCH 13/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10ec269287c..1f3ed45e15e 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.3 + 2.7.3-alfresco.4 From 5b7cc748d37813ca353168a5b60b4a8259d71d77 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 20:26:43 +0100 Subject: [PATCH 14/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f3ed45e15e..8cfaced19d2 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties From 095d2c3b30d11f5b0415b4f5222444ffa5d6acec Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 20:40:10 +0100 Subject: [PATCH 15/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cfaced19d2..fb03ca6a383 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.4 + 2.7.3 From ca2598a7ad44591a4994fe1bb80622e7cbd36ac9 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Mon, 11 Mar 2024 21:16:14 +0100 Subject: [PATCH 16/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb03ca6a383..48246e29034 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3 + 2.7.2-alfresco From 0a6d2c2ca6a6b95f34f0a85e64be439d36bf44a7 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 09:47:25 +0100 Subject: [PATCH 17/40] MNT-24250: bump xalan version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48246e29034..fb03ca6a383 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.2-alfresco + 2.7.3 From f7a155f5ee7346854e301f08b12b1e1bd0f686d2 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 09:48:41 +0100 Subject: [PATCH 18/40] MNT-24250: alfresco.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb03ca6a383..03e2e73f8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3 + 2.7.3-alfresco.3 From 61eff39d69ba61475bb67103165a17953a27432d Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:03:57 +0100 Subject: [PATCH 19/40] MNT-24250: alfresco.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03e2e73f8fa..10ec269287c 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties From 3e40dd36b066fcd4e6122ad446abf188a1ace80f Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:04:19 +0100 Subject: [PATCH 20/40] MNT-24250: alfresco.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10ec269287c..03e2e73f8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties From a18e450b4a2f1a9a2cee578970b0097dd7e83a83 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:09:23 +0100 Subject: [PATCH 21/40] MNT-24250: alfresco.3 --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 03e2e73f8fa..2bf635a402e 100644 --- a/pom.xml +++ b/pom.xml @@ -329,13 +329,6 @@ xalan xalan 2.7.3-alfresco.3 - - - - xml-apis - xml-apis - - org.alfresco From b85964b1ee6d3807b877ecfc40246e1b90647bb0 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:34:19 +0100 Subject: [PATCH 22/40] MNT-24250: alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..799a3af7972 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 @@ -253,7 +253,7 @@ public void testImportXMLDocument() throws Exception assertNotNull(reader); String output = reader.getContentString(); - log.debug("XSLT Processor output: " + output); + log.info("XSLT Processor output: " + output); Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); } From f7b8d817dc6e757f011b6eca795005d0fe852269 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:37:33 +0100 Subject: [PATCH 23/40] MNT-24250: 2.7.3 official --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bf635a402e..fb03ca6a383 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,14 @@ xalan xalan - 2.7.3-alfresco.3 + 2.7.3 + + + + xml-apis + xml-apis + + org.alfresco From 20fab36e0cfac7ee948697c05aa9b74fd2018751 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:37:54 +0100 Subject: [PATCH 24/40] MNT-24250: 2.7.3-alfresco.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb03ca6a383..03e2e73f8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3 + 2.7.3-alfresco.3 From 85a683bba9ef8e74db7fdc33a76261da91d3d2b9 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:48:00 +0100 Subject: [PATCH 25/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 799a3af7972..9bb4bf62563 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 @@ -255,7 +255,13 @@ public void testImportXMLDocument() throws Exception log.info("XSLT Processor output: " + output); Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); - assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); + assertTrue(String.format( +""" +Pieces of XML are similar %s + +output: %s + +""", myDiff, output), myDiff.similar()); } catch (Exception ex) { From 995b4e6efd3c321ec8c52ab1276578d108bea4d0 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:48:07 +0100 Subject: [PATCH 26/40] MNT-24250: 2.7.3-alfresco.3 --- .../org/alfresco/AppContext04TestSuite.java | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java index 20695c33ece..6c52a12a9c3 100644 --- a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java +++ b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java @@ -39,60 +39,60 @@ @RunWith(Categories.class) @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class}) @Suite.SuiteClasses({ - org.alfresco.repo.usage.RepoUsageComponentTest.class, - org.alfresco.repo.usage.UserUsageTest.class, - org.alfresco.repo.usage.UserUsageTrackingComponentTest.class, - org.alfresco.repo.version.VersionServiceImplTest.class, - org.alfresco.repo.version.NodeServiceImplTest.class, - org.alfresco.repo.version.ContentServiceImplTest.class, - org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class, - org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class, - org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class, - org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class, - org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class, - org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class, - org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class, +// org.alfresco.repo.usage.RepoUsageComponentTest.class, +// org.alfresco.repo.usage.UserUsageTest.class, +// org.alfresco.repo.usage.UserUsageTrackingComponentTest.class, +// org.alfresco.repo.version.VersionServiceImplTest.class, +// org.alfresco.repo.version.NodeServiceImplTest.class, +// org.alfresco.repo.version.ContentServiceImplTest.class, +// org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class, +// org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class, +// org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class, +// org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class, +// org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class, +// org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class, +// org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class, // This test opens, closes and again opens the alfresco application context. - org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class, - - org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class, +// org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class, +// +// org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class, org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class, - org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class, - org.alfresco.repo.template.XSLTProcessorTest.class, - org.alfresco.repo.search.QueryRegisterComponentTest.class, - org.alfresco.repo.search.SearchServiceTest.class, - org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class, - org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class, - org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class, - org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class, - org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class, - org.alfresco.repo.node.integrity.IntegrityTest.class, - org.alfresco.repo.policy.PolicyComponentTransactionTest.class, - org.alfresco.repo.forms.FormServiceImplTest.class, - org.alfresco.repo.imap.ImapMessageTest.class, - org.alfresco.repo.imap.ImapServiceImplCacheTest.class, - org.alfresco.repo.imap.ImapServiceImplTest.class, - org.alfresco.repo.bulkimport.impl.BulkImportTest.class, - org.alfresco.repo.discussion.DiscussionServiceImplTest.class, - org.alfresco.repo.transfer.NodeCrawlerTest.class, - org.alfresco.repo.transfer.TransferServiceCallbackTest.class, - org.alfresco.repo.transfer.TransferServiceImplTest.class, - org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class, - org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class, - org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class, - org.alfresco.util.schemacomp.DbToXMLTest.class, - org.alfresco.util.schemacomp.ExportDbTest.class, - org.alfresco.util.schemacomp.SchemaReferenceFileTest.class, - org.alfresco.util.schemacomp.SchemaBootstrapTest.class, - org.alfresco.repo.module.ModuleComponentHelperTest.class, - org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class, - - org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class, - org.alfresco.service.ServiceRegistryTest.class, - - // does not want to work in the same test suite as org.alfresco.repo.rule.* tests - org.alfresco.opencmis.search.OpenCmisQueryTest.class +// org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class, +// org.alfresco.repo.template.XSLTProcessorTest.class, +// org.alfresco.repo.search.QueryRegisterComponentTest.class, +// org.alfresco.repo.search.SearchServiceTest.class, +// org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class, +// org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class, +// org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class, +// org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class, +// org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class, +// org.alfresco.repo.node.integrity.IntegrityTest.class, +// org.alfresco.repo.policy.PolicyComponentTransactionTest.class, +// org.alfresco.repo.forms.FormServiceImplTest.class, +// org.alfresco.repo.imap.ImapMessageTest.class, +// org.alfresco.repo.imap.ImapServiceImplCacheTest.class, +// org.alfresco.repo.imap.ImapServiceImplTest.class, +// org.alfresco.repo.bulkimport.impl.BulkImportTest.class, +// org.alfresco.repo.discussion.DiscussionServiceImplTest.class, +// org.alfresco.repo.transfer.NodeCrawlerTest.class, +// org.alfresco.repo.transfer.TransferServiceCallbackTest.class, +// org.alfresco.repo.transfer.TransferServiceImplTest.class, +// org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class, +// org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class, +// org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class, +// org.alfresco.util.schemacomp.DbToXMLTest.class, +// org.alfresco.util.schemacomp.ExportDbTest.class, +// org.alfresco.util.schemacomp.SchemaReferenceFileTest.class, +// org.alfresco.util.schemacomp.SchemaBootstrapTest.class, +// org.alfresco.repo.module.ModuleComponentHelperTest.class, +// org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class, +// +// org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class, +// org.alfresco.service.ServiceRegistryTest.class, +// +// // does not want to work in the same test suite as org.alfresco.repo.rule.* tests +// org.alfresco.opencmis.search.OpenCmisQueryTest.class }) public class AppContext04TestSuite { From 2e128c0ecb48dd3617c9dca0c5b84609c7a6c49e Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 10:51:15 +0100 Subject: [PATCH 27/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 9bb4bf62563..6b056583c51 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 @@ -255,13 +255,7 @@ public void testImportXMLDocument() throws Exception log.info("XSLT Processor output: " + output); Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); - assertTrue(String.format( -""" -Pieces of XML are similar %s - -output: %s - -""", myDiff, output), myDiff.similar()); + assertTrue("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n", myDiff.similar()); } catch (Exception ex) { From 0ed14f2fd3f3e0ea21644b66743f7db1c27b4972 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 11:05:11 +0100 Subject: [PATCH 28/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 6b056583c51..c6da66e995f 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 @@ -254,8 +254,9 @@ public void testImportXMLDocument() throws Exception String output = reader.getContentString(); log.info("XSLT Processor output: " + output); - Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); - assertTrue("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n", myDiff.similar()); + String x = "\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n".replace("\n", ""); + Diff myDiff = new Diff(x, output.replace(" ", "").replace("\n", "")); + assertTrue("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n" + "expected: " + x, myDiff.similar()); } catch (Exception ex) { @@ -263,7 +264,7 @@ public void testImportXMLDocument() throws Exception fail(); } } - + private FileInfo createXmlFile(NodeRef folder) { return createXmlFile(folder, sampleXML); From 5b7a41647243296dac135e7e59ba1b48f35179b6 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 14:26:21 +0100 Subject: [PATCH 29/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 1 + 1 file changed, 1 insertion(+) 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 c6da66e995f..806ce3654ee 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 @@ -256,6 +256,7 @@ public void testImportXMLDocument() throws Exception log.info("XSLT Processor output: " + output); String x = "\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n".replace("\n", ""); Diff myDiff = new Diff(x, output.replace(" ", "").replace("\n", "")); + System.out.println("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n" + "expected: " + x); assertTrue("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n" + "expected: " + x, myDiff.similar()); } catch (Exception ex) From e2f738caed177dfdd2cba247d463cc70c6489cce Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 15:06:36 +0100 Subject: [PATCH 30/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 806ce3654ee..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 @@ -253,11 +253,9 @@ public void testImportXMLDocument() throws Exception assertNotNull(reader); String output = reader.getContentString(); - log.info("XSLT Processor output: " + output); - String x = "\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n".replace("\n", ""); - Diff myDiff = new Diff(x, output.replace(" ", "").replace("\n", "")); - System.out.println("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n" + "expected: " + x); - assertTrue("Pieces of XML are similar " + myDiff + "\n\noutput: " + output + "\n\n" + "expected: " + x, myDiff.similar()); + log.debug("XSLT Processor output: " + output); + Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); + assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); } catch (Exception ex) { From 1e6fee3b51a71903052403ac985db2aaea38aeae Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 15:14:20 +0100 Subject: [PATCH 31/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 98d89f3bd5e..b6320886faa 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 @@ -254,7 +254,7 @@ public void testImportXMLDocument() throws Exception String output = reader.getContentString(); log.debug("XSLT Processor output: " + output); - Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); + Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n".replaceAll("\\s+",""), output.replaceAll("\\s+","")); assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); } catch (Exception ex) From ea2c3700fcbf514a252c2d3a0a86e68e11c40275 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Tue, 12 Mar 2024 15:28:32 +0100 Subject: [PATCH 32/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b6320886faa..af88473e555 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 @@ -260,7 +260,7 @@ public void testImportXMLDocument() throws Exception catch (Exception ex) { log.error("Error!", ex); - fail(); + fail(ex.getMessage()); } } From e3a0aee9d7c9b11c6799f40368f2f9432b14e3fd Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 01:12:33 +0100 Subject: [PATCH 33/40] MNT-24250: 2.7.3-alfresco.3 --- .../alfresco/repo/template/XSLTProcessor.java | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) 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..37039023485 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 - 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% + */ 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 From 73627f43c37a9695ad2f7d1fe55a60bdccafc3c6 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 02:45:49 +0100 Subject: [PATCH 34/40] MNT-24250: 2.7.3-alfresco.3 --- .../org/alfresco/AppContext04TestSuite.java | 102 +++++++++--------- .../executer/XSLTRenderingEngineTest.java | 4 +- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java index 6c52a12a9c3..20695c33ece 100644 --- a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java +++ b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java @@ -39,60 +39,60 @@ @RunWith(Categories.class) @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class}) @Suite.SuiteClasses({ -// org.alfresco.repo.usage.RepoUsageComponentTest.class, -// org.alfresco.repo.usage.UserUsageTest.class, -// org.alfresco.repo.usage.UserUsageTrackingComponentTest.class, -// org.alfresco.repo.version.VersionServiceImplTest.class, -// org.alfresco.repo.version.NodeServiceImplTest.class, -// org.alfresco.repo.version.ContentServiceImplTest.class, -// org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class, -// org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class, -// org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class, -// org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class, -// org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class, -// org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class, -// org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class, + org.alfresco.repo.usage.RepoUsageComponentTest.class, + org.alfresco.repo.usage.UserUsageTest.class, + org.alfresco.repo.usage.UserUsageTrackingComponentTest.class, + org.alfresco.repo.version.VersionServiceImplTest.class, + org.alfresco.repo.version.NodeServiceImplTest.class, + org.alfresco.repo.version.ContentServiceImplTest.class, + org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class, + org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class, + org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class, + org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class, + org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class, + org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class, + org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class, // This test opens, closes and again opens the alfresco application context. -// org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class, -// -// org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class, + org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class, + + org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class, org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class, -// org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class, -// org.alfresco.repo.template.XSLTProcessorTest.class, -// org.alfresco.repo.search.QueryRegisterComponentTest.class, -// org.alfresco.repo.search.SearchServiceTest.class, -// org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class, -// org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class, -// org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class, -// org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class, -// org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class, -// org.alfresco.repo.node.integrity.IntegrityTest.class, -// org.alfresco.repo.policy.PolicyComponentTransactionTest.class, -// org.alfresco.repo.forms.FormServiceImplTest.class, -// org.alfresco.repo.imap.ImapMessageTest.class, -// org.alfresco.repo.imap.ImapServiceImplCacheTest.class, -// org.alfresco.repo.imap.ImapServiceImplTest.class, -// org.alfresco.repo.bulkimport.impl.BulkImportTest.class, -// org.alfresco.repo.discussion.DiscussionServiceImplTest.class, -// org.alfresco.repo.transfer.NodeCrawlerTest.class, -// org.alfresco.repo.transfer.TransferServiceCallbackTest.class, -// org.alfresco.repo.transfer.TransferServiceImplTest.class, -// org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class, -// org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class, -// org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class, -// org.alfresco.util.schemacomp.DbToXMLTest.class, -// org.alfresco.util.schemacomp.ExportDbTest.class, -// org.alfresco.util.schemacomp.SchemaReferenceFileTest.class, -// org.alfresco.util.schemacomp.SchemaBootstrapTest.class, -// org.alfresco.repo.module.ModuleComponentHelperTest.class, -// org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class, -// -// org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class, -// org.alfresco.service.ServiceRegistryTest.class, -// -// // does not want to work in the same test suite as org.alfresco.repo.rule.* tests -// org.alfresco.opencmis.search.OpenCmisQueryTest.class + org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class, + org.alfresco.repo.template.XSLTProcessorTest.class, + org.alfresco.repo.search.QueryRegisterComponentTest.class, + org.alfresco.repo.search.SearchServiceTest.class, + org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class, + org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class, + org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class, + org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class, + org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class, + org.alfresco.repo.node.integrity.IntegrityTest.class, + org.alfresco.repo.policy.PolicyComponentTransactionTest.class, + org.alfresco.repo.forms.FormServiceImplTest.class, + org.alfresco.repo.imap.ImapMessageTest.class, + org.alfresco.repo.imap.ImapServiceImplCacheTest.class, + org.alfresco.repo.imap.ImapServiceImplTest.class, + org.alfresco.repo.bulkimport.impl.BulkImportTest.class, + org.alfresco.repo.discussion.DiscussionServiceImplTest.class, + org.alfresco.repo.transfer.NodeCrawlerTest.class, + org.alfresco.repo.transfer.TransferServiceCallbackTest.class, + org.alfresco.repo.transfer.TransferServiceImplTest.class, + org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class, + org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class, + org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class, + org.alfresco.util.schemacomp.DbToXMLTest.class, + org.alfresco.util.schemacomp.ExportDbTest.class, + org.alfresco.util.schemacomp.SchemaReferenceFileTest.class, + org.alfresco.util.schemacomp.SchemaBootstrapTest.class, + org.alfresco.repo.module.ModuleComponentHelperTest.class, + org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class, + + org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class, + org.alfresco.service.ServiceRegistryTest.class, + + // does not want to work in the same test suite as org.alfresco.repo.rule.* tests + org.alfresco.opencmis.search.OpenCmisQueryTest.class }) public class AppContext04TestSuite { 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 af88473e555..9b399d7849c 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 @@ -253,8 +253,8 @@ public void testImportXMLDocument() throws Exception assertNotNull(reader); String output = reader.getContentString(); - log.debug("XSLT Processor output: " + output); - Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n".replaceAll("\\s+",""), output.replaceAll("\\s+","")); + log.info("XSLT Processor output: " + output); + Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); } catch (Exception ex) From 5c99febad029bb244329aebc763727579512f854 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 08:12:55 +0100 Subject: [PATCH 35/40] MNT-24250: 2.7.3-alfresco.3 --- .../repo/rendition/executer/XSLTRenderingEngineTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9b399d7849c..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 @@ -253,14 +253,14 @@ public void testImportXMLDocument() throws Exception assertNotNull(reader); String output = reader.getContentString(); - log.info("XSLT Processor output: " + output); + log.debug("XSLT Processor output: " + output); Diff myDiff = new Diff("\n\n

My CD Collection

\n\n\n\n\n\n\n\n
TitleArtist
\n\n\n", output); assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar()); } catch (Exception ex) { log.error("Error!", ex); - fail(ex.getMessage()); + fail(); } } From e5427af99c0a0e7dc1fff8fae952d5b1b845711e Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 08:37:42 +0100 Subject: [PATCH 36/40] MNT-24250: 2.7.3-alfresco.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03e2e73f8fa..e7714b68168 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.3 + 2.7.3-alfresco.5 From 290ce27c2022de44372acc9f0faf16b4347bf2bc Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 18:49:40 +0100 Subject: [PATCH 37/40] MNT-24250: 2.7.3-alfresco --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e7714b68168..e3039036526 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ xalan xalan - 2.7.3-alfresco.5 + 2.7.3-alfresco @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties From 397e1576421c7b913ec1f26aa50105f6fa4eebad Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 18:51:34 +0100 Subject: [PATCH 38/40] MNT-24250: 2.7.3-alfresco --- .../org/alfresco/repo/template/XSLTProcessor.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 37039023485..e810a38c216 100644 --- a/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java +++ b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java @@ -2,23 +2,23 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * 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 + * 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% From fd159f85bb84fc1734e3a5457dc63a5a24c9beba Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Wed, 13 Mar 2024 18:56:39 +0100 Subject: [PATCH 39/40] MNT-24250: 2.7.3-alfresco --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3039036526..75e13a4a1b3 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties From 65930ce0d6bbfbb27d8fe51ce787bb3a3ff32454 Mon Sep 17 00:00:00 2001 From: Pawel Rainer Date: Thu, 14 Mar 2024 09:40:25 +0100 Subject: [PATCH 40/40] MNT-24250: 2.7.3-alfresco --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75e13a4a1b3..e3039036526 100644 --- a/pom.xml +++ b/pom.xml @@ -1045,7 +1045,7 @@ https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt - https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/feature/MNT-24250-override-xalan-license/override-THIRD-PARTY.properties + https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties