Merge branch 'master' into 3.0.0

Author: tomaswolf

.github/dependabot.yml

@@ -27,6 +27,8 @@ updates:
         versions: [">= 6.0.0"]
       - dependency-name: "org.springframework:spring-framework-bom"
         versions: [">= 6.0.0"]
+      - dependency-name: "org.springframework.integration:spring-integration-bom"
+        versions: [">= 6.0.0"]
       - dependency-name: "org.eclipse.jgit:*"
         versions: [ ">= 6.0.0" ]
       - dependency-name: "org.mockito:*"
@@ -35,6 +37,8 @@ updates:
         versions: [ ">= 2.0.0" ]
       - dependency-name: "ch.qos.logback:*"
         versions: [ ">= 1.3.0" ]
+      - dependency-name: "org.junit.jupiter:*"
+        versions: [ ">= 6.0.0" ]
       # We *do* test against 2.2.X. We only want to get patch version updates for mina-core
       - dependency-name: "org.apache.mina:mina-core"
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]

pom.xml

@@ -107,10 +107,10 @@
             <!-- mockito 5.0 requires Java 11. -->
         <mockito.version>4.11.0</mockito.version>
         <testcontainers.version>1.21.3</testcontainers.version>
-        <grpc.version>1.75.0</grpc.version> <!-- Used only in tests -->
+        <grpc.version>1.76.0</grpc.version> <!-- Used only in tests -->
 
-        <maven.archiver.version>3.6.4</maven.archiver.version>
-        <plexus.archiver.version>4.10.2</plexus.archiver.version>
+        <maven.archiver.version>3.6.5</maven.archiver.version>
+        <plexus.archiver.version>4.10.3</plexus.archiver.version>
         <!-- See https://pmd.github.io/ for available latest version -->
         <pmd.version>7.17.0</pmd.version>
         <japicmp.version>0.23.1</japicmp.version>
@@ -637,7 +637,7 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>5.13.4</version>
+                <version>5.14.0</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -918,7 +918,7 @@
                 <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-pmd-plugin</artifactId>
-                   <version>3.27.0</version>
+                   <version>3.28.0</version>
                    <configuration>
                        <targetJdk>${javac.target}</targetJdk>
                        <printFailingErrors>true</printFailingErrors>

sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java

@@ -318,7 +318,7 @@ protected void handleServiceAccept(String serviceName, Buffer buffer) throws Exc
         }
 
         // TODO: can services be initiated by the server-side ?
-        disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+        disconnect(SshConstants.SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE,
                 "Unsupported packet: SSH_MSG_SERVICE_ACCEPT for " + serviceName);
     }
 

sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java

@@ -268,7 +268,7 @@ protected boolean handleUserAuthRequestMessage(
                 }
 
                 if (disconnectSession) {
-                    session.disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+                    session.disconnect(SshConstants.SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE,
                             "Too many authentication failures: " + nbAuthRequests);
                     return false;
                 }
@@ -294,9 +294,9 @@ protected boolean handleUserAuthRequestMessage(
             }
 
             if (disconnectSession) {
-                session.disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR,
+                session.disconnect(SshConstants.SSH2_DISCONNECT_ILLEGAL_USER_NAME,
                         "Change of username or service is not allowed (" + this.authUserName + ", " + this.authService + ")"
-                                                                                + " -> (" + username + ", " + service + ")");
+                                                                                   + " -> (" + username + ", " + service + ")");
             } else {
                 if (debugEnabled) {
                     log.debug(

sshd-spring-sftp/pom.xml

@@ -32,7 +32,7 @@
 
     <properties>
         <projectRoot>${project.basedir}/..</projectRoot>
-        <spring.integration.version>5.5.7</spring.integration.version>
+        <spring.integration.version>5.5.20</spring.integration.version>
     </properties>
 
     <dependencyManagement>