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/20 15:54:56 UTC
[4/4] phoenix git commit: PHOENIX-2908 phoenix-core depends on both
antlr 3.5 and antlr 2.7.7 (William Yang)
PHOENIX-2908 phoenix-core depends on both antlr 3.5 and antlr 2.7.7 (William Yang)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cdab93a2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cdab93a2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cdab93a2
Branch: refs/heads/4.x-HBase-1.1
Commit: cdab93a2d7f306d0a1154238e41d7b2832f8648a
Parents: ff13a9e
Author: Sergey Soldatov <ss...@apache.org>
Authored: Fri May 20 08:51:33 2016 -0700
Committer: Sergey Soldatov <ss...@apache.org>
Committed: Fri May 20 08:52:46 2016 -0700
----------------------------------------------------------------------
.../src/build/components/all-common-dependencies.xml | 1 -
phoenix-assembly/src/build/server.xml | 1 -
phoenix-core/pom.xml | 4 ----
pom.xml | 5 -----
4 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdab93a2/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 2cc7a9d..39f3541 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -40,7 +40,6 @@
<include>org.apache.zookeeper:zookeeper</include>
<include>log4j:log4j</include>
<include>org.apache.hbase:hbase*</include>
- <include>org.antlr:antlr</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/cdab93a2/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index fe784e9..c4e9d77 100644
--- a/phoenix-assembly/src/build/server.xml
+++ b/phoenix-assembly/src/build/server.xml
@@ -36,7 +36,6 @@
<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>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdab93a2/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e183d11..f5d3885 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -245,10 +245,6 @@
<!-- Make sure we have all the antlr dependencies -->
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdab93a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aad318b..4894afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -729,11 +729,6 @@
<!-- Make sure we have all the antlr dependencies -->
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>${antlr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>${antlr.version}</version>
</dependency>