You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/11/18 19:54:19 UTC
[2/3] phoenix git commit: PHOENIX-4384 Phoenix server jar doesn't
include icu4j jars (Shehzaad Nakhoda)
PHOENIX-4384 Phoenix server jar doesn't include icu4j jars (Shehzaad Nakhoda)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cd773064
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cd773064
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cd773064
Branch: refs/heads/4.13-HBase-0.98
Commit: cd773064360cc64bae95ec15e0d5371312d1e02b
Parents: 8fc92cb
Author: James Taylor <jt...@salesforce.com>
Authored: Sat Nov 18 11:31:46 2017 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Sat Nov 18 11:53:05 2017 -0800
----------------------------------------------------------------------
phoenix-core/pom.xml | 1 +
phoenix-server/pom.xml | 3 +++
pom.xml | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cd773064/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9fb11b3..553cdd9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -473,6 +473,7 @@
<dependency>
<groupId>com.salesforce.i18n</groupId>
<artifactId>i18n-util</artifactId>
+ <version>${i18n-util.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cd773064/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index ff67cbd..b1194f7 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -135,6 +135,9 @@
<include>org.apache.thrift:libthrift</include>
<include>com.clearspring.analytics:stream</include>
<include>com.salesforce.i18n:i18n-util</include>
+ <include>com.ibm.icu:icu4j</include>
+ <include>com.ibm.icu:icu4j-charset</include>
+ <include>com.ibm.icu:icu4j-localespi</include>
</includes>
<excludes>
<exclude>org.apache.phoenix:phoenix-server</exclude>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cd773064/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4b92cd8..0b6dad5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<stream.version>2.9.5</stream.version>
+ <i18n-util.version>1.0.1</i18n-util.version>
<!-- Test Dependencies -->
<mockito-all.version>1.8.5</mockito-all.version>
<junit.version>4.12</junit.version>
@@ -910,7 +911,7 @@
<dependency>
<groupId>com.salesforce.i18n</groupId>
<artifactId>i18n-util</artifactId>
- <version>1.0.1</version>
+ <version>${i18n-util.version}</version>
</dependency>
</dependencies>
</dependencyManagement>