fix: swt dependency issue

vegardit · Oct 2, 2024 · 61dad85 · 61dad85
1 parent 3a5e44b
commit 61dad85
Showing 1 changed file with 28 additions and 9 deletions.
diff --git a/libs/eea-eclipse-platform/pom.xml b/libs/eea-eclipse-platform/pom.xml
@@ -5,7 +5,9 @@ SPDX-FileContributor: Sebastian Thomschke (https://sebthom.de), Vegard IT GmbH (
 SPDX-License-Identifier: EPL-2.0
 SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -24,6 +26,13 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
 
   <dependencies>
 
+    <!--
+      transitive dependency org.eclipse.swt is excluded from all dependencies to avoid:
+      Error: 'dependencies.dependency.artifactId' for org.eclipse.platform:org.eclipse.swt.${osgi.platform}:jar
+               with value 'org.eclipse.swt.${osgi.platform}' does not match a valid id pattern. @
+
+      since we want to generate/validate EEAs for SWT, we explicitly add one flavor (win32.win32.x86_64) as direct dependency:
+    -->
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
@@ -79,6 +88,12 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
       <artifactId>org.eclipse.jface.notifications</artifactId>
       <version>0.7.300</version>
       <scope>provided</scope>
+      <exclusions>
+         <exclusion>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.swt</artifactId>
+         </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -100,13 +115,25 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
       <artifactId>org.eclipse.ltk.ui.refactoring</artifactId>
       <version>3.13.400</version>
       <scope>provided</scope>
+      <exclusions>
+         <exclusion>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.swt</artifactId>
+         </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.search</artifactId>
       <version>3.16.300</version>
       <scope>provided</scope>
+      <exclusions>
+         <exclusion>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.swt</artifactId>
+         </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -115,10 +142,6 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
       <version>3.8.300</version>
       <scope>provided</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.platform</groupId>
-          <artifactId>org.eclipse.swt</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.sun.jna</groupId>
           <artifactId>*</artifactId>
@@ -140,10 +163,6 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
       <version>3.6.400</version>
       <scope>provided</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.platform</groupId>
-          <artifactId>org.eclipse.swt</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.sun.jna</groupId>
           <artifactId>*</artifactId>