diff --git a/build.gradle b/build.gradle index 9c935f22e1..40439aba7b 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ subprojects { } jacoco { - toolVersion = '0.8.2' + toolVersion = '0.8.3' } // ensure the build-dir exists diff --git a/build.xml b/build.xml index 861e302880..fda1ac13ef 100644 --- a/build.xml +++ b/build.xml @@ -48,7 +48,7 @@ under the License. - + @@ -260,14 +260,14 @@ under the License. value="${repository.m2}/maven2/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar"/> - - - - - - - - + + + + + + + + @@ -330,6 +330,9 @@ under the License. + + + @@ -641,7 +644,7 @@ under the License. - + @@ -653,28 +656,16 @@ under the License. - - - - - - - - + + - - - - - - - - - + + + @@ -2141,18 +2132,20 @@ under the License. - - - - - Maven ant tasks not found. - Please make sure the maven-ant-tasks jar is in ANT_HOME/lib, or made - available to Ant using other mechanisms like -lib or CLASSPATH. + + - You can download the Maven Ant Tasks from https://maven.apache.org/ant-tasks/download.html - + + + + + + + @@ -2165,7 +2158,7 @@ under the License. - + diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index fdec1d7ba9..2c461eb13e 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -38,10 +38,7 @@ def poijobs = [ ], [ name: 'POI-DSL-1.13', jdk: '1.13', trigger: triggerSundays, skipcigame: true, // Nodes beam* do not yet have JDK 13 installed - slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam6&&!beam7&&!beam8&&!beam9&&!beam10&&!beam11&&!beam12&&!beam13&&!beam14&&!beam15&&!beam16', - properties: [// JaCoCo currently fails with "java.lang.NoSuchFieldException: $jacocoAccess", - // need to review/check with newer JDK 13 builds or when at least JaCoCo 0.8.3 - '-Dcoverage.enabled=false'] + slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam6&&!beam7&&!beam8&&!beam9&&!beam10&&!beam11&&!beam12&&!beam13&&!beam14&&!beam15&&!beam16' ], [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays, skipcigame: true ],