[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header

- added header to existing manifest files
- added header to manifest generation in xtext generator and wizard

Signed-off-by: Florian Stolte <fstolte@itemis.de>
This commit is contained in:
Florian Stolte 2017-12-14 13:42:09 +01:00
parent 94a90a486c
commit 1bc930b5b6
46 changed files with 57 additions and 0 deletions

View file

@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.testlanguages,
org.eclipse.xtext.testlanguages.ide
Import-Package: org.apache.log4j;version="1.2.15"
Automatic-Module-Name: org.eclipse.xtext.ide.tests

View file

@ -49,3 +49,4 @@ Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
org.eclipse.xtext.ide.server.signatureHelp,
org.eclipse.xtext.ide.server.symbol,
org.eclipse.xtext.ide.util
Automatic-Module-Name: org.eclipse.xtext.ide

View file

@ -24,3 +24,4 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
Import-Package: org.apache.log4j;version="1.2.15",
org.apache.log4j.spi;version="1.2.15"
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.xtext.testing

View file

@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.xtext.ide;visibility:=reexport,
org.antlr.runtime,
org.eclipse.xtend.lib;bundle-version="2.14.0"
Automatic-Module-Name: org.eclipse.xtext.testlanguages.ide

View file

@ -77,3 +77,4 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking,
org.eclipse.xtext.testlanguages.fileAware.generator,
org.eclipse.xtext.testlanguages.fileAware.tests;x-internal=true
Automatic-Module-Name: org.eclipse.xtext.testlanguages

View file

@ -610,3 +610,4 @@ Export-Package: org.eclipse.xtext,
org.eclipse.xtext.xtextTest,
org.eclipse.xtext.xtextTest.impl,
org.eclipse.xtext.xtextTest.util
Automatic-Module-Name: org.eclipse.xtext.tests

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ide

View file

@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePlugin.tests

View file

@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin.ui,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ui.tests

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePlugin

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ide

View file

@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.tests

View file

@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2.ui,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ui.tests

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.eclipsePluginP2

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.full,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.full.ide

View file

@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.full,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.full.tests

View file

@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.full.ui,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.full.ui.tests

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.full,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.full.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.full

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoApp,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp.ide

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoApp,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoFatjar,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar.ide

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoFatjar,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTycho.ide

View file

@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTycho.tests

View file

@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.mavenTycho.ui,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTycho.ui.tests

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTycho.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTycho

View file

@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ide

View file

@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTychoP2.tests

View file

@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2.ui,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ui.tests

View file

@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ui

View file

@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.xtext.example.mavenTychoP2

View file

@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.10.2",
javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtend.lib
Import-Package: org.apache.log4j;version="1.2.15"
Automatic-Module-Name: org.eclipse.xtext.util

View file

@ -63,3 +63,4 @@ Export-Package: org.eclipse.xtext.xtext.generator,
org.eclipse.xtext.xtext.generator.validation;x-internal:=true,
org.eclipse.xtext.xtext.generator.web;x-internal:=true,
org.eclipse.xtext.xtext.generator.xbase;x-internal:=true
Automatic-Module-Name: org.eclipse.xtext.xtext.generator

View file

@ -124,6 +124,7 @@ class ManifestAccess extends TextFileAccess implements IGuiceAwareGeneratorCompo
«IF activator !== null»
Bundle-Activator: «activator»
«ENDIF»
Automatic-Module-Name: «symbolicName ?: bundleName»
'''
override void writeTo(IFileSystemAccess2 fileSystemAccess) {

View file

@ -244,6 +244,15 @@ public class ManifestAccess extends TextFileAccess implements IGuiceAwareGenerat
_builder.newLineIfNotEmpty();
}
}
_builder.append("Automatic-Module-Name: ");
String _elvis_1 = null;
if (this.symbolicName != null) {
_elvis_1 = this.symbolicName;
} else {
_elvis_1 = this.bundleName;
}
_builder.append(_elvis_1);
_builder.newLineIfNotEmpty();
return _builder;
}

View file

@ -11,3 +11,4 @@ Import-Package: org.apache.log4j;version="1.2.15"
Export-Package: org.eclipse.xtext.xtext.ide;x-friends:="org.eclipse.xtext.xtext.ui",
org.eclipse.xtext.xtext.ide.contentassist.antlr;x-friends:="org.eclipse.xtext.xtext.ui",
org.eclipse.xtext.xtext.ide.contentassist.antlr.internal;x-friends:="org.eclipse.xtext.xtext.ui"
Automatic-Module-Name: org.eclipse.xtext.xtext.ide

View file

@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.eclipse.xtend.lib;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.10.2"
Automatic-Module-Name: org.eclipse.xtext.xtext.wizard

View file

@ -114,6 +114,7 @@ abstract class ProjectDescriptor {
«manifestEntry("Require-Bundle", requiredBundles)»
«manifestEntry("Import-Package", importedPackages)»
Bundle-RequiredExecutionEnvironment: «bree»
Automatic-Module-Name: «name»
'''

View file

@ -210,6 +210,10 @@ public abstract class ProjectDescriptor {
String _bree = this.getBree();
_builder.append(_bree);
_builder.newLineIfNotEmpty();
_builder.append("Automatic-Module-Name: ");
String _name_2 = this.getName();
_builder.append(_name_2);
_builder.newLineIfNotEmpty();
return _builder.toString();
}

View file

@ -107,3 +107,4 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.10.2";visibility:=re
Import-Package: org.apache.log4j;version="1.2.15",org.osgi.framework
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.xtext.internal.Activator
Automatic-Module-Name: org.eclipse.xtext