You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2024/12/31 10:39:54 UTC
(maven-wagon) branch WAGON-642 created (now e3727af3)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch WAGON-642
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
at e3727af3 [WAGON-642] Uopgrade parent pom to 43 and fix checkstyle
This branch includes the following new commits:
new e3727af3 [WAGON-642] Uopgrade parent pom to 43 and fix checkstyle
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-wagon) 01/01: [WAGON-642] Uopgrade parent pom to 43 and fix checkstyle
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch WAGON-642
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit e3727af3fe3ca85734c978ce693efc19567d45b2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Dec 27 15:01:10 2024 +0100
[WAGON-642] Uopgrade parent pom to 43 and fix checkstyle
---
pom.xml | 2 +-
.../src/main/java/org/apache/maven/wagon/WagonTestCase.java | 11 ++++++++++-
.../java/org/apache/maven/wagon/providers/ssh/ScpCommand.java | 2 --
.../org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java | 2 ++
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f9e152e..7e2af9a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>41</version>
+ <version>43</version>
</parent>
<groupId>org.apache.maven.wagon</groupId>
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index b0953cc5..15914220 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -44,7 +44,16 @@ import org.junit.Assume;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.anyInt;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.getCurrentArguments;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
index 4142e293..c192ea07 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
@@ -263,7 +263,6 @@ public class ScpCommand implements Command, Runnable, FileSystemAware {
throw new IOException("Expected a D message but got '" + header + "'");
}
- String perms = header.substring(1, 5);
int length = Integer.parseInt(header.substring(6, header.indexOf(' ', 6)));
String name = header.substring(header.indexOf(' ', 6) + 1);
@@ -309,7 +308,6 @@ public class ScpCommand implements Command, Runnable, FileSystemAware {
throw new IOException("Expected a C message but got '" + header + "'");
}
- String perms = header.substring(1, 5);
long length = Long.parseLong(header.substring(6, header.indexOf(' ', 6)));
String name = header.substring(header.indexOf(' ', 6) + 1);
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
index a9ec7064..71048ed1 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
@@ -85,9 +85,11 @@ public class SftpWagon extends AbstractJschWagon {
try {
String dir = ScpHelper.getResourceDirectory(resource.getName());
String[] dirs = PathUtils.dirnames(dir);
+ // CHECKSTYLE_OFF: UnusedLocalVariable
for (String d : dirs) {
channel.cd("..");
}
+ // CHECKSTYLE_ON: UnusedLocalVariable
} catch (SftpException e) {
fireTransferDebug("Error returning to parent directory: " + e.getMessage());
}