mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 08:18:55 +00:00
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 <christian.dietrich@itemis.de>
This commit is contained in:
parent
9188720ea7
commit
bc3449ee77
8 changed files with 143 additions and 0 deletions
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue