You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/02/28 03:17:48 UTC
git commit: update pom file for hadoop.profile=2.0
Repository: incubator-phoenix
Updated Branches:
refs/heads/4.0 3112eec29 -> 0eab977a8
update pom file for hadoop.profile=2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/0eab977a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/0eab977a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/0eab977a
Branch: refs/heads/4.0
Commit: 0eab977a84ddc6491a33b21066b79d6c59e37753
Parents: 3112eec
Author: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Authored: Thu Feb 27 18:19:28 2014 -0800
Committer: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Committed: Thu Feb 27 18:19:28 2014 -0800
----------------------------------------------------------------------
phoenix-assembly/src/build/all.xml | 14 +++++++
phoenix-core/pom.xml | 73 ++++++++++++++++++++++++++++++++-
pom.xml | 11 -----
3 files changed, 86 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/0eab977a/phoenix-assembly/src/build/all.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/all.xml b/phoenix-assembly/src/build/all.xml
index 8660610..9974db6 100644
--- a/phoenix-assembly/src/build/all.xml
+++ b/phoenix-assembly/src/build/all.xml
@@ -65,8 +65,22 @@
<fileSet>
<directory>${project.basedir}/../bin</directory>
<outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.py</include>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>*.py/</exclude>
+ <exclude>*.sh/</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../dev</directory>
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/0eab977a/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 000dcb1..781fca3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -267,7 +267,35 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.high-scale-lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.yammer.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>2.1.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cloudera.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>2.04</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>3.2.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -374,6 +402,12 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
<artifactId>hbase-protocol</artifactId>
<version>${hbase-hadoop2.version}</version>
</dependency>
@@ -383,6 +417,43 @@
<version>${hbase-hadoop2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/0eab977a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7524d3..22cedb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,17 +32,6 @@
<repositories>
<repository>
- <id>codehaus</id>
- <name>Codehaus Public</name>
- <url>http://repository.codehaus.org/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
<id>apache release</id>
<url>https://repository.apache.org/content/repositories/releases/</url>
</repository>