Merge pull request #4188 from hansva/4187

move SWT to compile so plugins don't need to add it, fixes #4187
apache · Aug 2, 2024 · c345f70 · c345f70
2 parents 072ba12 + ec152df
commit c345f70
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/engine-beam/pom.xml b/engine-beam/pom.xml
@@ -68,6 +68,10 @@
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.xerial.snappy</groupId>
+                    <artifactId>snappy-java</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/plugins/engines/beam/src/assembly/assembly.xml b/plugins/engines/beam/src/assembly/assembly.xml
@@ -49,6 +49,7 @@
                 <exclude>org.apache.hop:hop-engines-beam:jar</exclude>
                 <exclude>org.apache.hadoop:*:jar</exclude>
                 <exclude>org.apache.hadoop.thirdparty:*:jar</exclude>
+                <exclude>org.yaml:snakeyaml:jar</exclude>
             </excludes>
             <outputDirectory>lib/beam</outputDirectory>
         </dependencySet>
@@ -57,10 +58,8 @@
             <includes>
                 <include>org.apache.hadoop:*:jar</include>
                 <include>org.apache.hadoop.thirdparty:*:jar</include>
+                <include>org.yaml:snakeyaml:jar</include>
             </includes>
-            <excludes>
-                <exclude>org.apache.hop:hop-engines-beam:jar</exclude>
-            </excludes>
             <outputDirectory>lib/core</outputDirectory>
         </dependencySet>
     </dependencySets>

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -57,6 +57,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>${swt.artifactId}</artifactId>
+            <version>${org.eclipse.platform.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.hop</groupId>
             <artifactId>hop-core</artifactId>
@@ -69,12 +75,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.platform</groupId>
-            <artifactId>${swt.artifactId}</artifactId>
-            <version>${org.eclipse.platform.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.hop</groupId>
             <artifactId>hop-core</artifactId>

diff --git a/ui/src/assembly/assembly.xml b/ui/src/assembly/assembly.xml
@@ -26,6 +26,9 @@
     <baseDirectory>lib/core</baseDirectory>
     <dependencySets>
         <dependencySet>
+            <excludes>
+                <exclude>org.eclipse.platform:*</exclude>
+            </excludes>
             <outputDirectory>.</outputDirectory>
         </dependencySet>
     </dependencySets>