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 2015/04/15 09:41:46 UTC
phoenix git commit: PHOENIX-1867 Add joni library to server assembly
files (Shuxiong Ye)
Repository: phoenix
Updated Branches:
refs/heads/master b0c28a2de -> 295225060
PHOENIX-1867 Add joni library to server assembly files (Shuxiong Ye)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/29522506
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/29522506
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/29522506
Branch: refs/heads/master
Commit: 295225060535d3030789a13817d55040b3db99de
Parents: b0c28a2
Author: James Taylor <jt...@salesforce.com>
Authored: Wed Apr 15 00:38:45 2015 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Apr 15 00:38:45 2015 -0700
----------------------------------------------------------------------
phoenix-assembly/src/build/server-without-antlr.xml | 2 ++
phoenix-assembly/src/build/server.xml | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/29522506/phoenix-assembly/src/build/server-without-antlr.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server-without-antlr.xml b/phoenix-assembly/src/build/server-without-antlr.xml
index 1750d1c..072ade0 100644
--- a/phoenix-assembly/src/build/server-without-antlr.xml
+++ b/phoenix-assembly/src/build/server-without-antlr.xml
@@ -36,6 +36,8 @@
<includes>
<include>org.apache.phoenix:phoenix-core</include>
<include>org.iq80.snappy:snappy</include>
+ <include>org.jruby.joni:joni</include>
+ <include>org.jruby.jcodings:jcodings</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/29522506/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index 5ec2106..12d3d81 100644
--- a/phoenix-assembly/src/build/server.xml
+++ b/phoenix-assembly/src/build/server.xml
@@ -36,6 +36,8 @@
<includes>
<include>org.apache.phoenix:phoenix-core</include>
<include>org.iq80.snappy:snappy</include>
+ <include>org.jruby.joni:joni</include>
+ <include>org.jruby.jcodings:jcodings</include>
</includes>
</dependencySet>
<dependencySet>