You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/04/17 04:58:30 UTC
[3/4] mina-sshd git commit: [SSHD-815] Inverted test dependency
between MINA and SFTP
[SSHD-815] Inverted test dependency between MINA and SFTP
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/25ba6df9
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/25ba6df9
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/25ba6df9
Branch: refs/heads/master
Commit: 25ba6df93a8364e4efaa360d0720be0a85d5b6e3
Parents: 84e009a
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Tue Apr 17 07:32:38 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Tue Apr 17 07:58:21 2018 +0300
----------------------------------------------------------------------
sshd-mina/pom.xml | 9 ---------
sshd-sftp/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/25ba6df9/sshd-mina/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-mina/pom.xml b/sshd-mina/pom.xml
index 0234e85..71ada5a 100644
--- a/sshd-mina/pom.xml
+++ b/sshd-mina/pom.xml
@@ -57,12 +57,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-sftp</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<scope>test</scope>
@@ -158,9 +152,6 @@
<resource>
<directory>${projectRoot}/sshd-core/src/test/java</directory>
</resource>
- <resource>
- <directory>${projectRoot}/sshd-sftp/src/test/java</directory>
- </resource>
</resources>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/25ba6df9/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index e8d3f8d..cc52367 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -96,6 +96,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
+ <systemProperties>
+ <org.apache.sshd.common.io.IoServiceFactory>org.apache.sshd.common.io.nio2.Nio2ServiceFactory</org.apache.sshd.common.io.IoServiceFactory>
+ </systemProperties>
</configuration>
</plugin>
<plugin>
@@ -107,4 +111,46 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>test-mina</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-mina</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>mina</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory>
+ <systemProperties>
+ <org.apache.sshd.common.io.IoServiceFactory>org.apache.sshd.common.io.mina.MinaServiceFactory</org.apache.sshd.common.io.IoServiceFactory>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>