Skip to content

Commit a766e4d

Browse files
committed
upgrade jcifs version from 2.1.40 to 3.0.0
closes #10533 Signed-off-by: Daniel Frey <[email protected]>
1 parent 1dc6b82 commit a766e4d

31 files changed

+87
-57
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ext {
7171
jacksonVersion = '2.20.0'
7272
jackson3Version = '3.0.1'
7373
jaxbVersion = '4.0.6'
74-
jcifsVersion = '2.1.40'
74+
jcifsVersion = '3.0.0'
7575
jeroMqVersion = '0.6.0'
7676
jmsApiVersion = '3.1.0'
7777
jpaApiVersion = '3.2.0'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.io.File;
2020
import java.util.Comparator;
2121

22-
import jcifs.smb.SmbFile;
22+
import org.codelibs.jcifs.smb.impl.SmbFile;
2323
import org.jspecify.annotations.Nullable;
2424

2525
import org.springframework.integration.file.remote.MessageSessionCallback;
@@ -35,6 +35,7 @@
3535
*
3636
* @author Gregory Bragg
3737
* @author Artem Bilan
38+
* @author Daniel Frey
3839
*
3940
* @since 6.0
4041
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.io.File;
2020
import java.util.Comparator;
2121

22-
import jcifs.smb.SmbFile;
22+
import org.codelibs.jcifs.smb.impl.SmbFile;
2323
import org.jspecify.annotations.Nullable;
2424

2525
import org.springframework.integration.file.dsl.RemoteFileInboundChannelAdapterSpec;
@@ -38,6 +38,7 @@
3838
*
3939
* @author Gregory Bragg
4040
* @author Artem Bilan
41+
* @author Daniel Frey
4142
*
4243
* @since 6.0
4344
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.integration.smb.dsl;
1818

19-
import jcifs.smb.SmbFile;
19+
import org.codelibs.jcifs.smb.impl.SmbFile;
2020

2121
import org.springframework.integration.file.dsl.FileTransferringMessageHandlerSpec;
2222
import org.springframework.integration.file.remote.session.SessionFactory;
@@ -28,6 +28,7 @@
2828
* A {@link FileTransferringMessageHandlerSpec} for SMB.
2929
*
3030
* @author Gregory Bragg
31+
* @author Daniel Frey
3132
*
3233
* @since 6.0
3334
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.integration.smb.dsl;
1818

19-
import jcifs.smb.SmbFile;
19+
import org.codelibs.jcifs.smb.impl.SmbFile;
2020

2121
import org.springframework.integration.file.dsl.RemoteFileOutboundGatewaySpec;
2222
import org.springframework.integration.smb.filters.SmbRegexPatternFileListFilter;
@@ -27,6 +27,7 @@
2727
* A {@link RemoteFileOutboundGatewaySpec} for SMB.
2828
*
2929
* @author Gregory Bragg
30+
* @author Daniel Frey
3031
*
3132
* @since 6.0
3233
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.Comparator;
2020

21-
import jcifs.smb.SmbFile;
21+
import org.codelibs.jcifs.smb.impl.SmbFile;
2222
import org.jspecify.annotations.Nullable;
2323

2424
import org.springframework.integration.file.dsl.RemoteFileStreamingInboundChannelAdapterSpec;
@@ -36,6 +36,7 @@
3636
*
3737
* @author Gregory Bragg
3838
* @author Artem Bilan
39+
* @author Daniel Frey
3940
*
4041
* @since 6.0
4142
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.time.Instant;
2121
import java.util.function.Consumer;
2222

23-
import jcifs.smb.SmbFile;
23+
import org.codelibs.jcifs.smb.impl.SmbFile;
2424

2525
import org.springframework.integration.file.filters.AbstractLastModifiedFileListFilter;
2626

@@ -33,6 +33,7 @@
3333
* When discardCallback {@link #addDiscardCallback(Consumer)} is provided, it called for all the rejected files.
3434
*
3535
* @author Adama Sorho
36+
* @author Daniel Frey
3637
*
3738
* @since 6.2
3839
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.integration.smb.filters;
1818

19-
import jcifs.smb.SmbFile;
19+
import org.codelibs.jcifs.smb.impl.SmbFile;
2020

2121
import org.springframework.integration.file.filters.AbstractPersistentAcceptOnceFileListFilter;
2222
import org.springframework.integration.metadata.ConcurrentMetadataStore;
@@ -26,6 +26,7 @@
2626
*
2727
* @author Prafull Kumar Soni
2828
* @author Artem Bilan
29+
* @author Daniel Frey
2930
*
3031
* @since 6.0
3132
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
import java.time.Duration;
2020
import java.time.Instant;
2121

22-
import jcifs.smb.SmbFile;
22+
import org.codelibs.jcifs.smb.impl.SmbFile;
2323

2424
import org.springframework.integration.file.filters.AbstractRecentFileListFilter;
2525

2626
/**
2727
* The {@link AbstractRecentFileListFilter} implementation for SMB protocol.
2828
*
2929
* @author Artem Bilan
30+
* @author Daniel Frey
3031
*
3132
* @since 6.2
3233
*/

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.io.UncheckedIOException;
2020
import java.util.regex.Pattern;
2121

22-
import jcifs.smb.SmbException;
23-
import jcifs.smb.SmbFile;
22+
import org.codelibs.jcifs.smb.impl.SmbException;
23+
import org.codelibs.jcifs.smb.impl.SmbFile;
2424

2525
import org.springframework.integration.file.filters.AbstractRegexPatternFileListFilter;
2626

@@ -29,6 +29,7 @@
2929
*
3030
* @author Markus Spann
3131
* @author Prafull Kumar Soni
32+
* @author Daniel Frey
3233
*
3334
* @since 6.0
3435
*/

0 commit comments

Comments
 (0)