This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new bd84107 [Java] Upgrade dependencies
bd84107 is described below
commit bd84107015ebff513c65f524f7a2234744044560
Author: Grant Henke <[email protected]>
AuthorDate: Thu Mar 18 20:37:27 2021 -0500
[Java] Upgrade dependencies
Upgrades the Java dependencies and Gradle versions.
Minor version upgrades:
- jetty 9.4.35.v20201120 -> 9.4.38.v20210224
- jmh 1.27 -> 1.28
- mockito 3.6.28 -> 3.8.0
- protobuf 3.14.0 -> 3.15.6
- spark 3.0.1 -> 3.1.1
Maintenance version upgrades:
- junit 4.13.1 -> 4.13.2
- log4j 2.14.0 -> 2.14.1
- micrometer 1.6.2 -> 1.6.5
- netty 4.1.56.Final -> 4.1.60.Final
- scala 2.13.12 -> 2.12.13
- scalatest 3.2.3 -> 3.2.6
- scopt 4.0.0 -> 4.0.1
Gradle upgrades:
- gradle 6.7.1 -> 6.8.3
- gradle-versions-plugin 0.36.0 -> 0.38.0
- gradle-jacoco-log 1.2.3 -> 1.2.4
- protobuf-gradle-plugin 0.8.14 -> 0.8.15
- spotbugs-gradle-plugin 4.6.0 -> 4.7.0
- gradle-animalsniffer-plugin 1.5.2 -> 1.5.3
- jmh-gradle-plugin 0.5.2 -> 0.5.3
Change-Id: Ie52174f558ae9ce3075f377303a5d8ac23ff57ec
Reviewed-on: http://gerrit.cloudera.org:8080/17206
Reviewed-by: Andrew Wong <[email protected]>
Tested-by: Andrew Wong <[email protected]>
Reviewed-by: Alexey Serbin <[email protected]>
---
java/buildSrc/build.gradle | 12 ++++++------
java/gradle.properties | 2 +-
java/gradle/dependencies.gradle | 26 +++++++++++++-------------
java/gradle/wrapper/gradle-wrapper.properties | 2 +-
java/gradlew | 2 ++
5 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
index 840a936..50f1e37 100644
--- a/java/buildSrc/build.gradle
+++ b/java/buildSrc/build.gradle
@@ -28,20 +28,20 @@ repositories {
// Manage plugin dependencies since the plugin block can't be used in included
build scripts yet.
// For more details see:
https://docs.gradle.org/current/userguide/plugins.html#plugins_dsl_limitations
dependencies {
- compile "com.github.ben-manes:gradle-versions-plugin:0.36.0"
+ compile "com.github.ben-manes:gradle-versions-plugin:0.38.0"
compile "com.github.jengelman.gradle.plugins:shadow:6.1.0"
- compile "gradle.plugin.org.barfuin.gradle.jacocolog:gradle-jacoco-log:1.2.3"
+ compile "gradle.plugin.org.barfuin.gradle.jacocolog:gradle-jacoco-log:1.2.4"
compile "gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.6.2"
- compile "com.google.protobuf:protobuf-gradle-plugin:0.8.14"
+ compile "com.google.protobuf:protobuf-gradle-plugin:0.8.15"
compile "com.netflix.nebula:nebula-clojure-plugin:9.4.3"
- compile "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0"
+ compile "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0"
compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
compile "net.ltgt.gradle:gradle-errorprone-plugin:1.3.0"
- compile "ru.vyarus:gradle-animalsniffer-plugin:1.5.2"
+ compile "ru.vyarus:gradle-animalsniffer-plugin:1.5.3"
compile "com.google.code.gson:gson:2.8.6"
compile "cz.alenkacz:gradle-scalafmt:1.14.0"
compile "com.google.guava:guava:30.1-jre"
- compile "me.champeau.gradle:jmh-gradle-plugin:0.5.2"
+ compile "me.champeau.gradle:jmh-gradle-plugin:0.5.3"
}
// Compiler configuration
diff --git a/java/gradle.properties b/java/gradle.properties
index 95e615e..b490f9f 100755
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -69,7 +69,7 @@ gradleDistUrlBase = https://services.gradle.org/distributions
# doesn't support TLSv1.2) would fail to fetch the jar.
# This jar doesn't change frequently and doesn't need to be updated to match
# the Gradle version to function properly.
-wrapperBaseUrl =
https://raw.githubusercontent.com/gradle/gradle/v6.2.2/gradle/wrapper
+wrapperBaseUrl =
https://raw.githubusercontent.com/gradle/gradle/v6.8.3/gradle/wrapper
# Increase the default Java heap size for the build to avoid OOM issues.
#
https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 932c434..1ae690f 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -32,7 +32,7 @@ versions += [
commonsIo : "2.8.0",
errorProne : "2.3.3",
errorProneJavac: "9+181-r4173-1",
- gradle : "6.7.1",
+ gradle : "6.8.3",
guava : "30.1-jre",
hadoop : "3.3.0",
hamcrest : "2.2",
@@ -41,25 +41,25 @@ versions += [
httpClient : "4.5.13",
jacoco : "0.8.6",
jepsen : "0.1.5",
- jetty : "9.4.35.v20201120",
- jmh : "1.27",
+ jetty : "9.4.38.v20210224",
+ jmh : "1.28",
jsr305 : "3.0.2",
- junit : "4.13.1",
- log4j : "2.14.0",
- micrometer : "1.6.2",
- mockito : "3.6.28",
+ junit : "4.13.2",
+ log4j : "2.14.1",
+ micrometer : "1.6.5",
+ mockito : "3.8.0",
murmur : "1.0.0",
- netty : "4.1.56.Final",
+ netty : "4.1.60.Final",
osdetector : "1.6.2",
- protobuf : "3.14.0",
+ protobuf : "3.15.6",
ranger : "2.1.0",
scala211 : "2.11.12",
- scala : "2.12.12",
- scalatest : "3.2.3",
- scopt : "4.0.0",
+ scala : "2.12.13",
+ scalatest : "3.2.6",
+ scopt : "4.0.1",
slf4j : "1.7.30",
spark2 : "2.4.7",
- spark : "3.0.1",
+ spark : "3.1.1",
spotBugs : "4.1.1",
yetus : "0.13.0"
]
diff --git a/java/gradle/wrapper/gradle-wrapper.properties
b/java/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc..8cf6eb5 100644
--- a/java/gradle/wrapper/gradle-wrapper.properties
+++ b/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/java/gradlew b/java/gradlew
index 6ba4069..1f64d9c 100755
--- a/java/gradlew
+++ b/java/gradlew
@@ -95,6 +95,7 @@ done
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -142,6 +143,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
