This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e41f2ba1552 HADOOP-19392: Upgrade ftpserver to resolve maven/pom issue
(#7311) Contributed by YanivKunda.
e41f2ba1552 is described below
commit e41f2ba15521e7a363defc8a0e4840e0c004a126
Author: Yaniv Kunda <ya...@kundas.net>
AuthorDate: Thu Jan 23 00:24:23 2025 +0200
HADOOP-19392: Upgrade ftpserver to resolve maven/pom issue (#7311)
Contributed by YanivKunda.
Reviewed-by: Chris Nauroth <cnaur...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java | 8 +-------
hadoop-project/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
index f26576c84d1..618ddf97b54 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
@@ -245,16 +245,10 @@ private static void touch(FileSystem fs, Path filePath)
private static void touch(FileSystem fs, Path path, byte[] data)
throws IOException {
- FSDataOutputStream out = null;
- try {
- out = fs.create(path);
+ try (FSDataOutputStream out = fs.create(path)) {
if (data != null) {
out.write(data);
}
- } finally {
- if (out != null) {
- out.close();
- }
}
}
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 387dd9a52a8..30fa86808de 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1131,12 +1131,12 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
