You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2018/07/31 22:26:11 UTC
[5/5] kudu git commit: [Java] Upgrade Dependencies
[Java] Upgrade Dependencies
Upgrades the Java dependencies and Gradle versions.
Also fixes an issue in the dependencyUpdates plugin
where Scala milestone releases were being included.
Maintenance version upgrades:
- Mockito 2.19.0 -> 2.21.0
Gradle upgrades:
- Gradle 4.8.1 -> 4.9
- gradle-animalsniffer-plugin 1.4.3 -> 1.4.5
- gradle-errorprone-plugin 0.0.14 -> 0.0.16
- protobuf-gradle-plugin 0.8.5 -> 0.8.6
Change-Id: I79c4d5917d13ed18d9df6ba5ef704e4f0081936d
Reviewed-on: http://gerrit.cloudera.org:8080/11090
Tested-by: Grant Henke <gr...@apache.org>
Reviewed-by: Mike Percy <mp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/6c68e64d
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6c68e64d
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6c68e64d
Branch: refs/heads/master
Commit: 6c68e64d852fbf6fd0b43907e4235ccd39b43c21
Parents: 2c4dca7
Author: Grant Henke <gr...@apache.org>
Authored: Tue Jul 31 12:11:39 2018 -0500
Committer: Grant Henke <gr...@apache.org>
Committed: Tue Jul 31 22:25:10 2018 +0000
----------------------------------------------------------------------
java/buildSrc/build.gradle | 6 +++---
java/gradle/dependencies.gradle | 4 ++--
java/gradle/quality.gradle | 2 +-
java/gradle/wrapper/gradle-wrapper.properties | 2 +-
java/gradlew | 2 +-
java/pom.xml | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
index c0ecf8f..a88ebcc 100644
--- a/java/buildSrc/build.gradle
+++ b/java/buildSrc/build.gradle
@@ -31,12 +31,12 @@ dependencies {
compile "com.commercehub.gradle.plugin:gradle-avro-plugin:0.14.2"
compile "com.github.ben-manes:gradle-versions-plugin:0.20.0"
compile "com.github.jengelman.gradle.plugins:shadow:2.0.4"
- compile "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
+ compile "com.google.protobuf:protobuf-gradle-plugin:0.8.6"
compile "com.netflix.nebula:nebula-clojure-plugin:5.1.0"
compile "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.2"
compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
- compile "net.ltgt.gradle:gradle-errorprone-plugin:0.0.14"
- compile "ru.vyarus:gradle-animalsniffer-plugin:1.4.3"
+ compile "net.ltgt.gradle:gradle-errorprone-plugin:0.0.16"
+ compile "ru.vyarus:gradle-animalsniffer-plugin:1.4.5"
compile 'com.google.code.gson:gson:2.8.5'
compile "cz.alenkacz:gradle-scalafmt:1.6.0"
}
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 5cf7e69..d5401b9 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -32,7 +32,7 @@ versions += [
commonsIo : "2.6",
errorprone : "2.3.1",
flume : "1.8.0",
- gradle : "4.8.1",
+ gradle : "4.9",
// We use the android version instead of the jre version
// to maintain Java 1.7 compatibility.
guava : "25.1-android",
@@ -43,7 +43,7 @@ versions += [
jsr305 : "3.0.2",
junit : "4.12",
log4j : "1.2.17",
- mockito : "2.19.0",
+ mockito : "2.21.0",
murmur : "1.0.0",
netty : "3.10.6.Final",
parquet : "1.10.0",
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/quality.gradle b/java/gradle/quality.gradle
index 0527726..f88167a 100644
--- a/java/gradle/quality.gradle
+++ b/java/gradle/quality.gradle
@@ -121,7 +121,7 @@ dependencyUpdates {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ["snap", "alpha", "beta", "rc", "cr", "m"].any { qualifier ->
- selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+ selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-].*/
}
if (rejected) {
selection.reject("Release candidate")
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties
index 48a9df4..8f0e434 100644
--- a/java/gradle/wrapper/gradle-wrapper.properties
+++ b/java/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
# limitations under the License.
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/gradlew
----------------------------------------------------------------------
diff --git a/java/gradlew b/java/gradlew
index 5cab7c0..0a5d168 100755
--- a/java/gradlew
+++ b/java/gradlew
@@ -80,7 +80,7 @@ esac
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
- curl -s -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v4.7.0/gradle/wrapper/gradle-wrapper.jar
+ curl -s -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v4.9.0/gradle/wrapper/gradle-wrapper.jar
fi
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
http://git-wip-us.apache.org/repos/asf/kudu/blob/6c68e64d/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index 2373dbe..bf5bbaf 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -80,7 +80,7 @@
<jsr305.version>3.0.2</jsr305.version>
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
- <mockito-core.version>2.19.0</mockito-core.version>
+ <mockito-core.version>2.21.0</mockito-core.version>
<murmur.version>1.0.0</murmur.version>
<netty.version>3.10.6.Final</netty.version>
<parquet.version>1.10.0</parquet.version>