sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 480097 - [generator] Xtext 2.9 Maven build failed (edit)

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
This commit is contained in:
Dennis Huebner 2015-10-21 11:31:02 +02:00
parent bec297a790
commit e3898c1477
18 changed files with 88 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file

@ -350,8 +350,21 @@ class ParentProjectDescriptor extends ProjectDescriptor {
</lifecycleMappingMetadata>
</configuration>
</plugin>
«IF config.needsTychoBuild»
<plugin>
<!--
Can be removed after first generator execution
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
-->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<compilerArgument>-err:-forbidden</compilerArgument>
</configuration>
</plugin>
«ENDIF»
</plugins>
</pluginManagement>
</build>
«IF config.xtextVersion.isSnapshot»

2
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend
View file

@ -107,7 +107,7 @@ abstract class ProjectDescriptor {
private def manifestEntry(String key, Iterable<String> value) {
if (value.isEmpty)
return ""
return '''«key»: «requiredBundles.join(",\n ")»'''
return '''«key»: «value.join(",\n ")»'''
}
def Set<String> getRequiredBundles() {

12
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend
View file

@ -41,6 +41,16 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
testedProject.isEclipsePluginProject
}
override getExternalDependencies() {
val deps = newLinkedHashSet
deps += super.externalDependencies
deps += new ExternalDependency()=>[
p2.bundleId = "org.junit"
p2.version = "4.7.0"
]
return deps
}
override pom() {
super.pom => [
packaging = if(isEclipsePluginProject) "eclipse-test-plugin" else "jar"
@ -120,7 +130,7 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
</os>
</activation>
<properties>
<argLine>-XstartOnFirstThread</argLine>
<tycho.testArgLine>-XstartOnFirstThread</tycho.testArgLine>
</properties>
</profile>
</profiles>

31
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiProjectDescriptor.xtend
View file

@ -11,40 +11,45 @@ import static org.eclipse.xtext.xtext.wizard.ExternalDependency.*
class UiProjectDescriptor extends TestedProjectDescriptor {
UiTestProjectDescriptor testProject
new(WizardConfiguration config) {
super(config)
this.testProject = new UiTestProjectDescriptor(this)
}
override getTestProject() {
testProject
}
override getUpstreamProjects() {
#[config.runtimeProject, config.ideProject].filter[enabled].toSet
}
override getNameQualifier() {
".ui"
}
override isEclipsePluginProject() {
true
}
override isPartOfGradleBuild() {
false
}
override isPartOfMavenBuild() {
true
}
override getExternalDependencies() {
val deps = newLinkedHashSet
deps += super.externalDependencies
deps += createXtextDependency("org.eclipse.xtext.ui")
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
deps += createXtextDependency("org.eclipse.xtext.ui.shared")
deps += createXtextDependency("org.eclipse.xtext.ui.codetemplates.ui")
deps += new ExternalDependency => [
p2 [
bundleId = "org.eclipse.ui.editors"
@ -62,14 +67,20 @@ class UiProjectDescriptor extends TestedProjectDescriptor {
}
deps
}
override getImportedPackages() {
val packs = super.getImportedPackages()
packs += "org.apache.log4j"
return packs
}
override getBinIncludes() {
val includes = newLinkedHashSet
includes += super.binIncludes
includes += "plugin.xml"
includes
}
override pom() {
super.pom => [
buildSection = '''

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.eclipsePlugin.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.eclipsePlugin,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.eclipsePlugin.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.eclipsePlugin.ui,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

3
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/META-INF/MANIFEST.MF vendored
View file

@ -8,6 +8,9 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.eclipsePlugin,
org.xtext.example.eclipsePlugin.ide,
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.full.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.full,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.full.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.full.ui,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

2
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/pom.xml vendored
View file

@ -36,7 +36,7 @@
</os>
</activation>
<properties>
<argLine>-XstartOnFirstThread</argLine>
<tycho.testArgLine>-XstartOnFirstThread</tycho.testArgLine>
</properties>
</profile>
</profiles>

3
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/META-INF/MANIFEST.MF vendored
View file

@ -8,6 +8,9 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.full,
org.xtext.example.full.ide,
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

13
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml vendored
View file

@ -165,8 +165,19 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<!--
Can be removed after first generator execution
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
-->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<compilerArgument>-err:-forbidden</compilerArgument>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTycho.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTycho,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTycho.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTycho.ui,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

2
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/pom.xml vendored
View file

@ -36,7 +36,7 @@
</os>
</activation>
<properties>
<argLine>-XstartOnFirstThread</argLine>
<tycho.testArgLine>-XstartOnFirstThread</tycho.testArgLine>
</properties>
</profile>
</profiles>

3
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/META-INF/MANIFEST.MF vendored
View file

@ -8,6 +8,9 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTycho,
org.xtext.example.mavenTycho.ide,
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

13
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml vendored
View file

@ -167,8 +167,19 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<!--
Can be removed after first generator execution
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
-->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<compilerArgument>-err:-forbidden</compilerArgument>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>

1
tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml vendored
View file

@ -84,7 +84,6 @@
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>