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 jdt.compiler.apt/tool in TP extra requirements to avoid

Browse source 
conflicts with maven dependencies when using tycho in xtext-maven-plugin
see eclipse/xtext-maven#146

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2022-02-21 09:12:03 +01:00
parent 9188720ea7
commit bc3449ee77
8 changed files with 143 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -89,6 +89,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -89,6 +89,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -92,6 +92,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -92,6 +92,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -135,6 +135,19 @@
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -338,6 +338,19 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>

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

@ -1069,6 +1069,58 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</requirement>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("<!-- to force the same version of jdt.compiler.apt and jdt.core");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("(for xtext-maven-plugin)");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("see https://github.com/eclipse/xtext-maven/issues/146 -->");
_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.jdt.compiler.apt</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\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.jdt.compiler.tool</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();