aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Update a handful of dependencies.
Date Tue, 29 Dec 2015 16:46:45 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 0687afbcb -> 80ae5e8ca


Update a handful of dependencies.

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


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

Branch: refs/heads/master
Commit: 80ae5e8cae79cf189a86e4227cdc0beb584e1748
Parents: 0687afb
Author: Bill Farner <wfarner@apache.org>
Authored: Tue Dec 29 08:46:37 2015 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Dec 29 08:46:37 2015 -0800

----------------------------------------------------------------------
 build.gradle                                    | 51 +++++++++++---------
 .../JobUpdateActionTypeHandler.java             |  2 +-
 .../JobUpdateStatusTypeHandler.java             |  2 +-
 .../MaintenanceModeTypeHandler.java             |  2 +-
 .../typehandlers/ScheduleStatusTypeHandler.java |  2 +-
 5 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/80ae5e8c/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index d32aea5..5ff10d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ import org.gradle.api.JavaVersion
 
 plugins {
   id 'com.eriwen.gradle.js' version '1.12.1'
-  id 'com.github.ben-manes.versions' version '0.10.1'
+  id 'com.github.ben-manes.versions' version '0.11.3'
   id 'com.github.hierynomus.license' version '0.11.0'
   id 'me.champeau.gradle.jmh' version '0.2.0'
 }
@@ -79,19 +79,21 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169
     }
   }
 
-  ext.junitRev = '4.12'
-  ext.log4jRev = '1.2.17'
+  ext.commonsLangRev = '2.6'
   ext.gsonRev = '2.3.1'
-  ext.guavaRev = '18.0'
-  ext.slf4jRev = '1.7.12'
-  ext.thriftRev = '0.9.1'
+  ext.guavaRev = '19.0'
   ext.guiceRev = '3.0'
+  ext.jacksonRev = '2.5.1'
+  ext.jerseyRev = '1.19'
+  ext.jsrRev = '3.0.1'
+  ext.junitRev = '4.12'
+  ext.log4jRev = '1.2.17'
+  ext.protobufRev = '2.6.1'
   ext.servletRev = '3.1.0'
+  ext.slf4jRev = '1.7.12'
   ext.stringTemplateRev = '3.2.1'
+  ext.thriftRev = '0.9.1'
   ext.zookeeperRev = '3.3.4'
-  ext.jerseyRev = '1.18.1'
-  ext.jsrRev = '2.0.1'
-  ext.commonsLangRev = '2.6'
 
   configurations {
     compile {
@@ -102,16 +104,17 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169
       // See http://forums.gradle.org/gradle/topics/shouldnt-resolutionstrategy-affect-depending-projects-transitive-dependencies
       resolutionStrategy {
         failOnVersionConflict()
-        force "org.slf4j:slf4j-api:${slf4jRev}"
+        force "com.fasterxml.jackson.core:jackson-annotations:${jacksonRev}"
+        force "com.fasterxml.jackson.core:jackson-core:${jacksonRev}"
         force "com.google.code.gson:gson:${gsonRev}"
-        force "log4j:log4j:${log4jRev}"
+        force "com.google.guava:guava:${guavaRev}"
+        force "com.google.protobuf:protobuf-java:${protobufRev}"
         force "junit:junit:${junitRev}"
-        // Force versions based on inter-dependency collisions
-        force "org.hamcrest:hamcrest-core:1.3"
+        force "log4j:log4j:${log4jRev}"
         force "org.apache.thrift:libthrift:${thriftRev}"
+        force "org.hamcrest:hamcrest-core:1.3"
+        force "org.slf4j:slf4j-api:${slf4jRev}"
         force "org.slf4j:slf4j-jdk14:${slf4jRev}"
-        force 'com.fasterxml.jackson.core:jackson-annotations:2.5.1'
-        force 'com.fasterxml.jackson.core:jackson-core:2.5.1'
       }
     }
   }
@@ -159,11 +162,11 @@ project(':commons') {
     compile "com.sun.jersey:jersey-core:${jerseyRev}"
     compile "commons-lang:commons-lang:${commonsLangRev}"
     compile "javax.servlet:javax.servlet-api:${servletRev}"
-    compile "joda-time:joda-time:2.3"
+    compile "joda-time:joda-time:2.9.1"
     compile "log4j:log4j:${log4jRev}"
     compile "org.antlr:stringtemplate:${stringTemplateRev}"
     compile "org.apache.zookeeper:zookeeper:${zookeeperRev}"
-    compile "org.easymock:easymock:3.2"
+    compile "org.easymock:easymock:3.4"
     compile "org.slf4j:slf4j-jdk14:${slf4jRev}"
 
     testCompile "junit:junit:${junitRev}"
@@ -331,13 +334,13 @@ dependencies {
   compile project(':commons-args')
 
   compile 'aopalliance:aopalliance:1.0'
-  compile 'com.google.code.findbugs:jsr305:2.0.1'
+  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:2.5.0'
-  compile 'com.h2database:h2:1.4.187'
-  compile 'com.hubspot.jackson:jackson-datatype-protobuf:0.9.2'
-  compile 'com.fasterxml.jackson.core:jackson-core:2.5.1'
+  compile "com.google.protobuf:protobuf-java:${protobufRev}"
+  compile 'com.h2database:h2:1.4.190'
+  compile 'com.hubspot.jackson:jackson-datatype-protobuf:0.9.3'
+  compile "com.fasterxml.jackson.core:jackson-core:${jacksonRev}"
   compile "com.sun.jersey:jersey-core:${jerseyRev}"
   compile "com.sun.jersey:jersey-json:${jerseyRev}"
   compile "com.sun.jersey:jersey-server:${jerseyRev}"
@@ -356,8 +359,8 @@ dependencies {
   compile "org.eclipse.jetty:jetty-servlet:${jettyDep}"
   compile "org.eclipse.jetty:jetty-servlets:${jettyDep}"
   compile 'org.mybatis:mybatis:3.3.0'
-  compile 'org.mybatis:mybatis-guice:3.6'
-  compile 'org.quartz-scheduler:quartz:2.2.1'
+  compile 'org.mybatis:mybatis-guice:3.7'
+  compile 'org.quartz-scheduler:quartz:2.2.2'
   compile "org.slf4j:slf4j-jdk14:${slf4jRev}"
   compile "uno.perk:forward:1.0.0"
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/80ae5e8c/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateActionTypeHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateActionTypeHandler.java
b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateActionTypeHandler.java
index 1b70684..85ead70 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateActionTypeHandler.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateActionTypeHandler.java
@@ -18,7 +18,7 @@ import org.apache.aurora.gen.JobUpdateAction;
 /**
  * Type handler for {@link JobUpdateAction}.
  */
-class JobUpdateActionTypeHandler extends AbstractTEnumTypeHandler<JobUpdateAction>
{
+public class JobUpdateActionTypeHandler extends AbstractTEnumTypeHandler<JobUpdateAction>
{
   @Override
   protected JobUpdateAction fromValue(int value) {
     return JobUpdateAction.findByValue(value);

http://git-wip-us.apache.org/repos/asf/aurora/blob/80ae5e8c/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateStatusTypeHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateStatusTypeHandler.java
b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateStatusTypeHandler.java
index 72f8b85..2848bf8 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateStatusTypeHandler.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/JobUpdateStatusTypeHandler.java
@@ -18,7 +18,7 @@ import org.apache.aurora.gen.JobUpdateStatus;
 /**
  * Type handler for {@link JobUpdateStatus}.
  */
-class JobUpdateStatusTypeHandler extends AbstractTEnumTypeHandler<JobUpdateStatus>
{
+public class JobUpdateStatusTypeHandler extends AbstractTEnumTypeHandler<JobUpdateStatus>
{
   @Override
   protected JobUpdateStatus fromValue(int value) {
     return JobUpdateStatus.findByValue(value);

http://git-wip-us.apache.org/repos/asf/aurora/blob/80ae5e8c/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/MaintenanceModeTypeHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/MaintenanceModeTypeHandler.java
b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/MaintenanceModeTypeHandler.java
index 061027b..8373ec7 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/MaintenanceModeTypeHandler.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/MaintenanceModeTypeHandler.java
@@ -18,7 +18,7 @@ import org.apache.aurora.gen.MaintenanceMode;
 /**
  * Type handler for {@link MaintenanceMode}.
  */
-class MaintenanceModeTypeHandler extends AbstractTEnumTypeHandler<MaintenanceMode>
{
+public class MaintenanceModeTypeHandler extends AbstractTEnumTypeHandler<MaintenanceMode>
{
   @Override
   protected MaintenanceMode fromValue(int value) {
     return MaintenanceMode.findByValue(value);

http://git-wip-us.apache.org/repos/asf/aurora/blob/80ae5e8c/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/ScheduleStatusTypeHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/ScheduleStatusTypeHandler.java
b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/ScheduleStatusTypeHandler.java
index 1f203b4..b6b4f25 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/ScheduleStatusTypeHandler.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/typehandlers/ScheduleStatusTypeHandler.java
@@ -18,7 +18,7 @@ import org.apache.aurora.gen.ScheduleStatus;
 /**
  * Type handler for {@link ScheduleStatus}.
  */
-class ScheduleStatusTypeHandler extends AbstractTEnumTypeHandler<ScheduleStatus> {
+public class ScheduleStatusTypeHandler extends AbstractTEnumTypeHandler<ScheduleStatus>
{
   @Override
   protected ScheduleStatus fromValue(int value) {
     return ScheduleStatus.findByValue(value);


Mime
View raw message