You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by am...@apache.org on 2019/06/24 00:58:50 UTC
[drill] 03/03: DRILL-7302: Bump Apache Avro to 1.9.0
This is an automated email from the ASF dual-hosted git repository.
amansinha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 205e0289940e8b8342f3ae812640da331381ff16
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Thu Jun 20 15:41:57 2019 +0200
DRILL-7302: Bump Apache Avro to 1.9.0
Apache Avro 1.9.0 brings a lot of new features:
Deprecate Joda-Time in favor of Java8 JSR310 and setting it as default
Remove support for Hadoop 1.x
Move from Jackson 1.x to 2.9
Add ZStandard Codec
Lots of updates on the dependencies to fix CVE's
Remove Jackson classes from public API
Apache Avro is built by default with Java 8
Apache Avro is compiled and tested with Java 11 to guarantee compatibility
Apache Avro MapReduce is compiled and tested with Hadoop 3
Apache Avro is now leaner, multiple dependencies were removed: guava, paranamer, commons-codec, and commons-logging
and many, many more!
close apache/drill#1812
---
.../org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java | 2 +-
.../drill/exec/resourcemgr/config/selectors/NotEqualSelector.java | 2 +-
.../drill/exec/physical/impl/join/TestLateralJoinCorrectness.java | 2 +-
.../physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java | 2 +-
.../java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java
index 50acb86..9c6d7c5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java
@@ -17,7 +17,7 @@
*/
package org.apache.drill.exec.resourcemgr.config.selectors;
-import avro.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting;
import com.typesafe.config.Config;
import org.apache.drill.exec.ops.QueryContext;
import org.apache.drill.exec.resourcemgr.config.exception.RMConfigException;
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java
index 653c3b5..bb6da02 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java
@@ -17,7 +17,7 @@
*/
package org.apache.drill.exec.resourcemgr.config.selectors;
-import avro.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting;
import com.typesafe.config.Config;
import org.apache.drill.exec.ops.QueryContext;
import org.apache.drill.exec.resourcemgr.config.exception.RMConfigException;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java
index 4d4521d..ff1de9d 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java
@@ -17,7 +17,7 @@
*/
package org.apache.drill.exec.physical.impl.join;
-import avro.shaded.com.google.common.collect.Lists;
+import org.apache.drill.shaded.guava.com.google.common.collect.Lists;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.drill.categories.OperatorTest;
import org.apache.drill.common.exceptions.DrillRuntimeException;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java
index 9eee038..ae9003c 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java
@@ -17,7 +17,7 @@
*/
package org.apache.drill.exec.physical.impl.join;
-import avro.shaded.com.google.common.collect.Lists;
+import org.apache.drill.shaded.guava.com.google.common.collect.Lists;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.exec.ops.OperatorContext;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java
index de7b6c2..1e99b79 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java
@@ -42,7 +42,7 @@ import org.apache.drill.exec.record.metadata.TupleSchema;
import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList;
import org.apache.drill.test.OperatorFixture;
-import avro.shaded.com.google.common.collect.Lists;
+import org.apache.drill.shaded.guava.com.google.common.collect.Lists;
public class ScanTestUtils {
diff --git a/pom.xml b/pom.xml
index e141ea0..550d8ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<javassist.version>3.24.0-GA</javassist.version>
<msgpack.version>0.6.6</msgpack.version>
<reflections.version>0.9.10</reflections.version>
- <avro.version>1.8.2</avro.version>
+ <avro.version>1.9.0</avro.version>
<metrics.version>4.0.2</metrics.version>
<jetty.version>9.3.25.v20180904</jetty.version>
<jersey.version>2.25.1</jersey.version>