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 2021/07/20 10:07:37 UTC
[incubator-hop] branch master updated: HOP-3102: add commons-net
dependency to lib
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 9bae187 HOP-3102: add commons-net dependency to lib
new 7675f0d Merge pull request #951 from hansva/master
9bae187 is described below
commit 9bae1870086cab00aaf4bfbd3ac308ab3633917c
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Jul 20 10:28:51 2021 +0200
HOP-3102: add commons-net dependency to lib
---
assemblies/plugins/actions/ftp/src/assembly/assembly.xml | 7 -------
.../plugins/tech/parquet/src/assembly/assembly.xml | 1 -
core/pom.xml | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/assemblies/plugins/actions/ftp/src/assembly/assembly.xml b/assemblies/plugins/actions/ftp/src/assembly/assembly.xml
index 7b4fc58..6c47186 100644
--- a/assemblies/plugins/actions/ftp/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/ftp/src/assembly/assembly.xml
@@ -48,13 +48,6 @@
<include>org.apache.hop:hop-action-ftp:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>commons-net:commons-net:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/tech/parquet/src/assembly/assembly.xml b/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
index 11bb700..7d31214 100644
--- a/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
@@ -57,7 +57,6 @@
<include>commons-collections:commons-collections:jar</include>
<include>commons-digester:commons-digester:jar</include>
<include>commons-httpclient:commons-httpclient:jar</include>
- <include>commons-net:commons-net:jar</include>
<include>com.sun.jersey:jersey-client:jar</include>
<include>com.sun.jersey:jersey-core:jar</include>
<include>io.netty:netty:jar</include>
diff --git a/core/pom.xml b/core/pom.xml
index 1326a3f..bd4ff88 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,6 +50,7 @@
<commons-io.version>2.2</commons-io.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-pool.version>1.5.7</commons-pool.version>
+ <commons-net.version>3.7.2</commons-net.version>
<jsch.version>0.1.54</jsch.version>
<jzlib.version>1.0.7</jzlib.version>
<ognl.version>2.6.9</ognl.version>
@@ -92,6 +93,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -314,6 +319,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>