diff --git a/build.gradle b/build.gradle index 8465357..e679be1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,14 +5,12 @@ buildscript { } } dependencies { - classpath "net.saliman:gradle-cobertura-plugin:2.2.8" classpath group: "org.asciidoctor", name: "asciidoctorj-pdf", version: "1.5.0-alpha.11" classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:3.0.0" } } plugins { - id "org.sonarqube" version "1.0" id "org.asciidoctor.convert" version "1.5.3" } @@ -46,7 +44,6 @@ configure(javaProjects) { apply plugin: "osgi" apply plugin: "maven" apply plugin: "signing" - apply plugin: "net.saliman.cobertura" apply plugin: "biz.aQute.bnd.builder" uploadArchives.enabled = false @@ -85,29 +82,6 @@ configure(javaProjects) { } } - cobertura { - - dependencies { - testCompile "org.slf4j:slf4j-simple:1.6.1" - } - coverageFormats = ["html", "xml"] - coverageIgnoreTrivial = true - coverageIgnores = ["org.slf4j.Logger.*"] - coverageReportDir = new File("$buildDir/reports/cobertura") - coverageTestTasks { - project.tasks.withType(Test).matching {it.name == "test"} - } - - } - - sonarqube { - properties { - property "sonar.exclusions", "src/main/java-gen/**/*,**/app/**/*" - property "sonar.java.coveragePlugin", "cobertura" - property "sonar.cobertura.reportPath", "build/reports/cobertura/coverage.xml" - } - } - task jarAll(type: Copy) { dependsOn(configurations.default.getAllArtifacts().getBuildDependencies()) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0fd9775..519a917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8167ed1..b5e3c6d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 25 13:05:33 CEST 2017 +#Wed Jul 19 14:47:51 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " }