Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9324cd0c5 -> 7b83334f3
cassandra-7028 upgraded to antlr-3.5.2 and pulled in a hard org.antlr#stringtemplate dependency. But antlr recursively pulls in an org.antlr#ST4 jar which is a complete duplicate of stringtemplate. So stringtemplate.jar and ST4.jar provide duplicate sets of package/classes, which could cause problems. Switch to only use ST4, as the normal recursive dependency brings in. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b83334f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b83334f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b83334f Branch: refs/heads/cassandra-2.1 Commit: 7b83334f30d28d6f525a472021018b3bb33eea0a Parents: 9324cd0 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Apr 8 23:12:37 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Apr 8 23:12:37 2015 -0400 ---------------------------------------------------------------------- build.xml | 16 +++++++++------- lib/ST4-4.0.8.jar | Bin 0 -> 239543 bytes lib/licenses/ST4-4.0.8.txt | 27 +++++++++++++++++++++++++++ lib/licenses/stringtemplate-4.0.2.txt | 27 --------------------------- lib/stringtemplate-4.0.2.jar | Bin 226406 -> 0 bytes 5 files changed, 36 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b83334f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 9744564..6eb45d4 100644 --- a/build.xml +++ b/build.xml @@ -195,7 +195,7 @@ <target name="gen-cli-grammar" depends="check-gen-cli-grammar" unless="cliUpToDate"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cli/Cli.g ....</echo> <java classname="org.antlr.Tool" - classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar" + classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/ST4-4.0.8.jar" fork="true" failonerror="true"> <jvmarg value="-Xmx512M" /> @@ -222,7 +222,7 @@ <target name="gen-cql2-grammar" depends="check-gen-cql2-grammar" unless="cql2current"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql/Cql.g ...</echo> <java classname="org.antlr.Tool" - classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar" + classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/ST4-4.0.8.jar" fork="true" failonerror="true"> <jvmarg value="-Xmx512M" /> @@ -234,7 +234,7 @@ <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ...</echo> <java classname="org.antlr.Tool" - classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar" + classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/ST4-4.0.8.jar" fork="true" failonerror="true"> <jvmarg value="-Xmx512M" /> @@ -357,9 +357,12 @@ <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/> <dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/> <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/> - <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/> - <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/> - <dependency groupId="org.antlr" artifactId="stringtemplate" version="4.0.2"/> + <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"> + <exclusion groupId="org.antlr" artifactId="stringtemplate"/> + </dependency> + <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"> + <exclusion groupId="org.antlr" artifactId="stringtemplate"/> + </dependency> <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/> <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/> @@ -490,7 +493,6 @@ <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru"/> <dependency groupId="org.antlr" artifactId="antlr"/> <dependency groupId="org.antlr" artifactId="antlr-runtime"/> - <dependency groupId="org.antlr" artifactId="stringtemplate" version="4.0.2"/> <dependency groupId="org.slf4j" artifactId="slf4j-api"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b83334f/lib/ST4-4.0.8.jar ---------------------------------------------------------------------- diff --git a/lib/ST4-4.0.8.jar b/lib/ST4-4.0.8.jar new file mode 100644 index 0000000..144828b Binary files /dev/null and b/lib/ST4-4.0.8.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b83334f/lib/licenses/ST4-4.0.8.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/ST4-4.0.8.txt b/lib/licenses/ST4-4.0.8.txt new file mode 100644 index 0000000..015a53d --- /dev/null +++ b/lib/licenses/ST4-4.0.8.txt @@ -0,0 +1,27 @@ + +Copyright (c) 2003-2006 Terence Parr +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b83334f/lib/licenses/stringtemplate-4.0.2.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/stringtemplate-4.0.2.txt b/lib/licenses/stringtemplate-4.0.2.txt deleted file mode 100644 index 015a53d..0000000 --- a/lib/licenses/stringtemplate-4.0.2.txt +++ /dev/null @@ -1,27 +0,0 @@ - -Copyright (c) 2003-2006 Terence Parr -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b83334f/lib/stringtemplate-4.0.2.jar ---------------------------------------------------------------------- diff --git a/lib/stringtemplate-4.0.2.jar b/lib/stringtemplate-4.0.2.jar deleted file mode 100644 index 87d7faf..0000000 Binary files a/lib/stringtemplate-4.0.2.jar and /dev/null differ
