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/64be3a3d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/64be3a3d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/64be3a3d Branch: refs/heads/4.x-HBase-1.0 Commit: 64be3a3d44ecec7f0c9970c4765fc5a4ccec3477 Parents: 2c3b2dc Author: Sergey Soldatov <s...@apache.org> Authored: Fri May 20 08:51:33 2016 -0700 Committer: Sergey Soldatov <s...@apache.org> Committed: Fri May 20 08:52:24 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/64be3a3d/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/64be3a3d/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/64be3a3d/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 73b0ad9..43889a6 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/64be3a3d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a3eae9f..6d5dea6 100644 --- a/pom.xml +++ b/pom.xml @@ -690,11 +690,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>
