diff --git a/spring-integration-smb/build.gradle b/spring-integration-smb/build.gradle index 5891fbb..933768b 100644 --- a/spring-integration-smb/build.gradle +++ b/spring-integration-smb/build.gradle @@ -15,7 +15,7 @@ plugins { id 'idea' id 'jacoco' id 'checkstyle' - id 'org.sonarqube' version '2.1' + id 'org.sonarqube' version '2.6.2' } description = 'Spring Integration SMB Support' @@ -54,12 +54,13 @@ compileTestJava { } ext { + idPrefix = 'smb' + jcifsVersion = '1.3.18.3' - log4jVersion = '1.2.17' + log4jVersion = '2.11.0' springIntegrationVersion = '5.0.4.RELEASE' - idPrefix = 'smb' - + linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions' linkCi = 'https://build.springsource.org/browse/INTEXT' linkIssue = 'https://jira.springsource.org/browse/INTEXT' @@ -85,7 +86,7 @@ jacoco { checkstyle { configFile = file("$rootDir/src/checkstyle/checkstyle.xml") - toolVersion = "6.16.1" + toolVersion = "8.9" } dependencies { @@ -94,7 +95,9 @@ dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" - testRuntime "log4j:log4j:$log4jVersion" + + testRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" + testRuntime "org.apache.logging.log4j:log4j-jcl:$log4jVersion" } // enable all compiler warnings; individual projects may customize further diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar index cf7c6b9..91ca28c 100644 Binary files a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties index 0cbb8f5..16d2805 100644 --- a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties +++ b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Jan 16 10:37:27 EST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip diff --git a/spring-integration-smb/gradlew b/spring-integration-smb/gradlew index 4453cce..cccdd3d 100755 --- a/spring-integration-smb/gradlew +++ b/spring-integration-smb/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/spring-integration-smb/src/checkstyle/checkstyle.xml b/spring-integration-smb/src/checkstyle/checkstyle.xml index 543ba4d..92dafb3 100644 --- a/spring-integration-smb/src/checkstyle/checkstyle.xml +++ b/spring-integration-smb/src/checkstyle/checkstyle.xml @@ -24,11 +24,11 @@ - - - - - + + + + @@ -53,7 +53,7 @@ - + @@ -94,13 +94,13 @@ - - - - - - - + + + + + + + diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java index 3463af3..cba6dd4 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java @@ -16,10 +16,11 @@ package org.springframework.integration.smb.filters; -import jcifs.smb.SmbFile; import org.springframework.integration.file.filters.AbstractPersistentAcceptOnceFileListFilter; import org.springframework.integration.metadata.ConcurrentMetadataStore; +import jcifs.smb.SmbFile; + /** * Implementation of {@link AbstractPersistentAcceptOnceFileListFilter} for SMB. * @@ -41,4 +42,5 @@ public class SmbPersistentAcceptOnceFileListFilter extends AbstractPersistentAcc protected String fileName(SmbFile file) { return file.getName(); } + } diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java index cee05cb..eec0178 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java @@ -19,9 +19,9 @@ package org.springframework.integration.smb.filters; import java.io.UncheckedIOException; import java.util.regex.Pattern; -import jcifs.smb.SmbException; import org.springframework.integration.file.filters.AbstractRegexPatternFileListFilter; +import jcifs.smb.SmbException; import jcifs.smb.SmbFile; /** @@ -60,4 +60,5 @@ public class SmbRegexPatternFileListFilter extends AbstractRegexPatternFileListF throw new UncheckedIOException(e); } } + } diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java index 7891149..4f4943c 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.smb.filters; -import jcifs.smb.SmbException; +import java.io.UncheckedIOException; + import org.springframework.integration.file.filters.AbstractSimplePatternFileListFilter; +import jcifs.smb.SmbException; import jcifs.smb.SmbFile; -import java.io.UncheckedIOException; - /** * Implementation of {@link AbstractSimplePatternFileListFilter} for SMB. * @@ -57,4 +57,5 @@ public class SmbSimplePatternFileListFilter extends AbstractSimplePatternFileLis throw new UncheckedIOException(e); } } + } diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java index baf18be..a012d43 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java @@ -16,12 +16,13 @@ package org.springframework.integration.smb.filters; -import jcifs.smb.SmbFile; +import java.util.Map; +import java.util.function.Function; + import org.springframework.integration.file.filters.AbstractMarkerFilePresentFileListFilter; import org.springframework.integration.file.filters.FileListFilter; -import java.util.Map; -import java.util.function.Function; +import jcifs.smb.SmbFile; /** * Implementation of {@link AbstractMarkerFilePresentFileListFilter} for SMB. @@ -50,4 +51,5 @@ public class SmbSystemMarkerFilePresentFileListFilter extends AbstractMarkerFile protected String getFilename(SmbFile file) { return file.getName(); } + } diff --git a/spring-integration-smb/src/main/resources/META-INF/spring.schemas b/spring-integration-smb/src/main/resources/META-INF/spring.schemas index 292ec41..2b5fb20 100644 --- a/spring-integration-smb/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-smb/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/smb/spring-integration-smb-0.5.xsd=org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd -http\://www.springframework.org/schema/integration/smb/spring-integration-smb.xsd=org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/smb/spring-integration-smb-1.0.xsd=org/springframework/integration/smb/config/spring-integration-smb-1.0.xsd +http\://www.springframework.org/schema/integration/smb/spring-integration-smb.xsd=org/springframework/integration/smb/config/spring-integration-smb-1.0.xsd diff --git a/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd b/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-1.0.xsd similarity index 100% rename from spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd rename to spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-1.0.xsd diff --git a/spring-integration-smb/src/test/resources/log4j.properties b/spring-integration-smb/src/test/resources/log4j.properties deleted file mode 100644 index 4e677ad..0000000 --- a/spring-integration-smb/src/test/resources/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -log4j.rootCategory=WARN, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n - -log4j.category.org.springframework.integration=WARN -log4j.category.org.springframework.integration.smb=WARN diff --git a/spring-integration-smb/src/test/resources/log4j2-test.xml b/spring-integration-smb/src/test/resources/log4j2-test.xml new file mode 100644 index 0000000..3a98870 --- /dev/null +++ b/spring-integration-smb/src/test/resources/log4j2-test.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +