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/03fc3314 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/03fc3314 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/03fc3314 Branch: refs/heads/system-catalog Commit: 03fc3314219f364bf91dd09921e51ecf94a41aff Parents: 4944081 Author: James Taylor <jtay...@salesforce.com> Authored: Sat Nov 18 11:31:46 2017 -0800 Committer: James Taylor <jtay...@salesforce.com> Committed: Sat Nov 18 11:31:46 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/03fc3314/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index fbda221..c90946a 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -474,6 +474,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/03fc3314/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index e67927e..e0baeb1 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/03fc3314/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2327c80..7b6b052 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,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> @@ -930,7 +931,7 @@ <dependency> <groupId>com.salesforce.i18n</groupId> <artifactId>i18n-util</artifactId> - <version>1.0.1</version> + <version>${i18n-util.version}</version> </dependency> </dependencies> </dependencyManagement>
