This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 1.2.X
in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/1.2.X by this push:
new 4864d0e6 Apply patch for FtpServer-446 regarding UserMetadata
4864d0e6 is described below
commit 4864d0e66d392d014ae19a7df18d40fd5f37dc9b
Author: emmanuel lecharny <[email protected]>
AuthorDate: Wed Jul 12 09:53:13 2023 +0200
Apply patch for FtpServer-446 regarding UserMetadata
---
core/src/main/java/org/apache/ftpserver/command/impl/PASS.java | 2 +-
.../java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java | 1 -
.../java/org/apache/ftpserver/usermanager/{impl => }/UserMetadata.java | 2 +-
.../apache/ftpserver/usermanager/UsernamePasswordAuthentication.java | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
b/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
index 3e691246..692ce8d4 100644
--- a/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
+++ b/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
@@ -37,8 +37,8 @@ import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.apache.ftpserver.usermanager.AnonymousAuthentication;
+import org.apache.ftpserver.usermanager.UserMetadata;
import org.apache.ftpserver.usermanager.UsernamePasswordAuthentication;
-import org.apache.ftpserver.usermanager.impl.UserMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java
b/core/src/main/java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java
index 797f64d5..3f3f7038 100644
---
a/core/src/main/java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java
+++
b/core/src/main/java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java
@@ -20,7 +20,6 @@
package org.apache.ftpserver.usermanager;
import org.apache.ftpserver.ftplet.Authentication;
-import org.apache.ftpserver.usermanager.impl.UserMetadata;
/**
* Class representing an anonymous authentication attempt
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java
b/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java
similarity index 98%
rename from
core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java
rename to core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java
index d978e19c..d5cb94ea 100644
--- a/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java
+++ b/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.usermanager.impl;
+package org.apache.ftpserver.usermanager;
import java.net.InetAddress;
import java.security.cert.Certificate;
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthentication.java
b/core/src/main/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthentication.java
index 546b6c57..9b8e3dc3 100644
---
a/core/src/main/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthentication.java
+++
b/core/src/main/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthentication.java
@@ -20,7 +20,6 @@
package org.apache.ftpserver.usermanager;
import org.apache.ftpserver.ftplet.Authentication;
-import org.apache.ftpserver.usermanager.impl.UserMetadata;
/**
* Class representing a normal authentication attempt using username and
