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/19 08:32:58 UTC
[3/5] mina-sshd git commit: [SSHD-817] Invert dependency between
Netty and SFTP modules
[SSHD-817] Invert dependency between Netty and SFTP modules
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/229d6f38
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/229d6f38
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/229d6f38
Branch: refs/heads/master
Commit: 229d6f38583807036a0d1c9834ee9fc828cd9979
Parents: 598c991
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Thu Apr 19 10:58:29 2018 +0300
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Thu Apr 19 11:36:19 2018 +0300
----------------------------------------------------------------------
sshd-core/.gitignore | 3 ++-
sshd-git/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
sshd-mina/.gitignore | 3 +++
sshd-netty/.gitignore | 3 +++
sshd-netty/pom.xml | 17 ++++-------------
sshd-sftp/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 92 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/229d6f38/sshd-core/.gitignore
----------------------------------------------------------------------
diff --git a/sshd-core/.gitignore b/sshd-core/.gitignore
index d23a014..d38c903 100644
--- a/sshd-core/.gitignore
+++ b/sshd-core/.gitignore
@@ -1,2 +1,3 @@
key.pem
-key.ser
\ No newline at end of file
+key.ser
+hostkey.ser
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/229d6f38/sshd-git/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index 529744f..4cf0873 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -167,5 +167,45 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>test-netty</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-netty</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>netty</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory>
+ <systemProperties>
+ <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.netty.NettyIoServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/229d6f38/sshd-mina/.gitignore
----------------------------------------------------------------------
diff --git a/sshd-mina/.gitignore b/sshd-mina/.gitignore
new file mode 100644
index 0000000..d38c903
--- /dev/null
+++ b/sshd-mina/.gitignore
@@ -0,0 +1,3 @@
+key.pem
+key.ser
+hostkey.ser
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/229d6f38/sshd-netty/.gitignore
----------------------------------------------------------------------
diff --git a/sshd-netty/.gitignore b/sshd-netty/.gitignore
new file mode 100644
index 0000000..d38c903
--- /dev/null
+++ b/sshd-netty/.gitignore
@@ -0,0 +1,3 @@
+key.pem
+key.ser
+hostkey.ser
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/229d6f38/sshd-netty/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml
index fdb0f3e..d48fc30 100644
--- a/sshd-netty/pom.xml
+++ b/sshd-netty/pom.xml
@@ -64,12 +64,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>
@@ -127,10 +121,10 @@
</dependencies>
<build>
- <testSourceDirectory>${build.directory}/test-sources</testSourceDirectory>
+ <testSourceDirectory>${project.build.directory}/test-sources</testSourceDirectory>
<testResources>
<testResource>
- <directory>${build.directory}/test-resources</directory>
+ <directory>${project.build.directory}/test-resources</directory>
</testResource>
</testResources>
<plugins>
@@ -145,7 +139,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${build.directory}/test-resources</outputDirectory>
+ <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
<resources>
<resource>
<directory>${projectRoot}/sshd-core/src/test/resources</directory>
@@ -160,7 +154,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${build.directory}/test-sources</outputDirectory>
+ <outputDirectory>${project.build.directory}/test-sources</outputDirectory>
<resources>
<resource>
<directory>${projectRoot}/sshd-core/src/test/java</directory>
@@ -170,9 +164,6 @@
<exclude>**/PortForwardingLoadTest.java</exclude>
</excludes>
</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/229d6f38/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index e36d6ba..e2578f0 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -152,5 +152,45 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>test-netty</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-netty</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>netty</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory>
+ <systemProperties>
+ <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.netty.NettyIoServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>