You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by mu...@apache.org on 2014/07/29 21:11:38 UTC
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 <mu...@apache.org>
Authored: Tue Jul 29 12:11:26 2014 -0700
Committer: Mujtaba <mu...@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>
<id>hadoop-1</id>
<activation>
<property>
- <name>hadoop.profile</name>
- <value>1</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>
<id>hadoop-2</id>
<activation>
<property>
- <name>!hadoop.profile</name>
+ <name>hadoop.profile</name>
+ <value>2</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 @@
<name>Phoenix - Flume</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
</dependency>
@@ -46,6 +46,7 @@
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
</dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-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>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
<version>${hbase-hadoop1.version}</version>
@@ -172,6 +173,11 @@
</activation>
<dependencies>
<dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <classifier>h2</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-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 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,11 +432,6 @@
<version>${antlr.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- <version>${pig.version}</version>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.11</version>
@@ -551,14 +546,14 @@
<profiles>
+
<!-- Profile for building against Hadoop 1. Active by default. Not used
if another Hadoop profile is specified with mvn -Dhadoop.profile=foo -->
<profile>
<id>hadoop-1</id>
<activation>
<property>
- <name>hadoop.profile</name>
- <value>1</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<modules>
@@ -644,16 +639,22 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>${pig.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</profile>
- <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2 -->
+ <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2 -->
<profile>
<id>hadoop-2</id>
<activation>
<property>
- <name>!hadoop.profile</name>
+ <name>hadoop.profile</name>
+ <value>2</value>
</property>
</activation>
<modules>
@@ -692,11 +693,6 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase-hadoop2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
<artifactId>hbase-protocol</artifactId>
<version>${hbase-hadoop2.version}</version>
</dependency>
@@ -741,6 +737,12 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>${pig.version}</version>
+ <classifier>h2</classifier>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>