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 b284a0a [Java] Upgrade dependencies
b284a0a is described below
commit b284a0acba30c48d20c34a55d576195e1d8e4d2b
Author: Grant Henke <[email protected]>
AuthorDate: Mon Dec 14 10:19:37 2020 -0600
[Java] Upgrade dependencies
Upgrades the Java dependencies and Gradle versions.
Major version upgrades:
- guava 29.0-jre -> 30.1-jre
- scopt 3.7.1 -> 4.0.0
Minor version upgrades:
- jmh 1.26 -> 1.27
- log4j 2.13.3 -> 2.14.0
- micrometer 1.5.5 -> 1.6.2
- mockito 3.5.13 -> 3.6.28
- protobuf 3.13.0 -> 3.14.0
- yetus 0.12.0 -> 0.13.0
Maintenance version upgrades:
- jetty 9.4.32.v20200930 -> 9.4.35.v20201120
- netty 4.1.52.Final -> 4.1.56.Final
- scalatest 3.2.2 -> 3.2.3
Gradle upgrades:
- gradle 6.6.1 -> 6.7.1
- gradle-versions-plugin 0.33.0 -> 0.36.0
- gradle-protobuf-plugin 0.8.13 -> 0.8.14
- nebula-clojure-plugin 9.4.1 -> 9.4.2
- spotbugs-gradle-plugin 4.5.0 -> 4.6.0
- gradle-error-prone-plugin 1.2.1 -> 1.3.0
- gradle-animal-sniffer-plugin 1.5.1 -> 1.5.2
- jmh-gradle-plugin 0.5.1 -> 0.5.2
Change-Id: Ib4b319a67f629bcb60ae54187cee1c3257d6e1a2
Reviewed-on: http://gerrit.cloudera.org:8080/16874
Reviewed-by: Attila Bukor <[email protected]>
Tested-by: Kudu Jenkins
---
java/buildSrc/build.gradle | 16 +++++++--------
java/gradle/dependencies.gradle | 24 +++++++++++-----------
java/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../scala/org/apache/kudu/backup/TestOptions.scala | 4 ++--
.../org/apache/kudu/client/TestNegotiator.java | 7 ++++---
5 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
index c8541ac..e9d9b7c 100644
--- a/java/buildSrc/build.gradle
+++ b/java/buildSrc/build.gradle
@@ -28,19 +28,19 @@ 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.33.0"
+ compile "com.github.ben-manes:gradle-versions-plugin:0.36.0"
compile "com.github.jengelman.gradle.plugins:shadow:6.1.0"
compile "gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.6.2"
- compile "com.google.protobuf:protobuf-gradle-plugin:0.8.13"
- compile "com.netflix.nebula:nebula-clojure-plugin:9.4.1"
- compile "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0"
+ compile "com.google.protobuf:protobuf-gradle-plugin:0.8.14"
+ compile "com.netflix.nebula:nebula-clojure-plugin:9.4.3"
+ compile "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0"
compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
- compile "net.ltgt.gradle:gradle-errorprone-plugin:1.2.1"
- compile "ru.vyarus:gradle-animalsniffer-plugin:1.5.1"
+ compile "net.ltgt.gradle:gradle-errorprone-plugin:1.3.0"
+ compile "ru.vyarus:gradle-animalsniffer-plugin:1.5.2"
compile "com.google.code.gson:gson:2.8.6"
compile "cz.alenkacz:gradle-scalafmt:1.14.0"
- compile "com.google.guava:guava:29.0-jre"
- compile "me.champeau.gradle:jmh-gradle-plugin:0.5.1"
+ compile "com.google.guava:guava:30.1-jre"
+ compile "me.champeau.gradle:jmh-gradle-plugin:0.5.2"
}
// Compiler configuration
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 9c046b9..911c5e9 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -33,36 +33,36 @@ versions += [
commonsIo : "2.8.0",
errorProne : "2.3.3",
errorProneJavac: "9+181-r4173-1",
- gradle : "6.6.1",
- guava : "29.0-jre",
+ gradle : "6.7.1",
+ guava : "30.1-jre",
hadoop : "3.3.0",
hamcrest : "2.2",
hdrhistogram : "2.1.12",
hive : "3.1.2",
httpClient : "4.5.13",
jepsen : "0.1.5",
- jetty : "9.4.32.v20200930",
- jmh : "1.26",
+ jetty : "9.4.35.v20201120",
+ jmh : "1.27",
jsr305 : "3.0.2",
junit : "4.13.1",
- log4j : "2.13.3",
- micrometer : "1.5.5",
- mockito : "3.5.13",
+ log4j : "2.14.0",
+ micrometer : "1.6.2",
+ mockito : "3.6.28",
murmur : "1.0.0",
- netty : "4.1.52.Final",
+ netty : "4.1.56.Final",
osdetector : "1.6.2",
parquet : "1.11.1",
- protobuf : "3.13.0",
+ protobuf : "3.14.0",
ranger : "2.1.0",
scala211 : "2.11.12",
scala : "2.12.12",
- scalatest : "3.2.2",
- scopt : "3.7.1",
+ scalatest : "3.2.3",
+ scopt : "4.0.0",
slf4j : "1.7.30",
spark2 : "2.4.7",
spark : "3.0.1",
spotBugs : "4.1.1",
- yetus : "0.12.0"
+ yetus : "0.13.0"
]
// Log the Gradle version used vs defined.
diff --git a/java/gradle/wrapper/gradle-wrapper.properties
b/java/gradle/wrapper/gradle-wrapper.properties
index 84a9066..1f3fdbc 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.2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git
a/java/kudu-backup/src/test/scala/org/apache/kudu/backup/TestOptions.scala
b/java/kudu-backup/src/test/scala/org/apache/kudu/backup/TestOptions.scala
index 41e7f66..0ce464c 100644
--- a/java/kudu-backup/src/test/scala/org/apache/kudu/backup/TestOptions.scala
+++ b/java/kudu-backup/src/test/scala/org/apache/kudu/backup/TestOptions.scala
@@ -41,7 +41,7 @@ class TestOptions extends KuduTestSuite {
| --failOnFirstError Whether to fail the backup job as soon as
a single table backup fails. Default: false
| --help prints this usage text
| <table>... A list of tables to be backed
up.""".stripMargin
- assertEquals(expectedStr, BackupOptions.parser.renderTwoColumnsUsage)
+ assertEquals(expectedStr, BackupOptions.parser.usage)
}
@Test
@@ -59,6 +59,6 @@ class TestOptions extends KuduTestSuite {
| --restoreOwner <value> If true, it restores table ownership when
creating new tables, otherwise creates tables as the logged in user. Only used
when createTables is true. Default: true
| --help prints this usage text
| <table>... A list of tables to be
restored.""".stripMargin
- assertEquals(expectedStr, RestoreOptions.parser.renderTwoColumnsUsage)
+ assertEquals(expectedStr, RestoreOptions.parser.usage)
}
}
diff --git
a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
index d73bb44..f1ae46d 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
@@ -422,10 +422,11 @@ public class TestNegotiator {
.build()));
embedder.flushInbound();
- // TODO (ghenke): For some reason the SslHandler adds an extra empty
message here.
+ // TODO (ghenke): For some reason the SslHandler adds extra empty messages
here.
// This should be harmless, but it would be good to understand or fix why.
- ByteBuf empty = embedder.readOutbound();
- assertEquals(0, empty.readableBytes());
+ while (((ByteBuf) embedder.outboundMessages().peek()).readableBytes() ==
0) {
+ embedder.readOutbound();
+ }
// Should be complete now.
assertComplete(/*isTls*/ true);
