[eclipse-xtext/xtext#2077] workaround for broken metadata in eclipse …

…platform Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Jun 15, 2022 · 66e4f07 · 66e4f07
1 parent 0a708f0
commit 66e4f07
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 0 deletions.
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml
@@ -50,6 +50,12 @@
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 						<version>${xtextVersion}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.osgi.service</groupId>
+								<artifactId>org.osgi.service.prefs</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>

diff --git a/...stdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml b/...stdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml
@@ -50,6 +50,12 @@
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 						<version>${xtextVersion}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.osgi.service</groupId>
+								<artifactId>org.osgi.service.prefs</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>

diff --git a/...zard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml b/...zard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml
@@ -50,6 +50,12 @@
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 						<version>${xtextVersion}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.osgi.service</groupId>
+								<artifactId>org.osgi.service.prefs</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>

diff --git a/....xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml b/....xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml
@@ -50,6 +50,12 @@
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 						<version>${xtextVersion}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.osgi.service</groupId>
+								<artifactId>org.osgi.service.prefs</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>

diff --git a/....tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml b/....tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml
@@ -50,6 +50,12 @@
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 						<version>${xtextVersion}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.osgi.service</groupId>
+								<artifactId>org.osgi.service.prefs</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>

diff --git a/...ipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/...ipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -379,6 +379,12 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 											<groupId>org.eclipse.xtext</groupId>
 											<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
 											<version>${xtextVersion}</version>
+											<exclusions>
+												<exclusion>
+													<groupId>org.osgi.service</groupId>
+													<artifactId>org.osgi.service.prefs</artifactId>
+												</exclusion>
+											</exclusions>
 										</dependency>
 										<dependency>
 											<groupId>org.eclipse.xtext</groupId>

diff --git a/...xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/...xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
@@ -910,6 +910,36 @@ public PomFile pom() {
               _builder.newLine();
               _builder.append("\t\t\t");
               _builder.append("\t");
+              _builder.append("\t");
+              _builder.append("<exclusions>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
+              _builder.append("\t\t");
+              _builder.append("<exclusion>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
+              _builder.append("\t\t\t");
+              _builder.append("<groupId>org.osgi.service</groupId>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
+              _builder.append("\t\t\t");
+              _builder.append("<artifactId>org.osgi.service.prefs</artifactId>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
+              _builder.append("\t\t");
+              _builder.append("</exclusion>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
+              _builder.append("\t");
+              _builder.append("</exclusions>");
+              _builder.newLine();
+              _builder.append("\t\t\t");
+              _builder.append("\t");
               _builder.append("</dependency>");
               _builder.newLine();
               _builder.append("\t\t\t");