You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/05/22 16:12:22 UTC

[hop] branch master updated: HOP-3480: fix assembly

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new b0f4ba9102 HOP-3480: fix assembly
     new 7a04edcc17 Merge pull request #1499 from hansva/master
b0f4ba9102 is described below

commit b0f4ba910219aed3e3ea4e74d4cff99c91520650
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun May 22 18:08:43 2022 +0200

    HOP-3480: fix assembly
---
 assemblies/plugins/dist/pom.xml                             | 13 +++++++++++++
 .../plugins/transforms/formula/src/assembly/assembly.xml    |  5 -----
 assemblies/plugins/transforms/pom.xml                       |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/assemblies/plugins/dist/pom.xml b/assemblies/plugins/dist/pom.xml
index 201ccfff04..a379bcfbad 100644
--- a/assemblies/plugins/dist/pom.xml
+++ b/assemblies/plugins/dist/pom.xml
@@ -1387,6 +1387,19 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.hop</groupId>
+      <artifactId>hop-assemblies-plugins-transforms-formula</artifactId>
+      <version>${hop-plugins-transforms.version}</version>
+      <type>zip</type>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.hop</groupId>
       <artifactId>hop-assemblies-plugins-transforms-fuzzymatch</artifactId>
diff --git a/assemblies/plugins/transforms/formula/src/assembly/assembly.xml b/assemblies/plugins/transforms/formula/src/assembly/assembly.xml
index b5b006d199..6d3a88b94e 100644
--- a/assemblies/plugins/transforms/formula/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/formula/src/assembly/assembly.xml
@@ -30,11 +30,6 @@
             <outputDirectory>.</outputDirectory>
             <filtered>true</filtered>
         </file>
-<!--        <file>-->
-<!--            <source>${project.basedir}/src/main/resources/dependencies.xml</source>-->
-<!--            <outputDirectory>.</outputDirectory>-->
-<!--            <filtered>true</filtered>-->
-<!--        </file>-->
     </files>
     <fileSets>
         <fileSet>
diff --git a/assemblies/plugins/transforms/pom.xml b/assemblies/plugins/transforms/pom.xml
index 58a8628ddb..b4590a63bc 100644
--- a/assemblies/plugins/transforms/pom.xml
+++ b/assemblies/plugins/transforms/pom.xml
@@ -80,6 +80,7 @@
     <module>filestoresult</module>
     <module>filterrows</module>
     <module>flattener</module>
+    <module>formula</module>
     <module>fuzzymatch</module>
     <module>getfilenames</module>
     <module>getfilesrowcount</module>