You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ss...@apache.org on 2016/05/27 07:54:57 UTC

[4/4] phoenix git commit: PHOENIX-2936 Missing antlr runtime on server side after PHOENIX-2908

PHOENIX-2936 Missing antlr runtime on server side after PHOENIX-2908


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e3f70785
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e3f70785
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e3f70785

Branch: refs/heads/4.x-HBase-1.1
Commit: e3f70785acc4705bc7b8bac9e345bb77b5a68f76
Parents: 05dc0e3
Author: Sergey Soldatov <ss...@apache.org>
Authored: Thu May 26 12:59:31 2016 -0700
Committer: Sergey Soldatov <ss...@apache.org>
Committed: Fri May 27 00:54:33 2016 -0700

----------------------------------------------------------------------
 phoenix-assembly/src/build/components/all-common-dependencies.xml | 1 +
 phoenix-assembly/src/build/server.xml                             | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3f70785/phoenix-assembly/src/build/components/all-common-dependencies.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 39f3541..336bc4d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -40,6 +40,7 @@
         <include>org.apache.zookeeper:zookeeper</include>
         <include>log4j:log4j</include>
         <include>org.apache.hbase:hbase*</include>
+        <include>org.antlr:antlr-runtime</include>
         <include>org.cloudera.htrace:htrace-core</include>
         <include>io.netty:netty</include>
         <include>commons-codec:commons-codec</include>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3f70785/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index c4e9d77..fe784e9 100644
--- a/phoenix-assembly/src/build/server.xml
+++ b/phoenix-assembly/src/build/server.xml
@@ -36,6 +36,7 @@
       <includes>
         <include>org.apache.phoenix:phoenix-core</include>
         <include>org.iq80.snappy:snappy</include>
+	<include>org.antlr:antlr*</include>
         <include>org.apache.tephra:tephra*</include>
         <include>com.google.code.gson:gson</include>
         <include>org.jruby.joni:joni</include>