Build mit gradle 6.7

bitctrl · Nov 11, 2020 · 1f17041 · 1f17041
1 parent f8e0358
commit 1f17041
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,11 +9,14 @@ buildscript {
   dependencies {
     classpath "org.raml.jaxrs:raml-to-jaxrs-gradle-plugin:3.0.5"
     classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.1.0"
-    classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.9"
     classpath "gradle.plugin.de.fntsoftware.gradle:markdown-to-pdf:1.1.0"
   }
 }
 
+plugins {
+  id "com.github.spotbugs" version "4.6.0"
+}
+
 apply plugin: "de.fntsoftware.gradle.markdown-to-pdf"
 
 allprojects  {
@@ -32,22 +35,12 @@ allprojects  {
 markdownToPdf{
 }
 
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
-    ignoreFailures = true
-
-    effort = 'max'
-    reportLevel = 'low'
-
-    reports {
-        xml.enabled = true
-        html.enabled = false
-    }
-}
 
 apply plugin: 'base'
 
 assemble.dependsOn+='testspezifikationToPdf'
 
+
 subprojects {
    apply plugin: 'java'
    apply plugin: 'maven'

diff --git a/de.bitctrl.dav.rest.client/build.gradle b/de.bitctrl.dav.rest.client/build.gradle
@@ -3,8 +3,6 @@ apply plugin: "com.github.spotbugs"
 apply plugin: 'checkstyle'
 apply plugin: "de.fntsoftware.gradle.markdown-to-pdf"
 
-
-
 assemble.dependsOn+='betriebshandbuchToPdf'    
 
 description = 'Dav3 REST Client'
@@ -37,21 +35,15 @@ jar{
 	}
 }
 
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
-    ignoreFailures = true
-
-    effort = 'max'
-    reportLevel = 'low'
-
-    reports {
-        xml.enabled = true
-        html.enabled = false
-    }
-}
 
 distZip {
     into(project.name+"-"+project.version) {
         from 'build'
         include 'Betriebshandbuch.pdf'
     }
 }
+
+spotbugs {
+    ignoreFailures = true
+    showStackTraces = true
+}
diff --git a/de.bitctrl.dav.rest.server/build.gradle b/de.bitctrl.dav.rest.server/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'application'
-apply plugin: "com.github.spotbugs"
+apply plugin: 'com.github.spotbugs'
 apply plugin: 'checkstyle'
 
 description = 'Dav3 REST Server'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists