aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject git commit: Upgrade to gradle 2.1
Date Mon, 29 Sep 2014 22:37:43 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master b8477a2bf -> 67939c977


Upgrade to gradle 2.1

Reviewed at https://reviews.apache.org/r/26113/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/67939c97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/67939c97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/67939c97

Branch: refs/heads/master
Commit: 67939c977986114470549f235a94316c5ba820ab
Parents: b8477a2
Author: Bill Farner <wfarner@apache.org>
Authored: Mon Sep 29 15:33:35 2014 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Mon Sep 29 15:33:35 2014 -0700

----------------------------------------------------------------------
 build.gradle                                    |  28 ++++++-------------
 gradle/wrapper/gradle-wrapper.jar               | Bin 51348 -> 51017 bytes
 gradle/wrapper/gradle-wrapper.properties        |   4 +--
 .../apache/aurora/scheduler/base/AsyncUtil.java |   4 +--
 .../scheduler/storage/mem/MemJobStore.java      |   4 +--
 5 files changed, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/67939c97/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index eabf65c..671dd48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,29 +12,21 @@
  * limitations under the License.
  */
 
+plugins {
+  id 'com.eriwen.gradle.js' version '1.12.1'
+  id 'com.github.ben-manes.versions' version '0.5'
+  id 'com.github.hierynomus.license' version '0.11.0'
+}
+
 apply plugin: 'application'
 apply plugin: 'checkstyle'
 apply plugin: 'findbugs'
 apply plugin: 'idea'
 apply plugin: 'jacoco'
 apply plugin: 'java'
-apply plugin: 'js'
-apply plugin: 'license'
 apply plugin: 'maven-publish'
 apply plugin: 'pmd'
 apply plugin: 'project-report'
-apply plugin: 'versions'
-
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'com.github.ben-manes:gradle-versions-plugin:0.4'
-    classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.9.0'
-    classpath 'com.eriwen:gradle-js-plugin:1.11.1'
-  }
-}
 
 buildDir = 'dist'
 def generatedDir = "$buildDir/generated-src"
@@ -49,7 +41,7 @@ compileJava {
   targetCompatibility = 1.7
 }
 
-tasks.matching { it instanceof Compile && it.getName() != 'compileGeneratedJava'
}.all {
+tasks.withType(JavaCompile).matching { it.name != 'compileGeneratedJava' }.all {
   options.compilerArgs << '-Werror'
   options.compilerArgs << '-Xlint:all'
   // Don't fail for annotations not claimed by annotation processors.
@@ -59,7 +51,7 @@ tasks.matching { it instanceof Compile && it.getName() != 'compileGeneratedJava'
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '1.12'
+  gradleVersion = '2.1'
 }
 
 task sourceJar(type: Jar) {
@@ -227,8 +219,6 @@ dependencies {
   generatedCompile guavaDep
   generatedCompile thriftLib
 
-  checkstyle 'com.puppycrawl.tools:checkstyle:5.6'
-
   configurations.compile {
     exclude module: 'junit-dep'
     resolutionStrategy {
@@ -298,7 +288,7 @@ pmd {
       'java-unnecessary',
       'java-unusedcode']
   ruleSetFiles = fileTree('config/pmd/')
-  toolVersion = '5.1.1'
+  consoleOutput = true
 }
 
 task checkPython() {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/67939c97/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0087cd3..3d0dee6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/67939c97/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 72018bc..9c0c9d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 23 13:27:17 PDT 2014
+#Fri Sep 26 22:22:22 PDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/67939c97/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java b/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
index 212ba12..f657e05 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
@@ -19,8 +19,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
-
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import static java.util.Objects.requireNonNull;
@@ -54,7 +52,7 @@ public final class AsyncUtil {
         new ThreadFactoryBuilder().setDaemon(true).setNameFormat(nameFormat).build()) {
 
       @Override
-      protected void afterExecute(Runnable runnable, @Nullable Throwable throwable) {
+      protected void afterExecute(Runnable runnable, Throwable throwable) {
         // See java.util.concurrent.ThreadPoolExecutor#afterExecute(Runnable, Throwable)
         // for more details and an implementation example.
         super.afterExecute(runnable, throwable);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/67939c97/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
index c8f73bb..c24a32e 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
@@ -77,9 +77,7 @@ class MemJobStore implements JobStore.Mutable {
       return ImmutableSet.of();
     }
 
-    synchronized (manager.jobs) {
-      return ImmutableSet.copyOf(manager.jobs.values());
-    }
+    return ImmutableSet.copyOf(manager.jobs.values());
   }
 
   @Override


Mime
View raw message