From 014dda615cd56063929e074387389a34d59c0db0 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 23 Apr 2022 12:36:08 +0200
Subject: [PATCH] Fix OSGi imports

org.antlr.v4.gui is only used for backwards compatibility, but the
manifest generated by upgraded maven-bundle-plugin generates an
Import-Package requirement. This breaks the ability to load
antlr4-runtime in an OSGi enviroment, when nothing provides
org.antlr.v4.gui.

Fix this by specifying resultion as optional.

Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 runtime/Java/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 49a84a8c0a..2165f9f6d3 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -85,6 +85,7 @@
 							<instructions>
 								<Automatic-Module-Name>org.antlr.antlr4.runtime</Automatic-Module-Name>
 								<Bundle-SymbolicName>org.antlr.antlr4-runtime</Bundle-SymbolicName>
+								<Import-Package>org.antlr.v4.gui;resolution:=optional, *</Import-Package>
 							</instructions>
 						</configuration>
 						<goals>