From 81be31220042b4d9f28e9f46585958e50a4d06f1 Mon Sep 17 00:00:00 2001 From: Stu Date: Sun, 13 Jul 2014 15:38:41 +0100 Subject: [PATCH] Gradle 2.0 gives "DOCTYPE is disallowed when the feature "http://apache.org/xml/features/disallow-doctype-decl" set to true" --- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/groovy/org/scoverage/OverallCheckTask.groovy | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 985fdd5..ceb3e6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/src/main/groovy/org/scoverage/OverallCheckTask.groovy b/src/main/groovy/org/scoverage/OverallCheckTask.groovy index 0a1bb34..bb044a8 100644 --- a/src/main/groovy/org/scoverage/OverallCheckTask.groovy +++ b/src/main/groovy/org/scoverage/OverallCheckTask.groovy @@ -11,13 +11,21 @@ class OverallCheckTask extends DefaultTask { File cobertura double minimumLineRate = 0.75 + protected XmlParser parser; + + OverallCheckTask() { + parser = new XmlParser() + parser.setFeature('http://apache.org/xml/features/disallow-doctype-decl', false) + parser.setFeature('http://apache.org/xml/features/nonvalidating/load-external-dtd', false) + } + @TaskAction void requireLineCoverage() { def extension = ScoveragePlugin.extensionIn(project) if (cobertura == null) cobertura = new File(extension.reportDir, 'cobertura.xml') - def xml = new XmlParser().parse(cobertura) + def xml = parser.parse(cobertura) def overallLineRate = xml.attribute('line-rate').toDouble() def difference = (minimumLineRate - overallLineRate)