Repository: aurora Updated Branches: refs/heads/master a31acbb6c -> fc9cb02ef
Updgrade to gradle 2.4. Bugs closed: AURORA-1306 Reviewed at https://reviews.apache.org/r/33905/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/fc9cb02e Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/fc9cb02e Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/fc9cb02e Branch: refs/heads/master Commit: fc9cb02ef8ecd30ea163a64d88738c461a18e0fb Parents: a31acbb Author: Bill Farner <[email protected]> Authored: Wed May 6 12:32:00 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Wed May 6 12:32:00 2015 -0700 ---------------------------------------------------------------------- build.gradle | 4 ++++ buildSrc/gradle.properties | 2 +- config/findbugs/excludeFilter.xml | 14 +++++++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../apache/aurora/scheduler/app/SchedulerMain.java | 2 +- .../apache/aurora/scheduler/http/LeaderRedirect.java | 1 + .../scheduler/storage/backup/StorageBackupTest.java | 11 ++++++++--- 7 files changed, 26 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 4fe4a18..829b813 100644 --- a/build.gradle +++ b/build.gradle @@ -353,6 +353,10 @@ tasks.withType(FindBugs) { } pmd { + // Avoiding gradle's upgrade of PMD since there have been regressions in some rules post-5.1.1. + // For example, UnusedPrivateMethod raises some obvious false positives. + toolVersion = '5.1.1' + sourceSets = [sourceSets.main] // PMD rule set names match XML files stored in the PMD jar. For example, with 5.11 you can // see all the rules included with: http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/buildSrc/gradle.properties ---------------------------------------------------------------------- diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 3452426..3231a7a 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1 +1 @@ -GRADLE_VERSION = 2.3 +GRADLE_VERSION = 2.4 http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/config/findbugs/excludeFilter.xml ---------------------------------------------------------------------- diff --git a/config/findbugs/excludeFilter.xml b/config/findbugs/excludeFilter.xml index 328e75c..e1c2503 100644 --- a/config/findbugs/excludeFilter.xml +++ b/config/findbugs/excludeFilter.xml @@ -67,10 +67,6 @@ limitations under the License. <Bug pattern="IS2_INCONSISTENT_SYNC" /> </Match> <Match> - <Class name="org.apache.aurora.scheduler.storage.mem.MemAttributeStore" /> - <Bug pattern="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED" /> - </Match> - <Match> <Class name="org.apache.aurora.scheduler.http.Utilization" /> <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" /> </Match> @@ -80,7 +76,6 @@ limitations under the License. </Match> <Match> <Or> - <Class name="org.apache.aurora.scheduler.log.testing.FileLogTest" /> <Class name="org.apache.aurora.scheduler.storage.backup.StorageBackup$StorageBackupImpl" /> <Class name="org.apache.aurora.scheduler.storage.backup.StorageBackupTest" /> </Or> @@ -103,4 +98,13 @@ limitations under the License. </Or> <Bug pattern="DM_DEFAULT_ENCODING" /> </Match> + + <Match> + <!-- False positives on a check introduced in findbugs 3.0.1 --> + <Or> + <Class name="org.apache.aurora.scheduler.storage.db.DbStorage" /> + <Class name="org.apache.aurora.scheduler.http.api.security.AuthorizeHeaderTokenTest" /> + </Or> + <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" /> + </Match> </FindBugsFilter> http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49c346d..e713793 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 11 15:05:09 PDT 2015 +#Tue May 05 13:11:06 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java index 3d19831..239c616 100644 --- a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java +++ b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java @@ -259,7 +259,7 @@ public class SchedulerMain extends AbstractApplication { appLifecycle.awaitShutdown(); } - public static void main(String[] args) { + public static void main(String... args) { AppLauncher.launch(SchedulerMain.class, args); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java index 40e0c84..fcf5e44 100644 --- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java +++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java @@ -167,6 +167,7 @@ public class LeaderRedirect { default: LOG.severe("Multiple schedulers detected, will not redirect: " + hostSet); leader.set(null); + break; } } } http://git-wip-us.apache.org/repos/asf/aurora/blob/fc9cb02e/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java index ebe5517..d1301e0 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java @@ -17,6 +17,8 @@ import java.io.File; import java.util.List; import java.util.concurrent.ScheduledExecutorService; +import javax.annotation.Nullable; + import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -47,6 +49,7 @@ import org.junit.Test; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class StorageBackupTest extends EasyMockTest { @@ -92,9 +95,11 @@ public class StorageBackupTest extends EasyMockTest { assertBackupCount(1); assertEquals(1, storageBackup.getSuccesses().get()); - Snapshot restored = ThriftBinaryCodec.decode( - Snapshot.class, - Files.toByteArray(config.getDir().listFiles()[0])); + @Nullable + File[] files = config.getDir().listFiles(); + assertNotNull(files); + + Snapshot restored = ThriftBinaryCodec.decode(Snapshot.class, Files.toByteArray(files[0])); assertEquals(snapshot, restored); }
