diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml index e8393995c37e..c56a5bb2c1f3 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -37,7 +37,7 @@ 0.1.3 3.0.1 - 1.8.2 + 1.9.0 @@ -58,32 +58,31 @@ slf4j-api - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind org.apache.avro avro-mapred - hadoop2 ${avro.version} - org.codehaus.jackson - jackson-core-asl + org.slf4j + slf4j-api - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core - org.slf4j - slf4j-api + com.fasterxml.jackson.core + jackson-databind diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java index 253eea53e7cf..3a0da9f89e93 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.directory.api.util.Strings; import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.impl.InputRowParser; diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetInputTest.java index 5addaecf37e6..9287599ce06f 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.InputRow; import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.druid.indexer.path.StaticPathSpec; diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DecimalParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DecimalParquetInputTest.java index 2660d33bc07c..a587789fb481 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DecimalParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DecimalParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.InputRow; import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.hadoop.conf.Configuration; diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetInputTest.java index ee3aa6dc1121..28fa8bb265a2 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.InputRow; import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.druid.indexer.path.StaticPathSpec; diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/TimestampsParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/TimestampsParquetInputTest.java index e06b3817ee9b..a451da700d76 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/TimestampsParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/TimestampsParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.InputRow; import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.druid.indexer.path.StaticPathSpec; diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/WikiParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/WikiParquetInputTest.java index cc1245434f68..07ae255406fb 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/WikiParquetInputTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/WikiParquetInputTest.java @@ -19,7 +19,7 @@ package org.apache.druid.data.input.parquet; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.InputRow; import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.druid.indexer.path.StaticPathSpec;