Repository: incubator-systemml Updated Branches: refs/heads/master 38d087a76 -> 61a6dcb08
[SYSTEMML-922] Upgrade to latest ANTLR Changed build properties to use ANTRL 4.5.3 released March 2016. Fixed reserved name SKIP conflict in Pydml grammar with ANTLR versions above 4.5. Removed antrl4-annotations references and updated LICENSE files. Closes #243. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/61a6dcb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/61a6dcb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/61a6dcb0 Branch: refs/heads/master Commit: 61a6dcb08f780ae729deb176157be82ea8bdc9c2 Parents: 38d087a Author: Glenn Weidner <gweid...@us.ibm.com> Authored: Wed Sep 21 18:03:10 2016 -0700 Committer: Glenn Weidner <gweid...@us.ibm.com> Committed: Wed Sep 21 18:03:10 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- src/assembly/distrib/LICENSE | 3 +-- src/assembly/inmemory/LICENSE | 3 +-- src/assembly/jar/LICENSE | 3 +-- src/assembly/standalone-jar/LICENSE | 5 ++--- src/assembly/standalone.xml | 1 - src/assembly/standalone/LICENSE | 5 ++--- src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 | 2 +- 8 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6e51e2..312300e 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ <properties> <hadoop.version>2.4.1</hadoop.version> - <antlr.version>4.3</antlr.version> + <antlr.version>4.5.3</antlr.version> <spark.version>1.4.1</spark.version> <scala.version>2.10.5</scala.version> <scala.binary.version>2.10</scala.binary.version> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/distrib/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/distrib/LICENSE b/src/assembly/distrib/LICENSE index be745d4..f497915 100644 --- a/src/assembly/distrib/LICENSE +++ b/src/assembly/distrib/LICENSE @@ -210,8 +210,7 @@ Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink: The following compile-scope ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.3 +ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.5.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/inmemory/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/inmemory/LICENSE b/src/assembly/inmemory/LICENSE index c9b68d6..8bda9ec 100644 --- a/src/assembly/inmemory/LICENSE +++ b/src/assembly/inmemory/LICENSE @@ -221,8 +221,7 @@ org.apache.wink:wink-json4j:1.4 The following ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.3 +ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.5.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/jar/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/jar/LICENSE b/src/assembly/jar/LICENSE index be745d4..f497915 100644 --- a/src/assembly/jar/LICENSE +++ b/src/assembly/jar/LICENSE @@ -210,8 +210,7 @@ Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink: The following compile-scope ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.3 +ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.5.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/standalone-jar/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/standalone-jar/LICENSE b/src/assembly/standalone-jar/LICENSE index a7312d6..f043a39 100644 --- a/src/assembly/standalone-jar/LICENSE +++ b/src/assembly/standalone-jar/LICENSE @@ -239,9 +239,8 @@ org.apache.wink:wink-json4j:1.4 The following ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Tool (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.3 +ANTLR 4 Tool (http://www.antlr.org) org.antlr:antlr4:4.5.3 +ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.5.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/standalone.xml ---------------------------------------------------------------------- diff --git a/src/assembly/standalone.xml b/src/assembly/standalone.xml index a517a50..687f9be 100644 --- a/src/assembly/standalone.xml +++ b/src/assembly/standalone.xml @@ -107,7 +107,6 @@ <excludes> <exclude>*:${artifactId}*</exclude> <!-- exclude from base dir --> <!-- Exclude compile-scoped dependencies since they are in main artifact jar --> - <exclude>*:antlr4-annotations*</exclude> <exclude>*:antlr4-runtime*</exclude> <exclude>*:org.abego.treelayout.core*</exclude> <exclude>*:wink-json4j*</exclude> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/assembly/standalone/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/standalone/LICENSE b/src/assembly/standalone/LICENSE index 5c2f8c9..a7cb520 100644 --- a/src/assembly/standalone/LICENSE +++ b/src/assembly/standalone/LICENSE @@ -247,9 +247,8 @@ winutils.pdb The following ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Tool (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 (antlr4-4.3.jar) -ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 -ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.3 +ANTLR 4 Tool (http://www.antlr.org) org.antlr:antlr4:4.5.3 (antlr4-4.5.3.jar) +ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.5.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/61a6dcb0/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 b/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 index f07f854..7471f30 100644 --- a/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 +++ b/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 @@ -404,4 +404,4 @@ NEWLINE : ( '\r'? '\n' | '\r' ) SPACES? } ; -SKIP : ( SPACES | COMMENT | LINE_JOINING ) -> skip ; +SKIP_WS : ( SPACES | COMMENT | LINE_JOINING ) -> skip ;
