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

added xtext.logging to extra requirements (cleanup)

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2019-10-08 19:53:06 +02:00
parent cd5430f55d
commit 81975d3156
8 changed files with 193 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -141,30 +158,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

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

@ -73,6 +73,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -97,30 +114,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

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

@ -73,6 +73,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -97,30 +114,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

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

@ -76,6 +76,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -100,30 +117,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

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

@ -76,6 +76,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -100,30 +117,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

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

@ -119,6 +119,23 @@
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -143,30 +160,6 @@
<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

43
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file

@ -313,6 +313,23 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
@ -338,32 +355,6 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<testOutputDirectory>${basedir}/«Outlet.TEST_XTEND_GEN.sourceFolder»</testOutputDirectory>
</configuration>
</plugin>
«IF config.needsTychoBuild»
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
«ENDIF»
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>

179
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file

@ -1002,6 +1002,74 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</environments>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t");
_builder.append("<dependency-resolution>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t");
_builder.append("<extraRequirements>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("<requirement>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<type>eclipse-plugin</type>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<id>org.eclipse.xtext.logging</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<versionRange>1.2.15</versionRange>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("</requirement>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target ");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("platform is Luna or later. (backward compatible with kepler and previous ");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("<requirement>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<type>eclipse-feature</type>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<id>org.eclipse.rcp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("<versionRange>0.0.0</versionRange>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("</requirement>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t");
_builder.append("</extraRequirements>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t");
_builder.append("</dependency-resolution>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("</configuration>");
_builder.newLine();
@ -1083,105 +1151,6 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t\t\t");
_builder.append("</plugin>");
_builder.newLine();
{
boolean _needsTychoBuild_2 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_2) {
_builder.append("\t\t\t");
_builder.append("<plugin>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<groupId>org.eclipse.tycho</groupId>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<artifactId>target-platform-configuration</artifactId>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<version>${tycho-version}</version>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<configuration>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("<dependency-resolution>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t");
_builder.append("<extraRequirements>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t");
_builder.append("<requirement>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<type>eclipse-plugin</type>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<id>org.eclipse.xtext.logging</id>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<versionRange>1.2.15</versionRange>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t");
_builder.append("</requirement>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t");
_builder.append("<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target ");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("platform is Luna or later. (backward compatible with kepler and previous ");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t");
_builder.append("<requirement>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<type>eclipse-feature</type>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<id>org.eclipse.rcp</id>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("<versionRange>0.0.0</versionRange>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t\t");
_builder.append("</requirement>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t\t");
_builder.append("</extraRequirements>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("</dependency-resolution>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("</configuration>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("</plugin>");
_builder.newLine();
}
}
_builder.append("\t\t\t");
_builder.append("<plugin>");
_builder.newLine();
@ -1242,8 +1211,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</plugin>");
_builder.newLine();
{
boolean _needsTychoBuild_3 = this.getConfig().needsTychoBuild();
boolean _not = (!_needsTychoBuild_3);
boolean _needsTychoBuild_2 = this.getConfig().needsTychoBuild();
boolean _not = (!_needsTychoBuild_2);
if (_not) {
_builder.append("\t\t\t");
_builder.append("<plugin>");
@ -1429,8 +1398,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</pluginExecution>");
_builder.newLine();
{
boolean _needsTychoBuild_4 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_4) {
boolean _needsTychoBuild_3 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_3) {
_builder.append("\t\t\t\t\t\t\t");
_builder.append("<pluginExecution>");
_builder.newLine();
@ -1606,8 +1575,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</plugin>");
_builder.newLine();
{
boolean _needsTychoBuild_5 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_5) {
boolean _needsTychoBuild_4 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_4) {
_builder.append("\t\t\t");
_builder.append("<plugin>");
_builder.newLine();