Dan Burkert has submitted this change and it was merged. Change subject: Bump guava version to 18.0 ......................................................................
Bump guava version to 18.0 We use the javax thread safety annotations from the jsr305 jar which the previous Guava version had a compile scope dependency on. Guava has since made that dependency optional since it only contains annotations, so we have to add an optional dependency on it as well. The new guava version conflicts with the version used by MR, so the kudu-mapreduce unit tests were converted into integration tests, so that the tests run after the shading step. Change-Id: I6d18c96d94544b493d7ca92eff6205d58f11cfdc Reviewed-on: http://gerrit.cloudera.org:8080/2972 Tested-by: Kudu Jenkins Reviewed-by: Dan Burkert <[email protected]> --- M java/.gitignore D java/kudu-client/.gitignore M java/kudu-client/pom.xml M java/kudu-client/src/main/java/org/kududb/client/AsyncKuduSession.java M java/kudu-client/src/main/java/org/kududb/client/DeadlineTracker.java M java/kudu-client/src/test/java/org/kududb/client/BaseKuduTest.java M java/kudu-client/src/test/java/org/kududb/client/MiniKuduCluster.java M java/kudu-client/src/test/java/org/kududb/client/TestAsyncKuduClient.java M java/kudu-client/src/test/java/org/kududb/client/TestDeadlineTracker.java M java/kudu-mapreduce/pom.xml R java/kudu-mapreduce/src/test/java/org/kududb/mapreduce/ITInputFormatJob.java R java/kudu-mapreduce/src/test/java/org/kududb/mapreduce/ITKuduTableInputFormat.java R java/kudu-mapreduce/src/test/java/org/kududb/mapreduce/ITKuduTableOutputFormat.java R java/kudu-mapreduce/src/test/java/org/kududb/mapreduce/ITOutputFormatJob.java M java/pom.xml 15 files changed, 45 insertions(+), 50 deletions(-) Approvals: Dan Burkert: Looks good to me, approved Kudu Jenkins: Verified -- To view, visit http://gerrit.cloudera.org:8080/2972 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d18c96d94544b493d7ca92eff6205d58f11cfdc Gerrit-PatchSet: 5 Gerrit-Project: kudu Gerrit-Branch: master Gerrit-Owner: Dan Burkert <[email protected]> Gerrit-Reviewer: Adar Dembo <[email protected]> Gerrit-Reviewer: Dan Burkert <[email protected]> Gerrit-Reviewer: Jean-Daniel Cryans Gerrit-Reviewer: Kudu Jenkins
