ctf: Use Antlr 3.5.2 for parser generation only

This change keeps the Antlr rutime at the same version (3.2)
but upgrades to 3.5.2 at the parser generation time (maven)
so that it builds with Java 8.

Change-Id: If9969034777534671d9ec23b19495ce2cf341fdb
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/24821
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java
index 078ef85001004f663276ff6af6915b8f3cc478a1..a7d6db641253905e20468cac52dc0f2925d8ccd2 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java
+++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java
@@ -250,7 +250,7 @@ public class Metadata {
         CTFParser ctfParser = new CTFParser(tokens, false);
 
         parse_return pr = ctfParser.parse();
-        return (CommonTree) pr.getTree();
+        return pr.getTree();
     }
 
     /**

diff --git a/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfParserTest.java b/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfParserTest.java
index aa4f088c33c26d24a2c2b4a480882cebb0cd0e55..9eb4a739c2b2956f49b1734d07b4b653f6da53a4 100644 (file)
--- a/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfParserTest.java
+++ b/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfParserTest.java
@@ -134,7 +134,7 @@ public class CtfParserTest {
     private CommonTree primaryExpression(String content) {
         try {
             setInput(content);
-            return (CommonTree) parser.primaryExpression().getTree();
+            return parser.primaryExpression().getTree();
         } catch (RecognitionException e) {
             return null;
         }
@@ -143,7 +143,7 @@ public class CtfParserTest {
     private CommonTree unaryExpression(String content) {
         try {
             setInput(content);
-            return (CommonTree) parser.unaryExpression().getTree();
+            return parser.unaryExpression().getTree();
         } catch (RecognitionException e) {
             return null;
         }
@@ -152,7 +152,7 @@ public class CtfParserTest {
     private CommonTree declaration(String content) {
         try {
             setInput(content);
-            return (CommonTree) parser.declaration().getTree();
+            return parser.declaration().getTree();
         } catch (RecognitionException e) {
             return null;
         }

diff --git a/org.eclipse.linuxtools.ctf.parser/pom.xml b/org.eclipse.linuxtools.ctf.parser/pom.xml
index 1979902ed50727bada481e22b64527f0b6ae76f3..8c8efd6416bfcfffe5ffdb93dd10959ba4c60c79 100644 (file)
--- a/org.eclipse.linuxtools.ctf.parser/pom.xml
+++ b/org.eclipse.linuxtools.ctf.parser/pom.xml
@@ -32,7 +32,7 @@
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr3-maven-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5.2</version>
         <executions>
           <execution>
             <goals>
@@ -44,7 +44,7 @@
           <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
-            <version>3.2</version>
+            <version>3.5.2</version>
           </dependency>
         </dependencies>
       </plugin>