From 9db27da95b4dba4afc14af55e5ba6bba7d0b6d83 Mon Sep 17 00:00:00 2001
From: Igor Foltin <ifoltin@cisco.com>
Date: Mon, 12 Oct 2015 10:46:44 +0200
Subject: [PATCH] Bug 4375: Bump ANTLR to 4.5 or higher

- switched antlr4-runtime in project dependencies to version 4.5.1
- removed antlr4-runtime-osgi-nohead from project dependencies

Change-Id: Id4054b0c842372d03368e95d8b19273ee3c091cc
Signed-off-by: Igor Foltin <ifoltin@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 common/artifacts/pom.xml                      |  5 --
 common/features/pom.xml                       |  5 --
 .../features/src/main/features/features.xml   |  2 +-
 common/parent/pom.xml                         | 32 ++++++++++
 third-party/antlr4-runtime-osgi/pom.xml       | 63 -------------------
 third-party/pom.xml                           |  4 --
 yang/yang-data-impl/pom.xml                   | 37 -----------
 yang/yang-parser-impl/pom.xml                 | 10 +--
 8 files changed, 34 insertions(+), 124 deletions(-)
 delete mode 100644 third-party/antlr4-runtime-osgi/pom.xml

diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index 67f068a839..c1db35b0d9 100644
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -34,11 +34,6 @@
                 <artifactId>yang-data-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-                <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-                <version>4.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>concepts</artifactId>
diff --git a/common/features/pom.xml b/common/features/pom.xml
index 7b1d411f28..54f480034d 100644
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -34,11 +34,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index b5ec8f94f7..b984c6b1d9 100644
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -35,7 +35,7 @@
 
     <feature name='odl-yangtools-yang-parser' version='${project.version}' description='OpenDaylight :: Yangtools :: YANG Parser'>
         <feature version='${project.version}'>odl-yangtools-common</feature>
-        <bundle>mvn:org.opendaylight.yangtools.thirdparty/antlr4-runtime-osgi-nohead/{{VERSION}}</bundle>
+        <bundle>mvn:org.antlr/antlr4-runtime/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-util/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/{{VERSION}}</bundle>
diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 48b0727aff..4103414b40 100644
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -123,6 +123,12 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>4.5.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -289,6 +295,19 @@
                                          <ignore/>
                                      </action>
                                  </pluginExecution>
+                                 <pluginExecution>
+                                     <pluginExecutionFilter>
+                                         <groupId>org.antlr</groupId>
+                                         <artifactId>antlr4-maven-plugin</artifactId>
+                                         <versionRange>[4.0,)</versionRange>
+                                         <goals>
+                                             <goal>antlr4</goal>
+                                         </goals>
+                                     </pluginExecutionFilter>
+                                     <action>
+                                         <execute />
+                                     </action>
+                                 </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
@@ -392,6 +411,19 @@
                         </execution>
                     </executions>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-maven-plugin</artifactId>
+                    <version>4.5.1</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>antlr4</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/third-party/antlr4-runtime-osgi/pom.xml b/third-party/antlr4-runtime-osgi/pom.xml
deleted file mode 100644
index 95ef64179c..0000000000
--- a/third-party/antlr4-runtime-osgi/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>third-party-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-    <version>4.0</version>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>Antlr4 Runtime Library</Bundle-Name>
-                        <Bundle-SymbolicName>org.antlr.antlr4</Bundle-SymbolicName>
-                        <Export-Package>
-                            org.antlr.v4.runtime,
-                            org.antlr.v4.runtime.atn,
-                            org.antlr.v4.runtime.dfa,
-                            org.antlr.v4.runtime.misc,
-                            org.antlr.v4.runtime.tree
-                        </Export-Package>
-                        <Import-Package></Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>4.0</version>
-            <exclusions>
-              <exclusion>
-                <!--  UI Related Dependency -->
-                <artifactId>org.abego.treelayout.core</artifactId>
-                <groupId>org.abego.treelayout</groupId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 1727bdba7d..8213c77c69 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -23,10 +23,6 @@
     <artifactId>third-party-parent</artifactId>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>antlr4-runtime-osgi</module>
-    </modules>
-
     <build>
         <plugins>
             <plugin>
diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index c0a68d75c4..77d7155e37 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -25,14 +25,6 @@
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <sourceDirectory>src/main/antlr</sourceDirectory>
                     <outputDirectory>target/generated-sources/parser/org/opendaylight/yangtools/yang/data/impl/leafref</outputDirectory>
@@ -62,34 +54,6 @@
                 </configuration>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.antlr</groupId>
-                                        <artifactId>antlr4-maven-plugin</artifactId>
-                                        <versionRange>[4.0,)</versionRange>
-                                        <goals>
-                                            <goal>antlr4</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute />
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <dependencies>
@@ -157,7 +121,6 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index 5cb407ed8d..39c50703af 100644
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.0</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -76,14 +75,7 @@
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>4.5.1</version>
                 <configuration>
                     <sourceDirectory>src/main/antlr</sourceDirectory>
                     <outputDirectory>target/generated-sources/parser/org/opendaylight/yangtools/antlrv4/code/gen</outputDirectory>
-- 
2.36.6