146: jdt.compiler.apt in TP extra requirements

Task-Url: eclipse/xtext-maven#146
eclipse · Feb 16, 2022 · 3fb9e0c · 3fb9e0c
1 parent b082274
commit 3fb9e0c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
@@ -338,6 +338,14 @@ 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>
 										</extraRequirements>
 									</dependency-resolution>
 								</configuration>

diff --git a/....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
@@ -1069,6 +1069,38 @@ public PomFile pom() {
           _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");
           _builder.append("</extraRequirements>");
           _builder.newLine();