diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties index 2f642231d1a..0a2f74d5312 100644 --- a/org.eclipse.xtext.ide.tests/build.properties +++ b/org.eclipse.xtext.ide.tests/build.properties @@ -8,4 +8,4 @@ source.. = src-gen,\ testlang-src-gen src.includes = about.html additional.bundles = org.eclipse.emf.mwe2.launch,\ - org.apache.commons.logging \ No newline at end of file + org.apache.commons.commons-logging diff --git a/org.eclipse.xtext.purexbase/build.properties b/org.eclipse.xtext.purexbase/build.properties index ca037b49151..476d049b471 100644 --- a/org.eclipse.xtext.purexbase/build.properties +++ b/org.eclipse.xtext.purexbase/build.properties @@ -16,7 +16,7 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties index 880ad074718..e7953162784 100644 --- a/org.eclipse.xtext.testlanguages/build.properties +++ b/org.eclipse.xtext.testlanguages/build.properties @@ -9,4 +9,4 @@ src.includes = about.html additional.bundles = org.eclipse.emf.mwe.utils,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ - org.apache.commons.logging \ No newline at end of file + org.apache.commons.commons-logging diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index abec37db9e3..607fdde78b2 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index fad98afdda7..0ac0e7ecbde 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 16db0fccf52..27ac4ace881 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index 5957c7f4052..01fae845a3e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index eddfe1f6462..50f937035c4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index 0efb3b7b204..db18489d98e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index 0e45e90fc99..e67c811dfc1 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target index 357501d3f0e..b0d781381c0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties index 3f6a8109ccf..63345d99085 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF index aa00a788ff8..52f134d98a3 100644 --- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testlanguages; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.36.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.36.0";resolution:=optional;visibility:=reexport, - org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional, 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)", diff --git a/org.eclipse.xtext.xtext.bootstrap/build.properties b/org.eclipse.xtext.xtext.bootstrap/build.properties index c54241e14b0..4ba767715b2 100644 --- a/org.eclipse.xtext.xtext.bootstrap/build.properties +++ b/org.eclipse.xtext.xtext.bootstrap/build.properties @@ -2,4 +2,4 @@ source.. = src/ bin.includes = META-INF/,\ . additional.bundles = org.eclipse.emf.mwe2.launch,\ - org.apache.commons.logging \ No newline at end of file + org.apache.commons.commons-logging diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties index 5793706802f..4259509ee39 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties @@ -12,5 +12,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target index cb370652d35..7e76aae7552 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target @@ -8,6 +8,7 @@ + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties index c7a5f097847..4979508d12f 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties @@ -15,5 +15,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties index fd350a18e8d..706ff9cf468 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties index cfbe3b1107c..341e2c38264 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties @@ -13,5 +13,5 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.eclipse.emf.mwe2.launch,\ org.eclipse.emf.mwe2.lib,\ org.objectweb.asm,\ - org.apache.commons.logging,\ + org.apache.commons.commons-logging,\ org.apache.log4j diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 1345193acf5..4e352a57537 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -113,7 +113,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { "org.eclipse.emf.mwe2.launch", "org.eclipse.emf.mwe2.lib", "org.objectweb.asm", - "org.apache.commons.logging", + "org.apache.commons.commons-logging", "org.apache.log4j" ) if (isFromExistingEcoreModels) { diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index bfa29576d71..718dbe3da73 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -93,7 +93,7 @@ class TargetPlatformProject extends ProjectDescriptor { - + «IF config.junitVersion == JUnitVersion.JUNIT_5» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 2db4bb06371..398306c41de 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -163,7 +163,7 @@ public Set getDevelopmentBundles() { "org.eclipse.emf.mwe2.launch", "org.eclipse.emf.mwe2.lib", "org.objectweb.asm", - "org.apache.commons.logging", + "org.apache.commons.commons-logging", "org.apache.log4j"); boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels(); if (_isFromExistingEcoreModels) { diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 02c677e6b64..23f8b87c984 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -206,7 +206,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); { JUnitVersion _junitVersion = this.getConfig().getJunitVersion(); diff --git a/xtext-latest.target b/xtext-latest.target index d7c0f67795a..801b09a1abf 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -61,7 +61,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 96d5ca2b516..150144d00a6 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 1b101182831..3a5d75a6580 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -62,7 +62,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 10c9867ddb8..2ae694e79fc 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -62,7 +62,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 5b058305917..e3236e35448 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 2c7aea064a1..3d1057f09db 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index b5567a96c67..6d836f92861 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index d58705985f9..6927c8947b1 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 02fb4554812..a9760231c63 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -63,7 +63,7 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index 501576f6e2c..3227f228cd8 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -58,7 +58,7 @@ - + diff --git a/xtext-r202406.target b/xtext-r202406.target index 37e71f9a122..b7c24e902ed 100644 --- a/xtext-r202406.target +++ b/xtext-r202406.target @@ -58,7 +58,7 @@ - +