This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new a65630dd28 fix #6221, fix #5011 (#6296)
a65630dd28 is described below
commit a65630dd28aadd426b6f38f4d776327b3594a91b
Author: Sergio Ramazzina <[email protected]>
AuthorDate: Tue Jan 6 08:12:53 2026 +0100
fix #6221, fix #5011 (#6296)
* fix #6221
* remove duplicate jar, align versions
---------
Co-authored-by: Hans Van Akelyen <[email protected]>
---
core/pom.xml | 4 ++++
lib/pom.xml | 7 ++++++-
plugins/actions/ftp/src/assembly/assembly.xml | 9 +--------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 318497f160..8acd272033 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -94,6 +94,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index c285320a19..e9349a548e 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -61,7 +61,7 @@
<commons-lang3.version>3.18.0</commons-lang3.version>
<commons-logging.version>1.3.5</commons-logging.version>
<commons-math3.version>3.6.1</commons-math3.version>
- <commons-net.version>3.11.1</commons-net.version>
+ <commons-net.version>3.12.0</commons-net.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-text.version>1.13.1</commons-text.version>
<commons-vfs2.version>2.10.0</commons-vfs2.version>
@@ -577,6 +577,11 @@
<artifactId>commons-vfs2</artifactId>
<version>${commons-vfs2.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
diff --git a/plugins/actions/ftp/src/assembly/assembly.xml
b/plugins/actions/ftp/src/assembly/assembly.xml
index 7aeaa9bca8..61322716fe 100644
--- a/plugins/actions/ftp/src/assembly/assembly.xml
+++ b/plugins/actions/ftp/src/assembly/assembly.xml
@@ -43,16 +43,9 @@
<dependencySet>
<includes>
<include>com.github.mwiede:jsch:jar</include>
- </includes>
- <outputDirectory>lib/core</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- <dependencySet>
- <includes>
<include>commons-net:commons-net:jar</include>
</includes>
- <outputDirectory>plugins/actions/ftp/lib</outputDirectory>
+ <outputDirectory>lib/core</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
