Saxon-HE is included in more place, combine these into the main gradle build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906427 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index f681fc9417b30adf79ac9b4a27f61cbc667bce0b..4fd45217f8c5e2b2966d5787067d96d468da15c4 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -172,6 +172,12 @@ subprojects {
         testImplementation "org.mockito:mockito-core:${mockitoVersion}"
         testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
         testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+
+        if (SAXON_TEST) {
+            testRuntimeOnly("net.sf.saxon:Saxon-HE:${saxonVersion}") {
+                exclude group: 'xml-apis', module: 'xml-apis'
+            }
+        }
     }
 
     java {

diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 8ce4abd87edfcd79286892b97ec647ffc652f980..ed6ae97c92c63734794495fdd06d456bc3ca2258 100644 (file)
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -43,10 +43,6 @@ dependencies {
         }
     }
     testImplementation project(path: ':poi', configuration: 'tests')
-
-    if (SAXON_TEST) {
-         testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
-    }
 }
 
 final String MODULE_NAME = 'org.apache.poi.examples'

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 1b394fe99433e2d9d9f5246d78fafd4e4e475e77..0c0bb935d4a04b5763029549e96b8cf85b193ff9 100644 (file)
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -45,10 +45,6 @@ dependencies {
     testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
     testImplementation 'org.slf4j:slf4j-simple:2.0.6'
     testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
-
-    if (SAXON_TEST) {
-        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
-    }
 }
 
 final String MODULE_NAME = 'org.apache.poi.excelant'

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 9b46ca3940c0a2d98bae6bd98d444c9f03eced66..f9967fc2ddf0c0ef4b411d8977da6f2ddc4d672f 100644 (file)
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -78,10 +78,6 @@ dependencies {
     testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
     testImplementation 'org.slf4j:slf4j-simple:2.0.6'
     testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
-
-    if (SAXON_TEST) {
-        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
-    }
 }
 
 final String MODULE_NAME = 'org.apache.poi.stress'

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 1c2ffca5c9d1a3d69470ff49ff062b7766c8094a..2c3cb9199ceec4bc31ce604ec60d3d79b31af6b1 100644 (file)
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -127,10 +127,6 @@ dependencies {
     testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
     testImplementation 'org.slf4j:slf4j-simple:2.0.6'
 
-    if (SAXON_TEST) {
-        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
-    }
-
     broken("org.apache.xmlgraphics:batik-script:${batikVersion}"){
         exclude group: 'xalan', module: 'xalan'
         exclude group: 'xml-apis', module: 'xml-apis'

diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index 9caafbd3f4b8803a9c05bf1e7fa145887c21a707..60efe68b222379f5f5fb191493eca20b1e715fdc 100644 (file)
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -43,10 +43,6 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
     testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
 
-    if (SAXON_TEST) {
-        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
-    }
-
     javadocs project(':poi')
     javadocs project(':poi-ooxml')
 }

diff --git a/poi/build.gradle b/poi/build.gradle
index 57493d7c384afd308d53dd818016f3a6d5846f36..c2f60e24a0210c451ff9ac17be4b9acbe7fb8c9e 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -50,12 +50,6 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
     testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
 
-    if (SAXON_TEST) {
-        testRuntimeOnly("net.sf.saxon:Saxon-HE:${saxonVersion}") {
-            exclude group: 'xml-apis', module: 'xml-apis'
-        }
-    }
-
     // needed for locating the external references
     javadocs project(':poi-ooxml')
     javadocs project(':poi-scratchpad')