Repository: mina-sshd Updated Branches: refs/heads/master 222118e71 -> 642a8f3b2
Using Spring BOM instead of specific artifacts in Maven POM dependency management Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/642a8f3b Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/642a8f3b Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/642a8f3b Branch: refs/heads/master Commit: 642a8f3b292e78b1f3f5cd3abd07b764e769f119 Parents: 222118e Author: Goldstein Lyor <[email protected]> Authored: Wed Jan 3 07:48:03 2018 +0200 Committer: Goldstein Lyor <[email protected]> Committed: Wed Jan 3 07:48:03 2018 +0200 ---------------------------------------------------------------------- pom.xml | 38 +++----------------- .../org/apache/sshd/common/scp/ScpHelper.java | 9 ++--- 2 files changed, 10 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/642a8f3b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 59eb0d3..2dc96b3 100644 --- a/pom.xml +++ b/pom.xml @@ -260,43 +260,15 @@ <artifactId>jzlib</artifactId> <version>1.1.3</version> </dependency> + <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - <exclusions> - <exclusion> <!-- we are using jcl-over-slf4j --> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> + <artifactId>spring-framework-bom</artifactId> <version>${spring.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </exclusion> - </exclusions> + <type>pom</type> + <scope>import</scope> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/642a8f3b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java index ba8eb11..366e296 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java @@ -123,10 +123,11 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess Path path = new MockPath(line); receiveStream(line, new ScpTargetStreamResolver() { - @SuppressWarnings("synthetic-access") @Override - public OutputStream resolveTargetStream(Session session, String name, long length, - Set<PosixFilePermission> perms, OpenOption... options) throws IOException { + @SuppressWarnings("synthetic-access") + public OutputStream resolveTargetStream( + Session session, String name, long length, Set<PosixFilePermission> perms, OpenOption... options) + throws IOException { if (log.isDebugEnabled()) { log.debug("resolveTargetStream({}) name={}, perms={}, len={} - started local stream download", ScpHelper.this, name, perms, length); @@ -139,8 +140,8 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess return path; } - @SuppressWarnings("synthetic-access") @Override + @SuppressWarnings("synthetic-access") public void postProcessReceivedData(String name, boolean preserve, Set<PosixFilePermission> perms, ScpTimestamp time) throws IOException { if (log.isDebugEnabled()) { log.debug("postProcessReceivedData({}) name={}, perms={}, preserve={} time={}",
