From 921996616d58234c030466f4f07b329567c11630 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 10 Aug 2024 23:10:21 +0200 Subject: [PATCH] Fix exclusion for LanguageServer uber jar assembly In the maven-dependency-plugin's 'excludeArtifactIds' the artifactId has to be specified, not the bundle's Symbolic name. Also artifacts not present anway. Also exclude all *.java files in the shade plugin configuration to ensure no java source-files are included in any case (the maven-dependencies-plugin also copies some eclipse source-jars). --- .../lsMavenFatjar.ide/pom.xml | 3 ++- .../lsMavenTychoFatjar.ide/pom.xml | 9 ++++----- .../pom.xml | 6 ++---- .../xtext/wizard/IdeProjectDescriptor.xtend | 9 ++++----- .../xtext/wizard/IdeProjectDescriptor.java | 18 +++++++----------- 5 files changed, 19 insertions(+), 26 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..9286dbb46ce 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 @@ -68,7 +68,7 @@ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> plugin.properties - @@ -76,6 +76,7 @@ *:* + **/*.java META-INF/INDEX.LIST META-INF/*.SF META-INF/*.DSA 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..8d8bea0db3d 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 @@ true true - 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, @@ -120,7 +118,7 @@ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> plugin.properties - @@ -141,6 +139,7 @@ *:* + **/*.java META-INF/INDEX.LIST META-INF/*.SF META-INF/*.DSA 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 @@ true true - 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..24cb4dc2ed6 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 @@ -139,10 +139,8 @@ class IdeProjectDescriptor extends ProjectDescriptor { true true - 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, @@ -206,7 +204,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> plugin.properties - @@ -229,6 +227,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { *:* + **/*.java META-INF/INDEX.LIST META-INF/*.SF META-INF/*.DSA 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..ff21f2651a5 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 @@ -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"); @@ -675,7 +667,7 @@ public PomFile pom() { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t\t\t"); - _builder.append("**/*.java"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("\t\t\t\t\t"); _builder.append("META-INF/INDEX.LIST"); _builder.newLine(); _builder.append("\t\t");