svn commit: r1906427 - in /poi/trunk: build.gradle poi-examples/build.gradle poi-excelant/build.gradle poi-integration/build.gradle poi-ooxml/build.gradle poi-scratchpad/build.gradle poi/build.gradle

[centic]

Author: centic
Date: Fri Jan  6 19:58:45 2023
New Revision: 1906427

URL: http://svn.apache.org/viewvc?rev=1906427&view=rev
Log:
Saxon-HE is included in more place, combine these into the main gradle build

Modified:
    poi/trunk/build.gradle
    poi/trunk/poi-examples/build.gradle
    poi/trunk/poi-excelant/build.gradle
    poi/trunk/poi-integration/build.gradle
    poi/trunk/poi-ooxml/build.gradle
    poi/trunk/poi-scratchpad/build.gradle
    poi/trunk/poi/build.gradle

Modified: poi/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Jan  6 19:58:45 2023
@@ -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 {

Modified: poi/trunk/poi-examples/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Fri Jan  6 19:58:45 2023
@@ -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'

Modified: poi/trunk/poi-excelant/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Fri Jan  6 19:58:45 2023
@@ -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'

Modified: poi/trunk/poi-integration/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Fri Jan  6 19:58:45 2023
@@ -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'

Modified: poi/trunk/poi-ooxml/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Fri Jan  6 19:58:45 2023
@@ -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'

Modified: poi/trunk/poi-scratchpad/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/build.gradle (original)
+++ poi/trunk/poi-scratchpad/build.gradle Fri Jan  6 19:58:45 2023
@@ -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')
 }

Modified: poi/trunk/poi/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1906427&r1=1906426&r2=1906427&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Fri Jan  6 19:58:45 2023
@@ -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')



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org