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
The following commit(s) were added to refs/heads/master by this push:
new 624a5eb00 Revert "Upgraded formatter plugin version to 2.18.0"
624a5eb00 is described below
commit 624a5eb004b7b5d50d43760f378aa8a90c6cf678
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Thu May 12 19:36:18 2022 +0300
Revert "Upgraded formatter plugin version to 2.18.0"
This reverts commit 9f8aa3dbafe3934bad661d36a1d6bf20e80baada.
---
pom.xml | 2 +-
.../util/io/ExposedBufferByteArrayOutputStream.java | 2 +-
.../sshd/client/channel/ClientChannelEvent.java | 6 +++---
.../channel/ClientChannelPendingMessagesQueue.java | 2 +-
.../apache/sshd/common/channel/RequestHandler.java | 2 +-
.../apache/sshd/common/forward/ForwarderFactory.java | 2 +-
.../java/org/apache/sshd/common/kex/DHGroupData.java | 2 +-
.../apache/sshd/common/kex/KexFactoryManager.java | 2 +-
.../sshd/server/ServerAuthenticationManager.java | 2 +-
.../auth/hostbased/HostBasedAuthenticator.java | 2 +-
.../apache/sshd/server/command/CommandLifecycle.java | 2 +-
.../apache/sshd/server/session/ServerSession.java | 2 +-
.../org/apache/sshd/ldap/LdapNetworkConnector.java | 2 +-
.../apache/sshd/ldap/LdapPasswordAuthenticator.java | 2 +-
.../java/org/apache/sshd/putty/PuttyKeyReader.java | 2 +-
.../AbstractScpTransferEventListenerAdapter.java | 2 +-
.../apache/sshd/scp/server/InputStreamReader.java | 20 ++++++++++----------
.../sshd/sftp/client/FullAccessSftpClient.java | 2 +-
.../sshd/sftp/common/SftpUniversalOwnerAndGroup.java | 2 +-
19 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3be32905a..960880857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1117,7 +1117,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.18.0</version>
+ <version>2.16.0</version>
<configuration>
<skipXmlFormatting>true</skipXmlFormatting>
<skipHtmlFormatting>true</skipHtmlFormatting>
diff --git
a/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
index 48a8912d8..e64f8ffaf 100644
---
a/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
+++
b/sshd-contrib/src/main/java/org/apache/sshd/contrib/common/util/io/ExposedBufferByteArrayOutputStream.java
@@ -23,7 +23,7 @@ import java.io.ByteArrayOutputStream;
/**
* Exposes direct access to the underlying buffer
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public class ExposedBufferByteArrayOutputStream extends ByteArrayOutputStream {
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelEvent.java
b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelEvent.java
index 4ee0a0c91..d0d6c1034 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelEvent.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelEvent.java
@@ -24,7 +24,7 @@ import java.util.Set;
/**
* Various events used by {@link ClientChannel#waitFor(java.util.Collection,
long)}
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public enum ClientChannelEvent {
@@ -42,13 +42,13 @@ public enum ClientChannelEvent {
EOF,
/**
* Received exit status from remote peer
- *
+ *
* @see ClientChannel#getExitStatus()
**/
EXIT_STATUS,
/**
* Received exit signal from remote peer
- *
+ *
* @see ClientChannel#getExitSignal()
*/
EXIT_SIGNAL,
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelPendingMessagesQueue.java
b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelPendingMessagesQueue.java
index 34953e687..c571c8863 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelPendingMessagesQueue.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannelPendingMessagesQueue.java
@@ -121,7 +121,7 @@ public class ClientChannelPendingMessagesQueue
* channel immediately.</li>
* </p>
* </ul>
- *
+ *
* @param buffer The message {@link Buffer}
* @param errHandler The error handler to invoke it had to enqueue the
message and was unsuccessful in writing it.
* Must be non-{@code null} if future not open yet.
Otherwise, if {@code null} and exception
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/channel/RequestHandler.java
b/sshd-core/src/main/java/org/apache/sshd/common/channel/RequestHandler.java
index 275d0490b..1feb723da 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/RequestHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/RequestHandler.java
@@ -64,7 +64,7 @@ public interface RequestHandler<T> {
/**
* Process an SSH request. If an exception is thrown, the
ConnectionService will send a failure message if needed
* and the request will be considered handled.
- *
+ *
* @param t The input parameter
* @param request The request string
* @param wantReply Whether a reply is requested
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
index c5d95f6b9..6bf06f22b 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
@@ -22,7 +22,7 @@ import org.apache.sshd.common.session.ConnectionService;
/**
* A factory for creating forwarder objects for client port forwarding
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
@FunctionalInterface
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java
b/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java
index 8907e341f..9c2c2704f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java
@@ -194,7 +194,7 @@ public final class DHGroupData {
* <LI>Remaining lines are appended to one big string assumed to contain
the HEX-encoded value</LI>
* </P>
* </UL>
- *
+ *
* @param br The {@link BufferedReader} to read the data from
* @return The prime value bytes suitable for building a
{@code BigInteger}
* @throws IOException If invalid data or no encoded value found
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java
b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java
index c64548483..5aa0cf826 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java
@@ -39,7 +39,7 @@ import org.apache.sshd.common.util.ValidateUtils;
/**
* Holds KEX negotiation stage configuration
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public interface KexFactoryManager extends SignatureFactoriesManager,
KexExtensionHandlerManager {
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java
b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java
index 5d3d52a96..52a666117 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java
@@ -46,7 +46,7 @@ import org.apache.sshd.server.session.ServerSession;
/**
* Holds providers and helpers related to the server side authentication
process
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public interface ServerAuthenticationManager
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/auth/hostbased/HostBasedAuthenticator.java
b/sshd-core/src/main/java/org/apache/sshd/server/auth/hostbased/HostBasedAuthenticator.java
index 43abc6b2a..2aa6686bf 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/auth/hostbased/HostBasedAuthenticator.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/auth/hostbased/HostBasedAuthenticator.java
@@ -27,7 +27,7 @@ import org.apache.sshd.server.session.ServerSession;
/**
* Invoked when "hostbased" authentication is used
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
* @see <A HREF="https://tools.ietf.org/html/rfc4252#section-9";>RFC 4252 -
section 9</A>
*/
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/command/CommandLifecycle.java
b/sshd-core/src/main/java/org/apache/sshd/server/command/CommandLifecycle.java
index 3717e0f3e..f91669529 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/command/CommandLifecycle.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/command/CommandLifecycle.java
@@ -31,7 +31,7 @@ public interface CommandLifecycle {
/**
* Starts the command execution. All streams must have been set
<U>before</U> calling this method. The command
* should implement {@link java.lang.Runnable}, and this method should
spawn a new thread like:
- *
+ *
* <pre>
* {@code Thread(this).start(); }
* </pre>
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
index b566ef54e..c0c97699c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
@@ -77,7 +77,7 @@ public interface ServerSession
* <LI>Sends the {@code SSH_MSG_USERAUTH_SUCCESS} message.</LI>
* </P>
* </UL>
- *
+ *
* @param username The authenticated username
* @param authService The service to start
* @param buffer Any extra data received to use to start the service
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
index 5be56e073..cf596f655 100644
--- a/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
+++ b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapNetworkConnector.java
@@ -80,7 +80,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector
{
public static final String DEFAULT_LDAP_BIND_PASSWORD_PATTERN = "{1}";
/**
* A list of known binary attributes
- *
+ *
* @see <A
HREF="http://docs.oracle.com/javase/jndi/tutorial/ldap/misc/attrs.html";>LDAP
Attributes</A>
*/
public static final String DEFAULT_BINARY_ATTRIBUTES
diff --git
a/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
index 3973b3fc8..8b9e2bfe5 100644
---
a/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
+++
b/sshd-ldap/src/main/java/org/apache/sshd/ldap/LdapPasswordAuthenticator.java
@@ -46,7 +46,7 @@ import org.apache.sshd.server.session.ServerSession;
* <code>"{0}@my.domain.com"</code>.</LI>
* </P>
* </OL>
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public class LdapPasswordAuthenticator extends LdapAuthenticator implements
PasswordAuthenticator {
diff --git a/sshd-putty/src/main/java/org/apache/sshd/putty/PuttyKeyReader.java
b/sshd-putty/src/main/java/org/apache/sshd/putty/PuttyKeyReader.java
index cab66b0b0..903db8607 100644
--- a/sshd-putty/src/main/java/org/apache/sshd/putty/PuttyKeyReader.java
+++ b/sshd-putty/src/main/java/org/apache/sshd/putty/PuttyKeyReader.java
@@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets;
/**
* Helper class for {@code Putty} key files decoders
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public class PuttyKeyReader implements Closeable {
diff --git
a/sshd-scp/src/main/java/org/apache/sshd/scp/common/AbstractScpTransferEventListenerAdapter.java
b/sshd-scp/src/main/java/org/apache/sshd/scp/common/AbstractScpTransferEventListenerAdapter.java
index bd4b82b0b..ef6043b0c 100644
---
a/sshd-scp/src/main/java/org/apache/sshd/scp/common/AbstractScpTransferEventListenerAdapter.java
+++
b/sshd-scp/src/main/java/org/apache/sshd/scp/common/AbstractScpTransferEventListenerAdapter.java
@@ -30,7 +30,7 @@ import
org.apache.sshd.common.util.logging.AbstractLoggingBean;
/**
* A no-op implementation of {@link ScpTransferEventListener} for those who
wish to implement only a small number of
* methods. By default, all non-overridden methods simply log at TRACE level
their invocation parameters
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public abstract class AbstractScpTransferEventListenerAdapter
diff --git
a/sshd-scp/src/main/java/org/apache/sshd/scp/server/InputStreamReader.java
b/sshd-scp/src/main/java/org/apache/sshd/scp/server/InputStreamReader.java
index 1adbf8320..a27964772 100644
--- a/sshd-scp/src/main/java/org/apache/sshd/scp/server/InputStreamReader.java
+++ b/sshd-scp/src/main/java/org/apache/sshd/scp/server/InputStreamReader.java
@@ -53,7 +53,7 @@ import java.nio.charset.UnmappableCharacterException;
* characters by either a default or a provided character converter. The
default encoding is taken from the
* "file.encoding" system property. {@code InputStreamReader} contains a
buffer of bytes read from the source stream and
* converts these into characters as needed. The buffer size is 8K.
- *
+ *
* @see OutputStreamWriter
*/
public class InputStreamReader extends Reader {
@@ -74,7 +74,7 @@ public class InputStreamReader extends Reader {
* Constructs a new {@code InputStreamReader} on the {@link InputStream}
{@code in}. This constructor sets the
* character converter to the encoding specified in the "file.encoding"
property and falls back to ISO 8859_1
* (ISO-Latin-1) if the property doesn't exist.
- *
+ *
* @param in the input stream from which to read characters.
*/
public InputStreamReader(InputStream in) {
@@ -90,7 +90,7 @@ public class InputStreamReader extends Reader {
* Constructs a new InputStreamReader on the InputStream {@code in}. The
character converter that is used to decode
* bytes into characters is identified by name by {@code enc}. If the
encoding cannot be found, an
* UnsupportedEncodingException error is thrown.
- *
+ *
* @param in the InputStream from which to read
characters.
* @param enc identifies the character converter
to use.
* @throws NullPointerException if {@code enc} is {@code null}.
@@ -115,7 +115,7 @@ public class InputStreamReader extends Reader {
/**
* Constructs a new InputStreamReader on the InputStream {@code in} and
CharsetDecoder {@code dec}.
- *
+ *
* @param in the source InputStream from which to read characters.
* @param dec the CharsetDecoder used by the character conversion.
*/
@@ -129,7 +129,7 @@ public class InputStreamReader extends Reader {
/**
* Constructs a new InputStreamReader on the InputStream {@code in} and
Charset {@code charset}.
- *
+ *
* @param in the source InputStream from which to read characters.
* @param charset the Charset that defines the character converter
*/
@@ -144,7 +144,7 @@ public class InputStreamReader extends Reader {
/**
* Closes this reader. This implementation closes the source InputStream
and releases all local storage.
- *
+ *
* @throws IOException if an error occurs attempting to close this reader.
*/
@Override
@@ -161,7 +161,7 @@ public class InputStreamReader extends Reader {
/**
* Returns the name of the encoding used to convert bytes into characters.
The value {@code null} is returned if
* this reader has been closed.
- *
+ *
* @return the name of the character converter or {@code null} if this
reader is closed.
*/
public String getEncoding() {
@@ -175,7 +175,7 @@ public class InputStreamReader extends Reader {
* Reads a single character from this reader and returns it as an integer
with the two higher-order bytes set to 0.
* Returns -1 if the end of the reader has been reached. The byte value is
either obtained from converting bytes in
* this reader's buffer or by first filling the buffer from the source
InputStream and then reading from the buffer.
- *
+ *
* @return the character read or -1 if the end of the reader
has been reached.
* @throws IOException if this reader is closed or some other I/O error
occurs.
*/
@@ -209,7 +209,7 @@ public class InputStreamReader extends Reader {
* character array {@code buf}. Returns the number of characters actually
read or -1 if the end of the reader has
* been reached. The bytes are either obtained from converting bytes in
this reader's buffer or by first filling the
* buffer from the source InputStream and then reading from the buffer.
- *
+ *
* @param buf the array to store the characters
read.
* @param offset the initial position in {@code buf}
to store the characters read from this
* reader.
@@ -308,7 +308,7 @@ public class InputStreamReader extends Reader {
* {@code read()} will not block. If the result is {@code false} then this
reader may or may not block when
* {@code read()} is called. This implementation returns {@code true} if
there are bytes available in the buffer or
* the source stream has bytes available.
- *
+ *
* @return {@code true} if the receiver will not block when
{@code read()} is called, {@code false} if
* unknown or blocking will occur.
* @throws IOException if this reader is closed or some other I/O error
occurs.
diff --git
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/FullAccessSftpClient.java
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/FullAccessSftpClient.java
index 79813057e..eec17c5eb 100644
---
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/FullAccessSftpClient.java
+++
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/FullAccessSftpClient.java
@@ -23,7 +23,7 @@ import
org.apache.sshd.common.util.closeable.AutoCloseableDelegateInvocationHand
/**
* Provides both structured and raw SFTP access
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public interface FullAccessSftpClient extends SftpClient, RawSftpClient {
diff --git
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/common/SftpUniversalOwnerAndGroup.java
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/common/SftpUniversalOwnerAndGroup.java
index f5b522b5a..4948028f8 100644
---
a/sshd-sftp/src/main/java/org/apache/sshd/sftp/common/SftpUniversalOwnerAndGroup.java
+++
b/sshd-sftp/src/main/java/org/apache/sshd/sftp/common/SftpUniversalOwnerAndGroup.java
@@ -27,7 +27,7 @@ import org.apache.sshd.common.NamedResource;
/**
* Some universal identifiers used in owner and/or group specification strings
- *
+ *
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
* @see <A
HREF="https://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#page-12";>SFTP
ACL</A>
*/
