From d679bf817b6b2794b877657fcc61bc0f1b6e40f0 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich.opensource@gmail.com>
Date: Sun, 11 Aug 2024 18:40:49 +0200
Subject: [PATCH] fix lsp + eclipse + tycho in wizard

---
 .../lsMavenFatjar.ide/pom.xml                 |  1 +
 .../lsMavenTychoApp.ide/pom.xml               |  6 +--
 .../lsMavenTychoFatjar.ide/pom.xml            | 10 ++---
 .../pom.xml                                   |  6 +--
 .../xtext/wizard/IdeProjectDescriptor.xtend   | 12 +++--
 .../xtext/wizard/IdeProjectDescriptor.java    | 45 +++++++------------
 6 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml
index 0b274e2940b..cda45e75022 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml
@@ -76,6 +76,7 @@
 						<filter>
 							<artifact>*:*</artifact>
 							<excludes>
+								<exclude>**/*.java</exclude>
 								<exclude>META-INF/INDEX.LIST</exclude>
 								<exclude>META-INF/*.SF</exclude>
 								<exclude>META-INF/*.DSA</exclude>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml
index 0545f7766a0..84882b8f953 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml
@@ -55,10 +55,8 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTransitive>true</excludeTransitive>
 							<excludeArtifactIds>
-								com.ibm.icu,
-								org.apache.ant,
-								org.apache.commons.lang,
-								org.apache.commons.logging,
+								icu4j,
+								commons-logging,
 								org.eclipse.core.commands,
 								org.eclipse.core.contenttype,
 								org.eclipse.core.expressions,
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml
index 80ab02ad847..42810e9c3b1 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml
@@ -55,10 +55,8 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTransitive>true</excludeTransitive>
 							<excludeArtifactIds>
-								com.ibm.icu,
-								org.apache.ant,
-								org.apache.commons.lang,
-								org.apache.commons.logging,
+								icu4j,
+								commons-logging,
 								org.eclipse.core.commands,
 								org.eclipse.core.contenttype,
 								org.eclipse.core.expressions,
@@ -127,20 +125,20 @@
 					<artifactSet>
 						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->
 							<exclude>*:lsMavenTychoFatjar.ide-org.eclipse.lsp4j*</exclude>
-							<exclude>*:lsMavenTychoFatjar.ide-org.eclipse.xtext.xbase.lib*</exclude>
-							<exclude>*:lsMavenTychoFatjar.ide-org.eclipse.xtend.lib*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-com.google.guava*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-asm*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-log4j*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-reload4j*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-org.objectweb.asm*</exclude>
 							<exclude>*:lsMavenTychoFatjar.ide-org.apache.log4j*</exclude>
+							<exclude>*:*commons-logging*</exclude>
 						</excludes>
 					</artifactSet>
 					<filters>
 						<filter>
 							<artifact>*:*</artifact>
 							<excludes>
+								<exclude>**/*.java</exclude>
 								<exclude>META-INF/INDEX.LIST</exclude>
 								<exclude>META-INF/*.SF</exclude>
 								<exclude>META-INF/*.DSA</exclude>
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/pom.xml
index d0ea7ae8a25..adc6be67108 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/pom.xml
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/pom.xml
@@ -55,10 +55,8 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTransitive>true</excludeTransitive>
 							<excludeArtifactIds>
-								com.ibm.icu,
-								org.apache.ant,
-								org.apache.commons.lang,
-								org.apache.commons.logging,
+								icu4j,
+								commons-logging,
 								org.eclipse.core.commands,
 								org.eclipse.core.contenttype,
 								org.eclipse.core.expressions,
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
index 5ad23447610..4b8a7dc0499 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -139,10 +139,8 @@ class IdeProjectDescriptor extends ProjectDescriptor {
 												<overWriteIfNewer>true</overWriteIfNewer>
 												<excludeTransitive>true</excludeTransitive>
 												<excludeArtifactIds>
-													com.ibm.icu,
-													org.apache.ant,
-													org.apache.commons.lang,
-													org.apache.commons.logging,
+													icu4j,
+													commons-logging,
 													org.eclipse.core.commands,
 													org.eclipse.core.contenttype,
 													org.eclipse.core.expressions,
@@ -214,14 +212,13 @@ class IdeProjectDescriptor extends ProjectDescriptor {
 											<artifactSet>
 												<excludes><!-- avoid duplicate inclusion due to addjars plugin -->
 													<exclude>*:«config.ideProject.name»-org.eclipse.lsp4j*</exclude>
-													<exclude>*:«config.ideProject.name»-org.eclipse.xtext.xbase.lib*</exclude>
-													<exclude>*:«config.ideProject.name»-org.eclipse.xtend.lib*</exclude>
 													<exclude>*:«config.ideProject.name»-com.google.guava*</exclude>
 													<exclude>*:«config.ideProject.name»-asm*</exclude>
 													<exclude>*:«config.ideProject.name»-log4j*</exclude>
 													<exclude>*:«config.ideProject.name»-reload4j*</exclude>
 													<exclude>*:«config.ideProject.name»-org.objectweb.asm*</exclude>
 													<exclude>*:«config.ideProject.name»-org.apache.log4j*</exclude>
+													<exclude>*:*commons-logging*</exclude>
 												</excludes>
 											</artifactSet>
 										«ENDIF»
@@ -229,6 +226,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
 											<filter>
 												<artifact>*:*</artifact>
 												<excludes>
+													<exclude>**/*.java</exclude>
 													<exclude>META-INF/INDEX.LIST</exclude>
 													<exclude>META-INF/*.SF</exclude>
 													<exclude>META-INF/*.DSA</exclude>
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
index 9ee5e01a8b1..a1a6e2f3580 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -413,19 +413,11 @@ public PomFile pom() {
               _builder.newLine();
               _builder.append("\t\t");
               _builder.append("\t\t\t\t\t");
-              _builder.append("com.ibm.icu,");
+              _builder.append("icu4j,");
               _builder.newLine();
               _builder.append("\t\t");
               _builder.append("\t\t\t\t\t");
-              _builder.append("org.apache.ant,");
-              _builder.newLine();
-              _builder.append("\t\t");
-              _builder.append("\t\t\t\t\t");
-              _builder.append("org.apache.commons.lang,");
-              _builder.newLine();
-              _builder.append("\t\t");
-              _builder.append("\t\t\t\t\t");
-              _builder.append("org.apache.commons.logging,");
+              _builder.append("commons-logging,");
               _builder.newLine();
               _builder.append("\t\t");
               _builder.append("\t\t\t\t\t");
@@ -715,7 +707,7 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_1 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_1, "\t\t\t\t\t\t");
-                  _builder.append("-org.eclipse.xtext.xbase.lib*</exclude>");
+                  _builder.append("-com.google.guava*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
@@ -723,7 +715,7 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_2 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_2, "\t\t\t\t\t\t");
-                  _builder.append("-org.eclipse.xtend.lib*</exclude>");
+                  _builder.append("-asm*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
@@ -731,7 +723,7 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_3 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_3, "\t\t\t\t\t\t");
-                  _builder.append("-com.google.guava*</exclude>");
+                  _builder.append("-log4j*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
@@ -739,7 +731,7 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_4 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_4, "\t\t\t\t\t\t");
-                  _builder.append("-asm*</exclude>");
+                  _builder.append("-reload4j*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
@@ -747,7 +739,7 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_5 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_5, "\t\t\t\t\t\t");
-                  _builder.append("-log4j*</exclude>");
+                  _builder.append("-org.objectweb.asm*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
@@ -755,24 +747,13 @@ public PomFile pom() {
                   _builder.append("<exclude>*:");
                   String _name_6 = this.getConfig().getIdeProject().getName();
                   _builder.append(_name_6, "\t\t\t\t\t\t");
-                  _builder.append("-reload4j*</exclude>");
-                  _builder.newLineIfNotEmpty();
-                  _builder.append("\t\t");
-                  _builder.append("\t\t");
-                  _builder.append("\t\t");
-                  _builder.append("<exclude>*:");
-                  String _name_7 = this.getConfig().getIdeProject().getName();
-                  _builder.append(_name_7, "\t\t\t\t\t\t");
-                  _builder.append("-org.objectweb.asm*</exclude>");
+                  _builder.append("-org.apache.log4j*</exclude>");
                   _builder.newLineIfNotEmpty();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
                   _builder.append("\t\t");
-                  _builder.append("<exclude>*:");
-                  String _name_8 = this.getConfig().getIdeProject().getName();
-                  _builder.append(_name_8, "\t\t\t\t\t\t");
-                  _builder.append("-org.apache.log4j*</exclude>");
-                  _builder.newLineIfNotEmpty();
+                  _builder.append("<exclude>*:*commons-logging*</exclude>");
+                  _builder.newLine();
                   _builder.append("\t\t");
                   _builder.append("\t\t");
                   _builder.append("\t");
@@ -802,6 +783,10 @@ public PomFile pom() {
               _builder.newLine();
               _builder.append("\t\t");
               _builder.append("\t\t\t\t\t");
+              _builder.append("<exclude>**/*.java</exclude>");
+              _builder.newLine();
+              _builder.append("\t\t");
+              _builder.append("\t\t\t\t\t");
               _builder.append("<exclude>META-INF/INDEX.LIST</exclude>");
               _builder.newLine();
               _builder.append("\t\t");