Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 07b6158ea -> 5f5b6fbe4 refs/heads/4.x-HBase-1.0 2c3b2dc02 -> 64be3a3d4 refs/heads/4.x-HBase-1.1 ff13a9e81 -> cdab93a2d refs/heads/master d517da91b -> 8445d0206
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/8445d020 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8445d020 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8445d020 Branch: refs/heads/master Commit: 8445d020622f40201aaa97cca83c2c2c5115152b Parents: d517da9 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:51:33 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/8445d020/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/8445d020/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/8445d020/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index bfdaae9..2b1f4c2 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/8445d020/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 78fbff3..69f7591 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>
