From ac507701cd6412bdfaca3e4f8b30e455afaeea74 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 14 Apr 2023 20:14:43 +0200 Subject: [PATCH] Remove 'de.itemis.xtext.antlr.feature' from target files That feature is only used for developer convenience in the Xtext development workspace and already added to that by the Xtext Oomph-setup. Use 'DynamicImport-Package' instead of Required-Bundle (or Import-Package) to make Xtext still compile without that dependency. Since the classes form 'de.itemis.xtext.antlr' are accessed reflectively they are not needed at compile-time. --- org.eclipse.xtext.generator/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF | 2 +- xtext-latest.target | 4 ---- xtext-r202203.target | 4 ---- xtext-r202206.target | 4 ---- xtext-r202209.target | 4 ---- xtext-r202212.target | 4 ---- xtext-r202303.target | 4 ---- 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF index eccdda60917..b01aa338071 100644 --- a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF @@ -59,7 +59,6 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport, org.eclipse.xtend.typesystem.emf;bundle-version="2.2.0";visibility:=reexport, org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext;resolution:=optional;x-installation:=greedy, - de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", @@ -72,5 +71,6 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport, Bundle-ActivationPolicy: lazy Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional;x-installation:=greedy, org.apache.log4j;version="1.2.24" +DynamicImport-Package: de.itemis.xtext.antlr.toolrunner Automatic-Module-Name: org.eclipse.xtext.generator Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 9daf91ca88c..e53d049c442 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.xtext;x-installation:=greedy, org.eclipse.emf.mwe2.lib;bundle-version="2.14.0";resolution:=optional, org.eclipse.equinox.common;bundle-version="3.16.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.xtext.generator, @@ -62,5 +61,6 @@ Export-Package: org.eclipse.xtext.xtext.generator, org.eclipse.xtext.xtext.generator.validation, org.eclipse.xtext.xtext.generator.web, org.eclipse.xtext.xtext.generator.xbase +DynamicImport-Package: de.itemis.xtext.antlr.toolrunner Automatic-Module-Name: org.eclipse.xtext.xtext.generator Eclipse-SourceReferences: eclipseSourceReferences diff --git a/xtext-latest.target b/xtext-latest.target index df2183403a6..fdf6fefb982 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -37,10 +37,6 @@ - - - - diff --git a/xtext-r202203.target b/xtext-r202203.target index 08785885fd5..8209d04d271 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -42,10 +42,6 @@ - - - - diff --git a/xtext-r202206.target b/xtext-r202206.target index d91736a2b9b..ae37fc2c036 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -41,10 +41,6 @@ - - - - diff --git a/xtext-r202209.target b/xtext-r202209.target index d5766cb4312..07018e19025 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -39,10 +39,6 @@ - - - - diff --git a/xtext-r202212.target b/xtext-r202212.target index 6cf35844864..cecfbd1ae0d 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -34,10 +34,6 @@ - - - - diff --git a/xtext-r202303.target b/xtext-r202303.target index a528d57efcb..33ede7905ac 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -34,10 +34,6 @@ - - - -