This is an automated email from the ASF dual-hosted git repository. lgoldstein pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit c4b3f886c750e56e0356e4750d0c4e26e049a40c Author: Lyor Goldstein <lgoldst...@apache.org> AuthorDate: Mon May 9 20:48:10 2022 +0300 Upgraded Maven surefire plugin to 3.0.0-M6 --- pom.xml | 2 +- .../java/org/apache/sshd/client/config/hosts/HostPatternValue.java | 2 +- .../main/java/org/apache/sshd/common/auth/UserAuthMethodFactory.java | 2 +- .../config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java | 2 +- .../common/config/keys/loader/ssh2/Ssh2PublicKeyEntryDecoder.java | 2 +- sshd-common/src/main/java/org/apache/sshd/common/io/IoSession.java | 4 ++-- .../src/main/java/org/apache/sshd/common/util/NumberUtils.java | 2 +- .../sshd/common/util/buffer/keys/ED25519BufferPublicKeyParser.java | 2 +- .../src/main/java/org/apache/sshd/common/util/io/der/ASN1Class.java | 4 ++-- .../src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java | 4 ++-- .../src/main/java/org/apache/sshd/common/util/io/der/ASN1Type.java | 4 ++-- .../java/org/apache/sshd/common/util/io/input/NullInputStream.java | 2 +- .../apache/sshd/common/util/io/output/LoggingFilterOutputStream.java | 2 +- .../java/org/apache/sshd/common/util/io/output/NullOutputStream.java | 2 +- .../main/java/org/apache/sshd/common/util/logging/LoggerSkeleton.java | 2 +- .../test/java/org/apache/sshd/common/file/root/AssertableFile.java | 2 +- .../apache/sshd/common/file/root/RootedFileSystemProviderTest.java | 2 +- .../java/org/apache/sshd/common/signature/SignaturesDevelopment.java | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index d475cbc44..3be32905a 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ <!-- addresses multi transitive versions of jna under org.testcontainers:testcontainers:1.15.3 --> <jna.version>5.8.0</jna.version> - <surefire.plugin.version>3.0.0-M5</surefire.plugin.version> + <surefire.plugin.version>3.0.0-M6</surefire.plugin.version> <maven.archiver.version>3.5.1</maven.archiver.version> <scm.plugin.version>1.12.0</scm.plugin.version> <plexus.archiver.version>4.2.6</plexus.archiver.version> diff --git a/sshd-common/src/main/java/org/apache/sshd/client/config/hosts/HostPatternValue.java b/sshd-common/src/main/java/org/apache/sshd/client/config/hosts/HostPatternValue.java index 16f63d272..c33be090c 100644 --- a/sshd-common/src/main/java/org/apache/sshd/client/config/hosts/HostPatternValue.java +++ b/sshd-common/src/main/java/org/apache/sshd/client/config/hosts/HostPatternValue.java @@ -26,7 +26,7 @@ import org.apache.sshd.common.util.GenericUtils; /** * Represents a pattern definition in the <U>known_hosts</U> file - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> * @see <A HREF= * "https://en.wikibooks.org/wiki/OpenSSH/Client_Configuration_Files#About_the_Contents_of_the_known_hosts_Files"> diff --git a/sshd-common/src/main/java/org/apache/sshd/common/auth/UserAuthMethodFactory.java b/sshd-common/src/main/java/org/apache/sshd/common/auth/UserAuthMethodFactory.java index 1043f4ac2..85d149ee7 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/auth/UserAuthMethodFactory.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/auth/UserAuthMethodFactory.java @@ -83,7 +83,7 @@ public interface UserAuthMethodFactory<S extends SessionContext, M extends UserA /** * According to <A HREF="https://tools.ietf.org/html/rfc4252#section-8">RFC 4252 - section 8</A>: - * + * * <PRE> * Both the server and the client should check whether the underlying * transport layer provides confidentiality (i.e., if encryption is diff --git a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java index 02e79c785..a93018e10 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java @@ -66,7 +66,7 @@ import org.apache.sshd.common.util.security.SecurityUtils; * Basic support for <A HREF= * "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?rev=1.1&content-type=text/x-cvsweb-markup">OpenSSH * key file(s)</A> - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class OpenSSHKeyPairResourceParser extends AbstractKeyPairResourceParser { diff --git a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/ssh2/Ssh2PublicKeyEntryDecoder.java b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/ssh2/Ssh2PublicKeyEntryDecoder.java index 2458b7b19..8a8067381 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/ssh2/Ssh2PublicKeyEntryDecoder.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/ssh2/Ssh2PublicKeyEntryDecoder.java @@ -52,7 +52,7 @@ import org.apache.sshd.common.util.ValidateUtils; /** * Decodes a public key file encoded according to <A HREF="https://tools.ietf.org/html/rfc4716">The Secure Shell (SSH) * Public Key File Format</A> - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class Ssh2PublicKeyEntryDecoder diff --git a/sshd-common/src/main/java/org/apache/sshd/common/io/IoSession.java b/sshd-common/src/main/java/org/apache/sshd/common/io/IoSession.java index 76b00226a..02c04fcf2 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/io/IoSession.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/io/IoSession.java @@ -59,7 +59,7 @@ public interface IoSession extends ConnectionEndpointsIndicator, Closeable { /** * Sets a user defined attribute if the attribute with the specified key is not set yet. This method is same with * the following code except that the operation is performed atomically. - * + * * <pre> * <code> * if (containsAttribute(key)) { @@ -112,7 +112,7 @@ public interface IoSession extends ConnectionEndpointsIndicator, Closeable { /** * Handle received EOF. - * + * * @throws IOException If failed to shutdown the stream */ void shutdownOutputStream() throws IOException; diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/NumberUtils.java b/sshd-common/src/main/java/org/apache/sshd/common/util/NumberUtils.java index ebc9fbcbb..d346c0365 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/NumberUtils.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/NumberUtils.java @@ -272,7 +272,7 @@ public final class NumberUtils { /** * Checks if optional sign and all others are '0'-'9' - * + * * @param cs The {@link CharSequence} to check * @return {@code true} if valid integer number */ diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/ED25519BufferPublicKeyParser.java b/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/ED25519BufferPublicKeyParser.java index 36289ad6d..5ca57cd5c 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/ED25519BufferPublicKeyParser.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/ED25519BufferPublicKeyParser.java @@ -29,7 +29,7 @@ import org.apache.sshd.common.util.security.SecurityUtils; /** * TODO complete this when SSHD-440 is done - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class ED25519BufferPublicKeyParser extends AbstractBufferPublicKeyParser<PublicKey> { diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Class.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Class.java index 06003648b..3385c69c8 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Class.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Class.java @@ -64,7 +64,7 @@ public enum ASN1Class { * <P> * The first byte in DER encoding is made of following fields * </P> - * + * * <pre> *------------------------------------------------- *|Bit 8|Bit 7|Bit 6|Bit 5|Bit 4|Bit 3|Bit 2|Bit 1| @@ -72,7 +72,7 @@ public enum ASN1Class { *| Class | CF | Type | *------------------------------------------------- * </pre> - * + * * @param value The original DER encoded byte * @return The {@link ASN1Class} value - {@code null} if no match found * @see #fromTypeValue(int) diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java index 717c4d007..5ef8338ac 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java @@ -164,7 +164,7 @@ public class ASN1Object implements Serializable, Cloneable { /** * Get the value as {@link BigInteger} - * + * * @return BigInteger * @throws IOException if type not an {@link ASN1Type#INTEGER} */ @@ -184,7 +184,7 @@ public class ASN1Object implements Serializable, Cloneable { /** * Get value as string. Most strings are treated as Latin-1. - * + * * @return Java string * @throws IOException if */ diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Type.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Type.java index 906d51b63..b7decec1d 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Type.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/ASN1Type.java @@ -84,7 +84,7 @@ public enum ASN1Type { * <P> * The first byte in DER encoding is made of following fields * </P> - * + * * <pre> *------------------------------------------------- *|Bit 8|Bit 7|Bit 6|Bit 5|Bit 4|Bit 3|Bit 2|Bit 1| @@ -92,7 +92,7 @@ public enum ASN1Type { *| Class | CF | Type | *------------------------------------------------- * </pre> - * + * * @param value The original DER encoded byte * @return The {@link ASN1Type} value - {@code null} if no match found * @see #fromTypeValue(int) diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/input/NullInputStream.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/input/NullInputStream.java index fc949ec60..6153ca7e4 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/input/NullInputStream.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/input/NullInputStream.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * A {@code /dev/null} input stream - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class NullInputStream extends InputStream implements Channel { diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/LoggingFilterOutputStream.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/LoggingFilterOutputStream.java index 4511c8808..a6c5427ec 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/LoggingFilterOutputStream.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/LoggingFilterOutputStream.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; /** * Dumps everything that is written to the stream to the logger - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class LoggingFilterOutputStream extends FilterOutputStream { diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/NullOutputStream.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/NullOutputStream.java index 64ff73e08..f0ca8eb23 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/NullOutputStream.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/output/NullOutputStream.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * A {code /dev/null} output stream - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public class NullOutputStream extends OutputStream implements Channel { diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggerSkeleton.java b/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggerSkeleton.java index 50b320a42..8bcb90ab4 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggerSkeleton.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/logging/LoggerSkeleton.java @@ -23,7 +23,7 @@ import org.slf4j.helpers.MarkerIgnoringBase; /** * Provides some more default implementations for {@link org.slf4j.Logger} interface methods - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public abstract class LoggerSkeleton extends MarkerIgnoringBase { diff --git a/sshd-common/src/test/java/org/apache/sshd/common/file/root/AssertableFile.java b/sshd-common/src/test/java/org/apache/sshd/common/file/root/AssertableFile.java index 60454534f..8a2aeb030 100644 --- a/sshd-common/src/test/java/org/apache/sshd/common/file/root/AssertableFile.java +++ b/sshd-common/src/test/java/org/apache/sshd/common/file/root/AssertableFile.java @@ -27,7 +27,7 @@ import org.apache.sshd.util.test.JUnitTestSupport; /** * TODO upgrade to default methods in JDK 8 - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ public abstract class AssertableFile extends JUnitTestSupport { diff --git a/sshd-common/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java b/sshd-common/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java index e1c6c2d3d..9ec46b830 100644 --- a/sshd-common/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java +++ b/sshd-common/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java @@ -52,7 +52,7 @@ import org.junit.runners.MethodSorters; * * Individual tests are form pairs (e.g. testX, testXInvalid) where testXInvalid is expected to test a parent path of * {@link RootedFileSystem#getRoot()} - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/sshd-common/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java b/sshd-common/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java index d3d7f2113..20a7122e6 100644 --- a/sshd-common/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java +++ b/sshd-common/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java @@ -31,7 +31,7 @@ import org.junit.Ignore; /** * A "scratch-pad" class for testing signatures related code during development - * + * * @author <a href="mailto:d...@mina.apache.org">Apache MINA SSHD Project</a> */ @Ignore("Used only for development")