This is an automated email from the ASF dual-hosted git repository.
rustyrazorblade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/master by this push:
new 2931775 Upgraded gradle and replaced FindBugs with SpotBugs.
2931775 is described below
commit 29317751434cd1b3a129fd4e44628b28c421c6bd
Author: Jon Haddad <[email protected]>
AuthorDate: Tue Mar 3 15:24:50 2020 -0800
Upgraded gradle and replaced FindBugs with SpotBugs.
* Upgrading from findbugs (JDK 8 only) to Spotbugs. FindBugs was abandoned
years ago and will not be updated.
* Upgraded Gradle to version 6.2.1
Patch by Jon Haddad; Reviewed by Dinesh Joshi for CASSANDRA-15610.
---
CHANGES.txt | 1 +
build.gradle | 24 ++++++++++++++++++------
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index d08bc9e..49d7800 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.0.0
-----
+ * Upgraded Gradle and replaced FindBugs with SpotBugs (CASSANDRA-15610)
* Improving local HealthCheckTest reliability (CASSANDRA-15615)
* Read sidecar.yaml from sidecar.config System Property instead of classpath
(CASSANDRA-15288)
* Add integration tests task (CASSANDRA-15031)
diff --git a/build.gradle b/build.gradle
index 947a6bd..3d362e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,19 @@
+
+buildscript {
+ dependencies {
+ // findBugs needs a newer version of Guava in the buildscript.
+ // otherwise it throws an exception
+ classpath "com.google.guava:guava:28.2-jre"
+ }
+}
+
plugins {
id 'java'
id 'application'
id 'idea'
id 'checkstyle'
id 'jacoco'
- id 'findbugs'
+ id "com.github.spotbugs" version "3.0.0"
id 'org.hidetake.swagger.generator' version '2.16.0'
}
@@ -73,6 +82,7 @@ dependencies {
compile 'org.slf4j:slf4j-api:1.7.25'
compile 'ch.qos.logback:logback-core:1.2.3'
compile 'ch.qos.logback:logback-classic:1.2.3'
+
compile 'com.datastax.cassandra:cassandra-driver-core:3.6+'
compile group: 'com.google.inject', name: 'guice', version: '4.2.2'
compile group: 'org.apache.commons', name: 'commons-configuration2',
version: '2.4'
@@ -153,11 +163,13 @@ checkstyle {
configFile file("checkstyle.xml")
}
-tasks.withType(FindBugs) {
- reports {
- xml.enabled false
- html.enabled true
- }
+spotbugs {
+ toolVersion = '4.0.0'
+}
+
+tasks.withType(com.github.spotbugs.SpotBugsTask) {
+ reports.xml.enabled = false
+ reports.html.enabled = true
}
// copyDist gets called on every build
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d..4a6ebce 100644
--- 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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
