Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

added jdt.compiler.apt/tool in TP extra requirements #1836

Merged
merged 1 commit into from
Feb 21, 2022
Merged

added jdt.compiler.apt/tool in TP extra requirements #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions ...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions ...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions ...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions ...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions ...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
52 changes: 52 additions & 0 deletions ....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down