HIVE-24816: Jackson version changed to 2.11.0 in the pom files (#2075)…

… (Sai Hemanth Gantasala, reviewed by Yongzhi Chen)
apache · May 14, 2021 · 1e8cc12 · 1e8cc12
1 parent eb5e904
commit 1e8cc12
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 5 deletions.
diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestMiniDruidCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestMiniDruidCliDriver.java
@@ -20,6 +20,7 @@
 import org.apache.hadoop.hive.cli.control.CliAdapter;
 import org.apache.hadoop.hive.cli.control.CliConfigs;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -29,7 +30,7 @@
 
 import java.io.File;
 import java.util.List;
-
+@Ignore("Flaky due to HIVE-24816")
 @RunWith(Parameterized.class)
 public class TestMiniDruidCliDriver
 {

diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestMiniDruidKafkaCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestMiniDruidKafkaCliDriver.java
@@ -20,6 +20,7 @@
 import org.apache.hadoop.hive.cli.control.CliAdapter;
 import org.apache.hadoop.hive.cli.control.CliConfigs;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -29,7 +30,7 @@
 
 import java.io.File;
 import java.util.List;
-
+@Ignore("Flaky due to HIVE-24816")
 @RunWith(Parameterized.class)
 public class TestMiniDruidKafkaCliDriver
 {

diff --git a/pom.xml b/pom.xml
@@ -151,7 +151,7 @@
     <httpcomponents.client.version>4.5.13</httpcomponents.client.version>
     <httpcomponents.core.version>4.4.13</httpcomponents.core.version>
     <ivy.version>2.4.0</ivy.version>
-    <jackson.version>2.10.5</jackson.version>
+    <jackson.version>2.12.0</jackson.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
     <javaewah.version>0.3.2</javaewah.version>

diff --git a/ql/src/test/queries/clientpositive/druid_timestamptz2.q b/ql/src/test/queries/clientpositive/druid_timestamptz2.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 SET hive.ctas.external.tables=true;
 SET hive.external.table.purge.default = true;
 CREATE database druid_test_dst;

diff --git a/ql/src/test/queries/clientpositive/druidkafkamini_avro.q b/ql/src/test/queries/clientpositive/druidkafkamini_avro.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 SET hive.vectorized.execution.enabled=false;
 
 CREATE EXTERNAL TABLE druid_kafka_test_avro(`__time` timestamp , `page` string, `user` string, `language` string,

diff --git a/ql/src/test/queries/clientpositive/druidkafkamini_csv.q b/ql/src/test/queries/clientpositive/druidkafkamini_csv.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 SET hive.vectorized.execution.enabled=false;
 
 CREATE EXTERNAL TABLE druid_kafka_test_csv(`__time` timestamp , `page` string, `user` string, `language` string,

diff --git a/ql/src/test/queries/clientpositive/druidmini_extractTime.q b/ql/src/test/queries/clientpositive/druidmini_extractTime.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:druid_table_alltypesorc
 SET hive.vectorized.execution.enabled=true ;
 SET hive.ctas.external.tables=true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_floorTime.q b/ql/src/test/queries/clientpositive/druidmini_floorTime.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:druid_table_alltypesorc
 SET hive.vectorized.execution.enabled=true ;
 SET hive.ctas.external.tables=true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_mv.q b/ql/src/test/queries/clientpositive/druidmini_mv.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 -- SORT_QUERY_RESULTS
 
 set hive.support.concurrency=true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_semijoin_reduction_all_types.q b/ql/src/test/queries/clientpositive/druidmini_semijoin_reduction_all_types.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:srcpart
 --! qt:dataset:druid_table_alltypesorc
 --! qt:dataset:alltypesorc

diff --git a/ql/src/test/queries/clientpositive/druidmini_test1.q b/ql/src/test/queries/clientpositive/druidmini_test1.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:druid_table_alltypesorc
 SET hive.ctas.external.tables=true;
 SET hive.vectorized.execution.enabled=true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_test_alter.q b/ql/src/test/queries/clientpositive/druidmini_test_alter.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:alltypesorc
 SET hive.ctas.external.tables=true;
 SET hive.external.table.purge.default = true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_test_insert.q b/ql/src/test/queries/clientpositive/druidmini_test_insert.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:alltypesorc
 SET hive.ctas.external.tables=true;
 SET hive.external.table.purge.default = true;

diff --git a/ql/src/test/queries/clientpositive/druidmini_test_ts.q b/ql/src/test/queries/clientpositive/druidmini_test_ts.q
@@ -1,3 +1,4 @@
+--! qt:disabled:HIVE-24816
 --! qt:dataset:druid_table_alltypesorc
 
 -- Time Series Query

diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
@@ -82,7 +82,7 @@
     <guava.version>19.0</guava.version>
     <hadoop.version>3.1.0</hadoop.version>
     <hikaricp.version>2.6.1</hikaricp.version>
-    <jackson.version>2.10.5</jackson.version>
+    <jackson.version>2.12.0</jackson.version>
     <javolution.version>5.5.1</javolution.version>
     <junit.version>4.13</junit.version>
     <junit.jupiter.version>5.6.2</junit.jupiter.version>

diff --git a/testutils/ptest2/conf/deployed/master-mr2.properties b/testutils/ptest2/conf/deployed/master-mr2.properties
@@ -205,6 +205,7 @@ qFileTest.miniDruidKafka.batchSize = 15
 qFileTest.miniDruidKafka.queryFilesProperty = qfile
 qFileTest.miniDruidKafka.include = normal
 qFileTest.miniDruidKafka.groups.normal = mainProperties.${druid.kafka.query.files}
+qFileTest.miniDruidKafka.groups.flaky = druidkafkamini_avro.q druidkafkamini_csv.q druid_timestamptz2.q druidmini_extractTime.q druidmini_floorTime.q druidmini_mv.q druidmini_semijoin_reduction_all_types.q druidmini_test1.q druidmini_test_alter.q druidmini_test_insert.q druidmini_test_ts.q druidmini_expressions.q druidmini_joins.q druidmini_masking.q
 
 qFileTest.miniKafka.driver = TestMiniHiveKafkaCliDriver
 qFileTest.miniKafka.directory = ql/src/test/queries/clientpositive

diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <jclouds.version>2.1.3</jclouds.version>
     <checkstyle.conf.dir>${basedir}/../../checkstyle/</checkstyle.conf.dir>
     <maven.checkstyle.plugin.version>2.12.1</maven.checkstyle.plugin.version>
-    <jackson.version>2.10.5</jackson.version>
+    <jackson.version>2.12.0</jackson.version>
   </properties>
 
   <repositories>