This is an automated email from the ASF dual-hosted git repository. tomaswolf pushed a commit to branch rc-3.0.0-M5 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit acf81919e63d9d58588e1523400a4427d0d5ec60 Merge: 454d50c39 8caed36ab Author: Thomas Wolf <[email protected]> AuthorDate: Tue Jun 30 22:09:40 2026 +0200 Merge branch 'master' into dev_3.0 pom.xml | 4 ++-- sshd-mina/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --cc sshd-mina/pom.xml index 074101fcd,c02b730ad..c18adc5b4 --- a/sshd-mina/pom.xml +++ b/sshd-mina/pom.xml @@@ -111,74 -111,36 +111,74 @@@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <excludes> - <!-- These tests use NIO2 explicitly --> - <exclude>**/Nio2ServiceTest.java</exclude> - <!-- testcontainers filesystem building from classpath doesn't work from reusable test jar classpath --> - <exclude>**/ArcFourOpenSshTest.java</exclude> - <exclude>**/ClientOpenSSHCertificatesTest.java</exclude> - <exclude>**/SessionReKeyHostKeyExchangeTest.java</exclude> - <exclude>**/HostBoundPubKeyAuthTest.java</exclude> - <exclude>**/OpenSshCipherTest.java</exclude> - <exclude>**/OpenSshMlKemTest.java</exclude> - <exclude>**/PortForwardingWithOpenSshTest.java</exclude> - <exclude>**/SkPubKeyAuthTest.java</exclude> - <exclude>**/StrictKexInteroperabilityTest.java</exclude> - <!-- reading files from classpath doesn't work correctly w/ reusable test jar --> - <exclude>**/OpenSSHCertificateTest.java</exclude> - <!-- A MinaServiceFactory cannot be instantiated with a mock CloseableExecutorService. --> - <exclude>**/DefaultIoServiceFactoryFactoryTest.java</exclude> - </excludes> - <!-- No need to re-run core tests that do not involve session creation --> - <excludedGroups>NoIoTestCase</excludedGroups> - <!-- Tests are located in the sshd-core reusable test jar --> - <dependenciesToScan> - <dependency>org.apache.sshd:sshd-core</dependency> - </dependenciesToScan> - </configuration> + <executions> + <execution> + <id>default-test</id> + <goals> + <goal>test</goal> + </goals> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <excludes> + <!-- These tests use NIO2 explicitly --> + <exclude>**/Nio2ServiceTest.java</exclude> + <!-- reading files from classpath doesn't work correctly w/ reusable test jar --> + <exclude>**/OpenSSHCertificateTest.java</exclude> + <!-- A MinaServiceFactory cannot be instantiated with a mock CloseableExecutorService. --> + <exclude>**/DefaultIoServiceFactoryFactoryTest.java</exclude> + </excludes> + <!-- No need to re-run core tests that do not involve session creation --> + <excludedGroups>NoIoTestCase</excludedGroups> + <!-- Tests are located in the sshd-core reusable test jar --> + <dependenciesToScan> + <dependency>org.apache.sshd:sshd-core</dependency> + </dependenciesToScan> + </configuration> + </execution> + <execution> + <id>test-mina-2.2.X</id> + <goals> + <goal>test</goal> + </goals> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <reportsDirectory>${project.build.directory}/surefire-reports-mina-22</reportsDirectory> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <excludes> + <!-- These tests use NIO2 explicitly --> + <exclude>**/Nio2ServiceTest.java</exclude> + <!-- reading files from classpath doesn't work correctly w/ reusable test jar --> + <exclude>**/OpenSSHCertificateTest.java</exclude> + <!-- A MinaServiceFactory cannot be instantiated with a mock CloseableExecutorService. --> + <exclude>**/DefaultIoServiceFactoryFactoryTest.java</exclude> + </excludes> + <!-- No need to re-run core tests that do not involve session creation --> + <excludedGroups>NoIoTestCase</excludedGroups> + <!-- Tests are located in the sshd-core reusable test jar --> + <dependenciesToScan> + <dependency>org.apache.sshd:sshd-core</dependency> + </dependenciesToScan> + <classpathDependencyExcludes> + <classpathDependencyExclude>org.apache.mina:mina-core</classpathDependencyExclude> + </classpathDependencyExcludes> + <additionalClasspathDependencies> + <additionalClasspathDependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> - <version>2.2.4</version> ++ <version>2.2.9</version> + </additionalClasspathDependency> + </additionalClasspathDependencies> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> </plugin> </plugins> </build>
