added jdt.compiler.apt/tool in TP extra requirements to avoid

conflicts with maven dependencies when using tycho in xtext-maven-plugin see eclipse/xtext-maven#146 Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Feb 21, 2022 · bc3449e · bc3449e
1 parent 9188720
commit bc3449e
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 0 deletions.
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
@@ -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>

diff --git a/...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
@@ -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>

diff --git a/...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
@@ -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>

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
@@ -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>

diff --git a/...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml b/...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml
@@ -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>

diff --git a/...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
@@ -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>

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,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>

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,58 @@ 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\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();