git commit: PHOENIX-1128 Fix build errors introduced by switch to hadoop2 as default profile (GabrielReid)
Repository: phoenix
Updated Branches:
refs/heads/4.0 aba5ea906 - 632624e08
PHOENIX-1128 Fix build errors introduced by switch to hadoop2 as default
profile (GabrielReid)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/632624e0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/632624e0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/632624e0
Branch: refs/heads/4.0
Commit: 632624e0821814da8d61ab9a3b38ea2ae5bab946
Parents: aba5ea9
Author: Mujtaba mujt...@apache.org
Authored: Tue Jul 29 12:11:26 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Tue Jul 29 12:11:26 2014 -0700
--
phoenix-core/pom.xml | 13 +++--
phoenix-flume/pom.xml | 4 +++-
phoenix-pig/pom.xml | 14 ++
pom.xml | 30 --
4 files changed, 36 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/632624e0/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index af6dcb6..48e7fc2 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -303,13 +303,14 @@
/dependencies
profiles
-!-- Profile for building against Hadoop 1. Activate using: mvn
-Dhadoop.profile=1--
+
+!-- Profile for building against Hadoop 1. Active by default. Not used
if another
+ Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
idhadoop-1/id
activation
property
- namehadoop.profile/name
- value1/value
+ name!hadoop.profile/name
/property
/activation
dependencies
@@ -387,13 +388,13 @@
/dependencies
/profile
-!-- Profile for building against Hadoop 2. Active by default. Not used
if another
- Hadoop profile is specified with mvn -Dhadoop.profile=foo --
+!-- Profile for building against Hadoop 2. Activate using: mvn
-Dhadoop.profile=2--
profile
idhadoop-2/id
activation
property
- name!hadoop.profile/name
+ namehadoop.profile/name
+ value2/value
/property
/activation
dependencies
http://git-wip-us.apache.org/repos/asf/phoenix/blob/632624e0/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index ea368c7..75aa51d 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -32,7 +32,7 @@
namePhoenix - Flume/name
dependencies
-dependency
+ dependency
groupIdorg.apache.phoenix/groupId
artifactIdphoenix-core/artifactId
/dependency
@@ -46,6 +46,7 @@
groupIdorg.apache.flume/groupId
artifactIdflume-ng-core/artifactId
/dependency
+
!-- Test Dependencies --
dependency
groupIdjunit/groupId
@@ -97,6 +98,7 @@
/build
profiles
+
!-- Profile for building against Hadoop 1. Active by default. Not used if
another
Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
http://git-wip-us.apache.org/repos/asf/phoenix/blob/632624e0/phoenix-pig/pom.xml
--
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index 07a76a0..a08453c 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -43,10 +43,6 @@
scopetest/scope
/dependency
dependency
- groupIdorg.apache.pig/groupId
- artifactIdpig/artifactId
-/dependency
-dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
/dependency
@@ -75,6 +71,7 @@
/build
profiles
+
!-- Profile for building against Hadoop 1. Active by default. Not used if
another
Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
@@ -86,6 +83,10 @@
/activation
dependencies
dependency
+ groupIdorg.apache.pig/groupId
+ artifactIdpig/artifactId
+/dependency
+dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
version${hbase-hadoop1.version}/version
@@ -172,6 +173,11 @@
/activation
dependencies
dependency
+ groupIdorg.apache.pig/groupId
+ artifactIdpig/artifactId
+ classifierh2/classifier
+/dependency
+dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
version${hbase-hadoop2.version}/version
http://git-wip-us.apache.org/repos/asf/phoenix/blob/632624e0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1f63680..77765cc
git commit: PHOENIX-1128 Fix build errors introduced by switch to hadoop2 as default profile (GabrielReid)
Repository: phoenix
Updated Branches:
refs/heads/master bc384e7e0 - 7d2608d22
PHOENIX-1128 Fix build errors introduced by switch to hadoop2 as default
profile (GabrielReid)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7d2608d2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7d2608d2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7d2608d2
Branch: refs/heads/master
Commit: 7d2608d227f3fca1032199dda302da9904ed091d
Parents: bc384e7
Author: Mujtaba mujt...@apache.org
Authored: Tue Jul 29 12:13:25 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Tue Jul 29 12:13:25 2014 -0700
--
phoenix-core/pom.xml | 13 +++--
phoenix-flume/pom.xml | 4 +++-
phoenix-pig/pom.xml | 14 ++
pom.xml | 30 --
4 files changed, 36 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d2608d2/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index cfdee95..46125b6 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -303,13 +303,14 @@
/dependencies
profiles
-!-- Profile for building against Hadoop 1. Activate using: mvn
-Dhadoop.profile=1--
+
+!-- Profile for building against Hadoop 1. Active by default. Not used
if another
+ Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
idhadoop-1/id
activation
property
- namehadoop.profile/name
- value1/value
+ name!hadoop.profile/name
/property
/activation
dependencies
@@ -387,13 +388,13 @@
/dependencies
/profile
-!-- Profile for building against Hadoop 2. Active by default. Not used
if another
- Hadoop profile is specified with mvn -Dhadoop.profile=foo --
+!-- Profile for building against Hadoop 2. Activate using: mvn
-Dhadoop.profile=2--
profile
idhadoop-2/id
activation
property
- name!hadoop.profile/name
+ namehadoop.profile/name
+ value2/value
/property
/activation
dependencies
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d2608d2/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index 5e9fd2f..d1bf843 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -32,7 +32,7 @@
namePhoenix - Flume/name
dependencies
-dependency
+ dependency
groupIdorg.apache.phoenix/groupId
artifactIdphoenix-core/artifactId
/dependency
@@ -46,6 +46,7 @@
groupIdorg.apache.flume/groupId
artifactIdflume-ng-core/artifactId
/dependency
+
!-- Test Dependencies --
dependency
groupIdjunit/groupId
@@ -97,6 +98,7 @@
/build
profiles
+
!-- Profile for building against Hadoop 1. Active by default. Not used if
another
Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d2608d2/phoenix-pig/pom.xml
--
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index 53faa09..f1bb637 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -43,10 +43,6 @@
scopetest/scope
/dependency
dependency
- groupIdorg.apache.pig/groupId
- artifactIdpig/artifactId
-/dependency
-dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
/dependency
@@ -75,6 +71,7 @@
/build
profiles
+
!-- Profile for building against Hadoop 1. Active by default. Not used if
another
Hadoop profile is specified with mvn -Dhadoop.profile=foo --
profile
@@ -86,6 +83,10 @@
/activation
dependencies
dependency
+ groupIdorg.apache.pig/groupId
+ artifactIdpig/artifactId
+/dependency
+dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
version${hbase-hadoop1.version}/version
@@ -172,6 +173,11 @@
/activation
dependencies
dependency
+ groupIdorg.apache.pig/groupId
+ artifactIdpig/artifactId
+ classifierh2/classifier
+/dependency
+dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
version${hbase-hadoop2.version}/version
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d2608d2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index
