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 2020/12/11 10:39:54 UTC
[incubator-hop] branch master updated: HOP-2273 Replace duplicate
Hop jar files with dependencies.xml
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/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new d41f12f HOP-2273 Replace duplicate Hop jar files with dependencies.xml
new c2cbb02 Merge pull request #454 from nadment/HOP-2273
d41f12f is described below
commit d41f12f00e8bf0fc46d4c9421104a38721aa3079
Author: nadment <na...@gmail.com>
AuthorDate: Thu Dec 10 23:41:09 2020 +0100
HOP-2273 Replace duplicate Hop jar files with dependencies.xml
---
.../javascript/src/assembly/assembly.xml | 26 +++++-----------------
.../javascript/src/main/resources/dependencies.xml | 5 +++++
.../transforms/mailinput/src/assembly/assembly.xml | 12 +++++-----
.../mailinput/src/main/resources/dependencies.xml | 3 +++
.../transforms/syslog/src/assembly/assembly.xml | 13 +++++------
.../syslog/src/main/resources/dependencies.xml | 3 +++
6 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml b/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
index 866ea1e..b7ffb4f 100644
--- a/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
@@ -12,6 +12,11 @@
<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>
@@ -30,27 +35,6 @@
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.hop:hop-transform-fieldsplitter:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.hop:hop-transform-rowgenerator:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.hop:hop-transform-loadfileinput:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.apache.hop:hop-transform-javascript:jar</include>
</includes>
diff --git a/assemblies/plugins/transforms/javascript/src/main/resources/dependencies.xml b/assemblies/plugins/transforms/javascript/src/main/resources/dependencies.xml
new file mode 100644
index 0000000..376d6db
--- /dev/null
+++ b/assemblies/plugins/transforms/javascript/src/main/resources/dependencies.xml
@@ -0,0 +1,5 @@
+<dependencies>
+ <folder>../fieldsplitter</folder>
+ <folder>../rowgenerator</folder>
+ <folder>../loadfileinput</folder>
+</dependencies>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml b/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
index 496226e..c92ccbd 100644
--- a/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
@@ -12,6 +12,11 @@
<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>
@@ -35,12 +40,5 @@
<include>javax.mail:mail:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.hop:hop-action-getpop:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mailinput/src/main/resources/dependencies.xml b/assemblies/plugins/transforms/mailinput/src/main/resources/dependencies.xml
new file mode 100644
index 0000000..bcac9c8
--- /dev/null
+++ b/assemblies/plugins/transforms/mailinput/src/main/resources/dependencies.xml
@@ -0,0 +1,3 @@
+<dependencies>
+ <folder>../../actions/getpop</folder>
+</dependencies>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/syslog/src/assembly/assembly.xml b/assemblies/plugins/transforms/syslog/src/assembly/assembly.xml
index 01acf1c..ff1ed99 100644
--- a/assemblies/plugins/transforms/syslog/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/syslog/src/assembly/assembly.xml
@@ -12,7 +12,12 @@
<outputDirectory>.</outputDirectory>
<filtered>true</filtered>
</file>
- </files>
+ <file>
+ <source>${project.basedir}/src/main/resources/dependencies.xml</source>
+ <outputDirectory>.</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
<fileSets>
<fileSet>
<outputDirectory>lib</outputDirectory>
@@ -24,12 +29,6 @@
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.hop:hop-transform-syslog:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.hop:hop-action-syslog:jar</include>
diff --git a/assemblies/plugins/transforms/syslog/src/main/resources/dependencies.xml b/assemblies/plugins/transforms/syslog/src/main/resources/dependencies.xml
new file mode 100644
index 0000000..f2bf36a
--- /dev/null
+++ b/assemblies/plugins/transforms/syslog/src/main/resources/dependencies.xml
@@ -0,0 +1,3 @@
+<dependencies>
+ <folder>../../actions/syslog</folder>
+</dependencies>
\ No newline at end of file