From ab1e71f5b513b4bebcd9e7d092342d5b859c4848 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Thu, 4 Dec 2014 11:46:54 -0800 Subject: [PATCH] HIVE-8809 Activate maven profile hadoop-2 by default --- accumulo-handler/pom.xml | 11 +++++++++++ beeline/pom.xml | 11 +++++++++++ cli/pom.xml | 11 +++++++++++ common/pom.xml | 11 +++++++++++ contrib/pom.xml | 11 +++++++++++ hbase-handler/pom.xml | 11 +++++++++++ hcatalog/core/pom.xml | 5 +++++ hcatalog/hcatalog-pig-adapter/pom.xml | 11 +++++++++++ hcatalog/pom.xml | 11 +++++++++++ hcatalog/server-extensions/pom.xml | 11 +++++++++++ hcatalog/streaming/pom.xml | 11 +++++++++++ hcatalog/webhcat/java-client/pom.xml | 11 +++++++++++ hcatalog/webhcat/svr/pom.xml | 11 +++++++++++ hwi/pom.xml | 11 +++++++++++ itests/custom-serde/pom.xml | 11 +++++++++++ itests/hcatalog-unit/pom.xml | 11 +++++++++++ itests/hive-minikdc/pom.xml | 11 +++++++++++ itests/hive-unit/pom.xml | 11 +++++++++++ itests/pom.xml | 5 +++++ itests/qtest/pom.xml | 11 +++++++++++ itests/test-serde/pom.xml | 11 +++++++++++ itests/util/pom.xml | 11 +++++++++++ jdbc/pom.xml | 11 +++++++++++ metastore/pom.xml | 11 +++++++++++ pom.xml | 11 +++++++++++ ql/pom.xml | 11 +++++++++++ serde/pom.xml | 11 +++++++++++ service/pom.xml | 11 +++++++++++ 28 files changed, 296 insertions(+) diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml index f14683a..8573312 100644 --- a/accumulo-handler/pom.xml +++ b/accumulo-handler/pom.xml @@ -109,6 +109,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -126,6 +132,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/beeline/pom.xml b/beeline/pom.xml index dcedf74..7f1c02a 100644 --- a/beeline/pom.xml +++ b/beeline/pom.xml @@ -116,6 +116,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -127,6 +133,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/cli/pom.xml b/cli/pom.xml index 4b92bc2..9e16b59 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -114,6 +114,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -131,6 +137,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/common/pom.xml b/common/pom.xml index 4ec5469..ce6d6b5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -88,6 +88,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -99,6 +105,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/contrib/pom.xml b/contrib/pom.xml index a1a1c9b..bf2d8f7 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -72,6 +72,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -83,6 +89,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml index d55ec5a..cdd3612 100644 --- a/hbase-handler/pom.xml +++ b/hbase-handler/pom.xml @@ -67,6 +67,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -136,6 +142,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 8acb02f..f5d4e53 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -111,6 +111,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index 53a55dc..8f742df 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -72,6 +72,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -94,6 +100,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml index b393795..5d91bab 100644 --- a/hcatalog/pom.xml +++ b/hcatalog/pom.xml @@ -58,6 +58,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -75,6 +81,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml index 14c0d52..05f7366 100644 --- a/hcatalog/server-extensions/pom.xml +++ b/hcatalog/server-extensions/pom.xml @@ -100,6 +100,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -110,6 +116,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/streaming/pom.xml b/hcatalog/streaming/pom.xml index e653d39..b3105be 100644 --- a/hcatalog/streaming/pom.xml +++ b/hcatalog/streaming/pom.xml @@ -35,6 +35,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -45,6 +51,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index 48f63e4..c892340 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -65,6 +65,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -75,6 +81,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 4969708..fd9f8a0 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -115,6 +115,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -125,6 +131,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/hwi/pom.xml b/hwi/pom.xml index 5db62bb..3995805 100644 --- a/hwi/pom.xml +++ b/hwi/pom.xml @@ -91,6 +91,12 @@ hadoop-1 + + + hadoop.profile + 1 + + @@ -103,6 +109,11 @@ hadoop-2 + + + !hadoop.profile + + diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml index 6ddc180..4725817 100644 --- a/itests/custom-serde/pom.xml +++ b/itests/custom-serde/pom.xml @@ -44,6 +44,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -55,6 +61,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index fabaa94..71d9b5e 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -107,6 +107,12 @@ hadoop-1 + + + hadoop.profile + 1 + + @@ -203,6 +209,11 @@ hadoop-2 + + + !hadoop.profile + + diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index f2576bd..ac92eb9 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -134,6 +134,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -214,6 +220,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index f9f59c9..c1152f6 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -126,6 +126,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -205,6 +211,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/itests/pom.xml b/itests/pom.xml index 0a154d6..1552d6e 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -43,6 +43,11 @@ hadoop-2 + + + !hadoop.profile + + hive-unit-hadoop2 hive-minikdc diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index a6a7547..a0a7b1b 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -119,6 +119,12 @@ hadoop-1 + + + hadoop.profile + 1 + + ${hadoop-20S.version} -mkdir @@ -198,6 +204,11 @@ hadoop-2 + + + !hadoop.profile + + ${hadoop-23.version} -mkdir -p diff --git a/itests/test-serde/pom.xml b/itests/test-serde/pom.xml index c0135fc..d29dfba 100644 --- a/itests/test-serde/pom.xml +++ b/itests/test-serde/pom.xml @@ -45,6 +45,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -56,6 +62,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/itests/util/pom.xml b/itests/util/pom.xml index 891f391..d545106 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -97,6 +97,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -133,6 +139,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 6385093..cf4edd0 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -108,6 +108,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -119,6 +125,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/metastore/pom.xml b/metastore/pom.xml index 948f22c..c5c3877 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -139,6 +139,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -150,6 +156,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/pom.xml b/pom.xml index 630b10c..e89ae26 100644 --- a/pom.xml +++ b/pom.xml @@ -1008,6 +1008,12 @@ hadoop-1 + + + hadoop.profile + 1 + + @@ -1055,6 +1061,11 @@ hadoop-2 + + + !hadoop.profile + + diff --git a/ql/pom.xml b/ql/pom.xml index 670514e..dbe6c6f 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -415,6 +415,12 @@ hadoop-1 + + + hadoop.profile + 1 + + @@ -440,6 +446,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/serde/pom.xml b/serde/pom.xml index 8c60b30..2ff2f4f 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -111,6 +111,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -128,6 +134,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop diff --git a/service/pom.xml b/service/pom.xml index b9d3a40..a802c36 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -111,6 +111,12 @@ hadoop-1 + + + hadoop.profile + 1 + + org.apache.hadoop @@ -122,6 +128,11 @@ hadoop-2 + + + !hadoop.profile + + org.apache.hadoop -- 1.9.3 (Apple Git-50)