From 77dcbb66559b00f2ae9d71c3d1df3012af473825 Mon Sep 17 00:00:00 2001 From: Pascal Christoph Date: Fri, 23 Oct 2020 10:53:25 +0200 Subject: [PATCH 1/6] Use older libraries and exclude some See #334. --- metafacture-biblio/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle index 9258ac3c9..9a1e50cb8 100644 --- a/metafacture-biblio/build.gradle +++ b/metafacture-biblio/build.gradle @@ -22,7 +22,12 @@ dependencies { implementation project(':metafacture-commons') implementation project(':metafacture-flowcontrol') implementation 'org.dspace:oclc-harvester2:0.1.12' - implementation 'xalan:xalan:2.7.1' + implementation ('xalan:xalan:2.6.0') { + exclude group: 'xalan', module: 'serializer' + exclude group: 'xercesImpl', module: 'xercesImpl' + exclude group: 'xml-apis', module: 'xml-apis' + } + implementation 'log4j:log4j:1.2.12' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.5.5' } From 462e675518474baa44b77120fd0cc231645bcc6e Mon Sep 17 00:00:00 2001 From: Pascal Christoph Date: Mon, 26 Oct 2020 08:44:19 +0100 Subject: [PATCH 2/6] Bump xalan version to get rid of some namespace errors See #334. --- metafacture-biblio/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle index 9a1e50cb8..7faf64733 100644 --- a/metafacture-biblio/build.gradle +++ b/metafacture-biblio/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation project(':metafacture-commons') implementation project(':metafacture-flowcontrol') implementation 'org.dspace:oclc-harvester2:0.1.12' - implementation ('xalan:xalan:2.6.0') { + implementation ('xalan:xalan:2.7.0') { exclude group: 'xalan', module: 'serializer' exclude group: 'xercesImpl', module: 'xercesImpl' exclude group: 'xml-apis', module: 'xml-apis' From 4ff77d096bbc1494fb28df8133d436c07a91fc32 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Mon, 26 Oct 2020 14:14:47 +0100 Subject: [PATCH 3/6] Tweak test logging, update xalan dependency, set TransformerFactory See https://github.com/metafacture/metafacture-core/issues/334 --- build.gradle | 6 ++++++ metafacture-biblio/build.gradle | 6 +----- .../src/main/java/org/metafacture/biblio/OaiPmhOpener.java | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 3a2e4d071..7128615de 100644 --- a/build.gradle +++ b/build.gradle @@ -200,6 +200,12 @@ gradle.projectsEvaluated { task publish { dependsOn tasks.uploadArchives } + + test { + testLogging { + exceptionFormat = 'full' + } + } } } diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle index 7faf64733..92ac97c76 100644 --- a/metafacture-biblio/build.gradle +++ b/metafacture-biblio/build.gradle @@ -22,11 +22,7 @@ dependencies { implementation project(':metafacture-commons') implementation project(':metafacture-flowcontrol') implementation 'org.dspace:oclc-harvester2:0.1.12' - implementation ('xalan:xalan:2.7.0') { - exclude group: 'xalan', module: 'serializer' - exclude group: 'xercesImpl', module: 'xercesImpl' - exclude group: 'xml-apis', module: 'xml-apis' - } + implementation 'xalan:xalan:2.7.2' implementation 'log4j:log4j:1.2.12' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.5.5' diff --git a/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java b/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java index cfec369c2..c0486c3ce 100644 --- a/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java +++ b/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java @@ -50,7 +50,8 @@ public final class OaiPmhOpener extends * Default constructor */ public OaiPmhOpener() { - + // See https://github.com/metafacture/metafacture-core/issues/334 + System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); } /** From 3ecdb4783f3a7693c87e1ec8c4f4ef4457cd364e Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Tue, 27 Oct 2020 14:24:07 +0100 Subject: [PATCH 4/6] Add back exclusions from 77dcbb66559b00f2ae9d71c3d1df3012af473825 See https://github.com/metafacture/metafacture-core/issues/334 --- metafacture-biblio/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle index 92ac97c76..e1607c817 100644 --- a/metafacture-biblio/build.gradle +++ b/metafacture-biblio/build.gradle @@ -22,7 +22,11 @@ dependencies { implementation project(':metafacture-commons') implementation project(':metafacture-flowcontrol') implementation 'org.dspace:oclc-harvester2:0.1.12' - implementation 'xalan:xalan:2.7.2' + implementation ('xalan:xalan:2.7.2') { + exclude group: 'xalan', module: 'serializer' + exclude group: 'xercesImpl', module: 'xercesImpl' + exclude group: 'xml-apis', module: 'xml-apis' + } implementation 'log4j:log4j:1.2.12' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.5.5' From ee0e624b2bfc724166e30765cff0fe1e076915c8 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Tue, 27 Oct 2020 15:31:21 +0100 Subject: [PATCH 5/6] Set TransformerFactory property in metamorph-test See https://github.com/metafacture/metafacture-core/issues/334 --- metamorph-test/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metamorph-test/build.gradle b/metamorph-test/build.gradle index a058fef4d..a19e1c0af 100644 --- a/metamorph-test/build.gradle +++ b/metamorph-test/build.gradle @@ -33,3 +33,7 @@ dependencies { testImplementation project(':metafacture-formeta') testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21' } + +test { + systemProperty "javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl" +} \ No newline at end of file From c7e1eec38f73db3cde046ead76b798a6a771dcb9 Mon Sep 17 00:00:00 2001 From: Pascal Christoph Date: Thu, 29 Oct 2020 16:32:04 +0100 Subject: [PATCH 6/6] Revert to 462e675518474baa44b77120fd0cc231645bcc6e We go with an old library version of xalan and some library exclusions. For now. Revert "Set TransformerFactory property in metamorph-test" This reverts commit ee0e624b2bfc724166e30765cff0fe1e076915c8. Revert "Tweak test logging, update xalan dependency, set TransformerFactory" This reverts commit 4ff77d096bbc1494fb28df8133d436c07a91fc32. See #334. --- build.gradle | 6 ------ metafacture-biblio/build.gradle | 2 +- .../src/main/java/org/metafacture/biblio/OaiPmhOpener.java | 3 +-- metamorph-test/build.gradle | 4 ---- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 7128615de..3a2e4d071 100644 --- a/build.gradle +++ b/build.gradle @@ -200,12 +200,6 @@ gradle.projectsEvaluated { task publish { dependsOn tasks.uploadArchives } - - test { - testLogging { - exceptionFormat = 'full' - } - } } } diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle index e1607c817..7faf64733 100644 --- a/metafacture-biblio/build.gradle +++ b/metafacture-biblio/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation project(':metafacture-commons') implementation project(':metafacture-flowcontrol') implementation 'org.dspace:oclc-harvester2:0.1.12' - implementation ('xalan:xalan:2.7.2') { + implementation ('xalan:xalan:2.7.0') { exclude group: 'xalan', module: 'serializer' exclude group: 'xercesImpl', module: 'xercesImpl' exclude group: 'xml-apis', module: 'xml-apis' diff --git a/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java b/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java index c0486c3ce..cfec369c2 100644 --- a/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java +++ b/metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java @@ -50,8 +50,7 @@ public final class OaiPmhOpener extends * Default constructor */ public OaiPmhOpener() { - // See https://github.com/metafacture/metafacture-core/issues/334 - System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); + } /** diff --git a/metamorph-test/build.gradle b/metamorph-test/build.gradle index a19e1c0af..a058fef4d 100644 --- a/metamorph-test/build.gradle +++ b/metamorph-test/build.gradle @@ -33,7 +33,3 @@ dependencies { testImplementation project(':metafacture-formeta') testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21' } - -test { - systemProperty "javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl" -} \ No newline at end of file