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 2019/11/20 19:21:14 UTC
[kudu] 01/02: [Java] Upgrade dependencies
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
View the commit online:
https://github.com/apache/kudu/commit/29b2b4d27a62eeb92d52e61cafdee6ac333de316
commit 29b2b4d27a62eeb92d52e61cafdee6ac333de316
Author: Grant Henke <gr...@apache.org>
AuthorDate: Tue Nov 19 15:05:01 2019 -0600
[Java] Upgrade dependencies
Upgrades the Java dependencies and Gradle versions.
Major version upgrades:
- mockito 2.27.0 -> 3.1.0
Minor version upgrades:
- guava 27.1-jre -> 28.1-jre
- hamcrest 2.1 -> 2.2
- protobuf 3.7.1 -> 3.10.0
- yetus 0.10.0 -> 0.11.1
Maintenance version upgrades:
- hadoop 3.2.0 - 3.2.1
- httpClient 4.5.8 -> 4.5.10
- jetty 9.4.18.v20190429 -> 9.4.22.v20191022
- scalatest 3.0.7 -> 3.0.8
Gradle upgrades:
- gradle 5.4.1 -> 5.6.4
- gradle-errorprone-plugin 0.8 -> 1.1.1
- gradle-version 0.21.0 -> 0.27.0
- gson 2.8.5 -> 2.8.6
- nebula-clojure-plugin 8.1.1 -> 9.1.1
- protobuf-gradle-plugin 0.8.8 -> 0.8.10
- shadow 5.0.0 -> 5.2.0
- spotbugs-gradle-plugin 1.7.1 -> 2.0.1
I also set checkstyle to 8.26 to ensure Gradle upgrades don’t change the
version and break.
Change-Id: Iee6b7b178f1dd7412ecb88261ef88f282c5744e7
Reviewed-on: http://gerrit.cloudera.org:8080/14746
Tested-by: Grant Henke <gr...@apache.org>
Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
java/buildSrc/build.gradle | 15 ++++++------
java/config/checkstyle/checkstyle.xml | 8 +++---
java/gradle/dependencies.gradle | 27 +++++++++++----------
java/gradle/quality.gradle | 1 +
java/gradle/wrapper/gradle-wrapper.properties | 2 +-
java/gradlew | 35 ++++++++++++---------------
6 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
index 7560ecd..55112ba 100644
--- a/java/buildSrc/build.gradle
+++ b/java/buildSrc/build.gradle
@@ -28,17 +28,18 @@ 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.21.0"
- compile "com.github.jengelman.gradle.plugins:shadow:5.0.0"
+ compile "com.github.ben-manes:gradle-versions-plugin:0.27.0"
+ compile "com.github.jengelman.gradle.plugins:shadow:5.2.0"
compile "gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.6.2"
- compile "com.google.protobuf:protobuf-gradle-plugin:0.8.8"
- compile "com.netflix.nebula:nebula-clojure-plugin:8.1.1"
- compile "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.7.1"
+ compile "com.google.protobuf:protobuf-gradle-plugin:0.8.10"
+ compile "com.netflix.nebula:nebula-clojure-plugin:9.1.1"
+ compile "com.github.spotbugs:spotbugs-gradle-plugin:2.0.1"
compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
- compile "net.ltgt.gradle:gradle-errorprone-plugin:0.8"
+ compile "net.ltgt.gradle:gradle-errorprone-plugin:1.1.1"
compile "ru.vyarus:gradle-animalsniffer-plugin:1.5.0"
- compile "com.google.code.gson:gson:2.8.5"
+ compile "com.google.code.gson:gson:2.8.6"
compile "cz.alenkacz:gradle-scalafmt:1.7.2"
+ compile "com.google.guava:guava:28.1-jre"
}
// Compiler configuration
diff --git a/java/config/checkstyle/checkstyle.xml b/java/config/checkstyle/checkstyle.xml
index 562955d..633ea40 100644
--- a/java/config/checkstyle/checkstyle.xml
+++ b/java/config/checkstyle/checkstyle.xml
@@ -59,6 +59,10 @@
<property name="file" value="${config_loc}/suppressions.xml"/>
<property name="optional" value="false"/>
</module>
+ <module name="LineLength">
+ <property name="max" value="100"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ </module>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
@@ -73,10 +77,6 @@
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
- <module name="LineLength">
- <property name="max" value="100"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
- </module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 7471cec..3334c1a 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -27,37 +27,38 @@ ext {
versions += [
async : "1.4.1",
avro : "1.8.2",
+ checkstyle : "8.26",
clojure : "1.9.0",
clojureToolsCli: "0.4.1",
commonsIo : "2.6",
errorProne : "2.3.3",
errorProneJavac: "9+181-r4173-1",
- gradle : "5.4.1",
- guava : "27.1-jre",
- hadoop : "3.2.0",
- hamcrest : "2.1",
+ gradle : "5.6.4",
+ guava : "28.1-jre",
+ hadoop : "3.2.1",
+ hamcrest : "2.2",
hdrhistogram : "2.1.11",
hive : "2.3.4",
- httpClient : "4.5.8",
+ httpClient : "4.5.10",
jepsen : "0.1.5",
- jetty : "9.4.18.v20190429",
+ jetty : "9.4.22.v20191022",
jsr305 : "3.0.2",
junit : "4.12",
log4j : "2.11.2",
- mockito : "2.27.0",
+ mockito : "3.1.0",
murmur : "1.0.0",
netty : "3.10.6.Final",
osdetector : "1.6.2",
parquet : "1.10.1",
pmd : "5.8.1",
- protobuf : "3.7.1",
+ protobuf : "3.10.0",
scala : "2.11.12",
- scalatest : "3.0.7",
+ scalatest : "3.0.8",
scopt : "3.7.1",
- slf4j : "1.7.26",
- spark : "2.4.3",
- spotBugs : "3.1.6",
- yetus : "0.10.0"
+ slf4j : "1.7.29",
+ spark : "2.4.4",
+ spotBugs : "3.1.12",
+ yetus : "0.11.1"
]
// Log the Gradle version used vs defined.
diff --git a/java/gradle/quality.gradle b/java/gradle/quality.gradle
index 8bdc21a..0b35cab 100644
--- a/java/gradle/quality.gradle
+++ b/java/gradle/quality.gradle
@@ -26,6 +26,7 @@ apply plugin: "scalafmt" // Automatically formats Scala code on each build.
apply plugin: "net.ltgt.errorprone" // Performs static code analysis to look for bugs in Java code.
checkstyle {
+ toolVersion = versions.checkstyle
configDir = file("$rootProject.projectDir/config/checkstyle")
ignoreFailures = true
showViolations = true
diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties
index ee69dd6..0ebb310 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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/java/gradlew b/java/gradlew
index c40d514..fa8f2d4 100755
--- a/java/gradlew
+++ b/java/gradlew
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -138,8 +138,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -167,19 +167,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -188,14 +188,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"