upgrade jcifs version from 2.1.40 to 3.0.0

build.gradle

@@ -71,7 +71,7 @@ ext {
     jacksonVersion = '2.20.0'
     jackson3Version = '3.0.1'
     jaxbVersion = '4.0.6'
-    jcifsVersion = '2.1.40'
+    jcifsVersion = '3.0.0'
     jeroMqVersion = '0.6.0'
     jmsApiVersion = '3.1.0'
     jpaApiVersion = '3.2.0'

spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/Smb.java

@@ -19,7 +19,7 @@
 import java.io.File;
 import java.util.Comparator;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.MessageSessionCallback;
@@ -35,6 +35,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbInboundChannelAdapterSpec.java

@@ -19,7 +19,7 @@
 import java.io.File;
 import java.util.Comparator;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.dsl.RemoteFileInboundChannelAdapterSpec;
@@ -38,6 +38,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbMessageHandlerSpec.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.smb.dsl;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.dsl.FileTransferringMessageHandlerSpec;
 import org.springframework.integration.file.remote.session.SessionFactory;
@@ -28,6 +28,7 @@
  * A {@link FileTransferringMessageHandlerSpec} for SMB.
  *
  * @author Gregory Bragg
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbOutboundGatewaySpec.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.smb.dsl;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.dsl.RemoteFileOutboundGatewaySpec;
 import org.springframework.integration.smb.filters.SmbRegexPatternFileListFilter;
@@ -27,6 +27,7 @@
  * A {@link RemoteFileOutboundGatewaySpec} for SMB.
  *
  * @author Gregory Bragg
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbStreamingInboundChannelAdapterSpec.java

@@ -18,7 +18,7 @@
 
 import java.util.Comparator;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.dsl.RemoteFileStreamingInboundChannelAdapterSpec;
@@ -36,6 +36,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbLastModifiedFileListFilter.java

@@ -20,7 +20,7 @@
 import java.time.Instant;
 import java.util.function.Consumer;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractLastModifiedFileListFilter;
 
@@ -33,6 +33,7 @@
  * When discardCallback {@link #addDiscardCallback(Consumer)} is provided, it called for all the rejected files.
  *
  * @author Adama Sorho
+ * @author Daniel Frey
  *
  * @since 6.2
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.smb.filters;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractPersistentAcceptOnceFileListFilter;
 import org.springframework.integration.metadata.ConcurrentMetadataStore;
@@ -26,6 +26,7 @@
  *
  * @author Prafull Kumar Soni
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRecentFileListFilter.java

@@ -19,14 +19,15 @@
 import java.time.Duration;
 import java.time.Instant;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractRecentFileListFilter;
 
 /**
  * The {@link AbstractRecentFileListFilter} implementation for SMB protocol.
  *
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.2
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java

@@ -19,8 +19,8 @@
 import java.io.UncheckedIOException;
 import java.util.regex.Pattern;
 
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractRegexPatternFileListFilter;
 
@@ -29,6 +29,7 @@
  *
  * @author Markus Spann
  * @author Prafull Kumar Soni
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java

@@ -18,8 +18,8 @@
 
 import java.io.UncheckedIOException;
 
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractSimplePatternFileListFilter;
 
@@ -28,6 +28,7 @@
  *
  * @author Markus Spann
  * @author Prafull Kumar Soni
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.filters.AbstractMarkerFilePresentFileListFilter;
 import org.springframework.integration.file.filters.FileListFilter;
@@ -28,6 +28,7 @@
  * Implementation of {@link AbstractMarkerFilePresentFileListFilter} for SMB.
  *
  * @author Prafull Kumar Soni
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.smb.inbound;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer;
@@ -26,6 +26,7 @@
  *
  * @author Markus Spann
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java

@@ -19,7 +19,7 @@
 import java.io.File;
 import java.util.Comparator;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer;
@@ -29,6 +29,7 @@
  * A {@link org.springframework.integration.core.MessageSource} implementation for SMB.
  *
  * @author Markus Spann
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java

@@ -21,8 +21,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.AbstractFileInfo;
@@ -37,6 +37,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  *

spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbMessageHandler.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.smb.outbound;
 
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 
 import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler;
 import org.springframework.integration.file.remote.session.SessionFactory;
@@ -29,6 +29,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  *

spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java

@@ -20,8 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.AbstractFileInfo;
@@ -37,6 +37,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java

@@ -21,7 +21,7 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-import jcifs.DialectVersion;
+import org.codelibs.jcifs.smb.DialectVersion;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -37,6 +37,7 @@
  * @author Artem Bilan
  * @author Gregory Bragg
  * @author Jelle Smits
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbFileInfo.java

@@ -18,11 +18,11 @@
 
 import java.io.IOException;
 
-import jcifs.internal.dtyp.ACE;
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.codelibs.jcifs.smb.ACE;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.AbstractFileInfo;
@@ -33,6 +33,7 @@
  *
  * @author Gregory Bragg
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */
@@ -103,8 +104,8 @@ public String getFilename() {
 	 * </pre>
 	 * @return a list of Access Control Entry (ACE) objects representing the security
 	 * descriptor entry and permissions associated with this file or directory.
-	 * @see jcifs.ACE
-	 * @see jcifs.SID
+	 * @see org.codelibs.jcifs.smb.ACE
+	 * @see org.codelibs.jcifs.smb.SID
 	 */
 	@Override
 	public @Nullable String getPermissions() {

spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbRemoteFileTemplate.java

@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-import jcifs.smb.NtStatus;
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
+import org.codelibs.jcifs.smb.impl.NtStatus;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.RemoteFileTemplate;
@@ -30,6 +30,7 @@
  * The SMB-specific {@link RemoteFileTemplate} implementation.
  *
  * @author Artem Bilan
+ * @author Daniel Frey
  *
  * @since 6.0
  */

spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java

@@ -25,9 +25,9 @@
 import java.net.URL;
 import java.util.Arrays;
 
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
-import jcifs.smb.SmbFileOutputStream;
+import org.codelibs.jcifs.smb.impl.SmbException;
+import org.codelibs.jcifs.smb.impl.SmbFile;
+import org.codelibs.jcifs.smb.impl.SmbFileOutputStream;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.log.LogAccessor;
@@ -55,6 +55,7 @@
  * @author Gregory Bragg
  * @author Adam Jones
  * @author Paolo Fosser
+ * @author Daniel Frey
  *
  * @since 6.0
  */