Skip to content

Commit

Permalink
Fix exclusion for LanguageServer uber jar assembly
Browse files Browse the repository at this point in the history 
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).
  • Loading branch information
@HannesWell
HannesWell committed Aug 10, 2024
1 parent d4632c2 commit 9219966
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 26 deletions.
3 changes: 2 additions & 1 deletion ...testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,15 @@
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
</transformer>
<transformer
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/*.java</exclude>
<exclude>META-INF/INDEX.LIST</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
Expand Down
9 changes: 4 additions & 5 deletions ...-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -120,7 +118,7 @@
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
</transformer>
<transformer
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
</transformers>
Expand All @@ -141,6 +139,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/*.java</exclude>
<exclude>META-INF/INDEX.LIST</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
Expand Down
6 changes: 2 additions & 4 deletions ....xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -206,7 +204,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
</transformer>
<transformer
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
</transformers>
Expand All @@ -229,6 +227,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>
Expand Down
18 changes: 7 additions & 11 deletions ...pse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -675,7 +667,7 @@ public PomFile pom() {
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t\t\t");
_builder.append("<transformer ");
_builder.append("<transformer");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t\t\t\t");
Expand Down Expand Up @@ -802,6 +794,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");
Expand Down

0 comments on commit 9219966

Please sign in to comment.