Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C3CF2200D35 for ; Tue, 7 Nov 2017 08:27:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C2482160BED; Tue, 7 Nov 2017 07:27:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BA14C1609C8 for ; Tue, 7 Nov 2017 08:27:07 +0100 (CET) Received: (qmail 67354 invoked by uid 500); 7 Nov 2017 07:27:06 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 67344 invoked by uid 99); 7 Nov 2017 07:27:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2017 07:27:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45672DFC27; Tue, 7 Nov 2017 07:27:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: serb@apache.org To: commits@aurora.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: aurora git commit: Migrate from findbugs to spotbugs Date: Tue, 7 Nov 2017 07:27:06 +0000 (UTC) archived-at: Tue, 07 Nov 2017 07:27:09 -0000 Repository: aurora Updated Branches: refs/heads/master d10165544 -> ad86177a0 Migrate from findbugs to spotbugs Findbugs [1] is no longer developed and replaced by spotbugs [2] as mostly a drop-in replacement. [1] https://github.com/findbugsproject/findbugs [2] https://mailman.cs.umd.edu/pipermail/findbugs-discuss/2017-September/004383.html Reviewed at https://reviews.apache.org/r/63564/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/ad86177a Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/ad86177a Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/ad86177a Branch: refs/heads/master Commit: ad86177a0b241f206eedb51bb708b74f5292afdc Parents: d101655 Author: Stephan Erb Authored: Tue Nov 7 08:26:58 2017 +0100 Committer: Stephan Erb Committed: Tue Nov 7 08:26:58 2017 +0100 ---------------------------------------------------------------------- build.gradle | 18 +-- config/findbugs/excludeFilter.xml | 129 ------------------ config/spotbugs/excludeFilter.xml | 136 +++++++++++++++++++ .../scheduler/offers/OfferOrderBuilder.java | 4 +- 4 files changed, 145 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/ad86177a/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 26051ac..ddf153d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,11 +17,11 @@ plugins { id 'com.github.hierynomus.license' version '0.11.0' id 'com.moowork.node' version '1.2.0' id 'me.champeau.gradle.jmh' version '0.4.4' + id "com.github.spotbugs" version "1.6.0" } apply plugin: 'application' apply plugin: 'checkstyle' -apply plugin: 'findbugs' apply plugin: 'jacoco' apply plugin: 'pmd' @@ -85,7 +85,6 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169 ext.asyncHttpclientRev = '2.0.37' ext.jacksonRev = '2.5.1' ext.jerseyRev = '1.19' - ext.jsrRev = '3.0.1' ext.junitRev = '4.12' ext.logbackRev = '1.2.3' ext.mybatisRev = '3.4.1' @@ -112,7 +111,6 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169 failOnVersionConflict() force "com.fasterxml.jackson.core:jackson-annotations:${jacksonRev}" force "com.fasterxml.jackson.core:jackson-core:${jacksonRev}" - force "com.google.code.findbugs:jsr305:${jsrRev}" force "com.google.code.gson:gson:${gsonRev}" force "com.google.guava:guava:${guavaRev}" force "com.google.protobuf:protobuf-java:${protobufRev}" @@ -187,7 +185,6 @@ project(':commons') { } dependencies { - compile "com.google.code.findbugs:jsr305:${jsrRev}" compile "com.google.code.gson:gson:${gsonRev}" compile "com.google.guava:guava:${guavaRev}" compile "com.google.inject:guice:${guiceRev}" @@ -373,7 +370,6 @@ dependencies { compile 'aopalliance:aopalliance:1.0' compile "ch.qos.logback:logback-classic:${logbackRev}" compile "com.beust:jcommander:1.72" - compile "com.google.code.findbugs:jsr305:${jsrRev}" compile "com.google.inject:guice:${guiceRev}" compile "com.google.inject.extensions:guice-assistedinject:${guiceRev}" compile "com.google.protobuf:protobuf-java:${protobufRev}" @@ -417,7 +413,7 @@ dependencies { def runCodeQuality = project.hasProperty('q') def codeQualityTasks = [ Checkstyle, - FindBugs, + com.github.spotbugs.SpotBugsTask, nl.javadude.gradle.plugins.license.License, Pmd ] @@ -432,18 +428,18 @@ checkstyle { toolVersion = '7.3' } -findbugs { - toolVersion = '3.0.1' +spotbugs { + toolVersion = '3.1.0' effort = "max" } -tasks.withType(FindBugs) { +tasks.withType(com.github.spotbugs.SpotBugsTask) { reports { xml.enabled = false html.enabled = true } - maxHeapSize = '2g' - excludeFilter = rootProject.file('config/findbugs/excludeFilter.xml') + maxHeapSize = '1g' + excludeFilter = rootProject.file('config/spotbugs/excludeFilter.xml') } pmd { http://git-wip-us.apache.org/repos/asf/aurora/blob/ad86177a/config/findbugs/excludeFilter.xml ---------------------------------------------------------------------- diff --git a/config/findbugs/excludeFilter.xml b/config/findbugs/excludeFilter.xml deleted file mode 100644 index 4d5b36f..0000000 --- a/config/findbugs/excludeFilter.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/aurora/blob/ad86177a/config/spotbugs/excludeFilter.xml ---------------------------------------------------------------------- diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml new file mode 100644 index 0000000..51790cc --- /dev/null +++ b/config/spotbugs/excludeFilter.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/aurora/blob/ad86177a/src/main/java/org/apache/aurora/scheduler/offers/OfferOrderBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/offers/OfferOrderBuilder.java b/src/main/java/org/apache/aurora/scheduler/offers/OfferOrderBuilder.java index 2676da0..9b395fa 100644 --- a/src/main/java/org/apache/aurora/scheduler/offers/OfferOrderBuilder.java +++ b/src/main/java/org/apache/aurora/scheduler/offers/OfferOrderBuilder.java @@ -74,11 +74,11 @@ final class OfferOrderBuilder { return Ordering .natural() .onResultOf(o -> { - Double resource = bagFromMesosResources( + double resource = bagFromMesosResources( getRevocableOfferResources(o.getOffer())).valueOf(resourceType); // resource will be 0.0 if there is no revocable cpus available. Since the purpose of // this ordering is to bin-pack revocable then we push those offers to the back. - return resource.equals(0.0) ? Double.MAX_VALUE : resource; + return resource == 0.0 ? Double.MAX_VALUE : resource; }); }