[1/3] mina-sshd git commit: Enforce Maven dependency convergence rule

[l***@apache.org]

Repository: mina-sshd
Updated Branches:
refs/heads/master 515628547 -> 4e12d7e17


Enforce Maven dependency convergence rule

See https://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/4e12d7e1
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/4e12d7e1
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/4e12d7e1

Branch: refs/heads/master
Commit: 4e12d7e17281a26bb3e0e1b23be9a270fc996cfc
Parents: 3103252
Author: Lyor Goldstein <***@apache.org>
Authored: Tue Oct 30 11:37:24 2018 +0200
Committer: Lyor Goldstein <***@apache.org>
Committed: Tue Oct 30 15:52:49 2018 +0200

----------------------------------------------------------------------
pom.xml | 1 +
sshd-ldap/pom.xml | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4e12d7e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e709c47..5d9afed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1074,6 +1074,7 @@
<onlyWhenRelease>true</onlyWhenRelease>
<message>No Snapshot Dependencies Allowed</message>
</requireReleaseDeps>
+ <dependencyConvergence/>
</rules>
</configuration>
</plugin>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4e12d7e1/sshd-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-ldap/pom.xml b/sshd-ldap/pom.xml
index 6a515cd..95b96b5 100644
--- a/sshd-ldap/pom.xml
+++ b/sshd-ldap/pom.xml
@@ -59,6 +59,32 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ <version>${apache.shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>${apache.shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ <version>${apache.shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ <version>${apache.shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ <version>${apache.shared.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>

[l***@apache.org]

Enforce usage of release artifacts exclusively


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/31032525
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/31032525
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/31032525

Branch: refs/heads/master
Commit: 31032525bb346b48d76e3e171fc82b1fe7d2b67e
Parents: a1d6626
Author: Lyor Goldstein <***@apache.org>
Authored: Tue Oct 30 08:58:40 2018 +0200
Committer: Lyor Goldstein <***@apache.org>
Committed: Tue Oct 30 15:52:49 2018 +0200

----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/31032525/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5c5180..e709c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1070,6 +1070,10 @@
<requireJavaVersion>
<version>[${javac.target},)</version>
</requireJavaVersion>
+ <requireReleaseDeps>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ <message>No Snapshot Dependencies Allowed</message>
+ </requireReleaseDeps>
</rules>
</configuration>
</plugin>

[l***@apache.org]

Pack all 3rd party dependencies into a separate folder in the release artifacts


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/a1d66263
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/a1d66263
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/a1d66263

Branch: refs/heads/master
Commit: a1d6626381d949b5343e2a6a79328b33e91e851c
Parents: 5156285
Author: Lyor Goldstein <***@apache.org>
Authored: Tue Oct 30 07:50:15 2018 +0200
Committer: Lyor Goldstein <***@apache.org>
Committed: Tue Oct 30 15:52:49 2018 +0200

----------------------------------------------------------------------
assembly/pom.xml | 12 ++++++++++++
assembly/src/main/components/modules.xml | 24 ++++++++++++++++++++++++
assembly/src/main/distribution/README.txt | 26 +++++++++++++++++++++-----
3 files changed, 57 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/a1d66263/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bd2ccb4..9d65f2d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -104,6 +104,7 @@
<version>${project.version}</version>
</dependency>

+ <!-- Various optional dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
@@ -116,6 +117,17 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>
+ <!-- For ed25519 support -->
+ <dependency>
+ <groupId>net.i2p.crypto</groupId>
+ <artifactId>eddsa</artifactId>
+ </dependency>
+ <!-- Replacement of commons-logging for Spring parts that still use it -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <!-- Used for Unix sockets proxy -->
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-apr</artifactId>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/a1d66263/assembly/src/main/components/modules.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/components/modules.xml b/assembly/src/main/components/modules.xml
index 3e368ec..461155b 100644
--- a/assembly/src/main/components/modules.xml
+++ b/assembly/src/main/components/modules.xml
@@ -25,6 +25,15 @@
<exclude>org.apache.sshd:sshd-contrib</exclude>
<exclude>org.apache.sshd:sshd-putty</exclude>
<exclude>org.apache.sshd:sshd-spring-sftp</exclude>
+ <exclude>org.springframework:*</exclude>
+ <exclude>org.springframework.retry:*</exclude>
+ <exclude>io.projectreactor:*</exclude>
+ <exclude>org.reactivestreams:*</exclude>
+ <exclude>commons-io:commons-io</exclude>
+ <exclude>org.springframework.integration:*</exclude>
+ <exclude>org.eclipse.jgit:*</exclude>
+ <exclude>com.jcraft:*</exclude>
+ <exclude>com.googlecode.javaewah:JavaEWAH</exclude>
</excludes>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -41,5 +50,20 @@
<outputDirectory>extras</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.springframework:*</include>
+ <include>org.springframework.retry:*</include>
+ <include>org.springframework.integration:*</include>
+ <include>org.eclipse.jgit:*</include>
+ <include>io.projectreactor:*</include>
+ <include>org.reactivestreams:*</include>
+ <include>commons-io:commons-io</include>
+ <include>com.jcraft:*</include>
+ <include>com.googlecode.javaewah:JavaEWAH</include>
+ </includes>
+ <outputDirectory>dependencies</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
</dependencySets>
</component>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/a1d66263/assembly/src/main/distribution/README.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/distribution/README.txt b/assembly/src/main/distribution/README.txt
index 76b4c27..d495683 100644
--- a/assembly/src/main/distribution/README.txt
+++ b/assembly/src/main/distribution/README.txt
@@ -20,16 +20,32 @@
Welcome to Apache SSHD

Apache SSHD is a library to support the SSH2 protocol on both
-client and server side in java.
+client and server side using pure Java.

This distribution provides a simple demonstration of a SSH
server and client that you can launched using the shell scripts in the
-bin folder. By default, the port used is 8000 and the authentication
+bin folder. By default, the port used is 8000 and the authentication
will succeed if the username and password are the same.
-SCP and SFTP support are both enabled in this configuration.
+SCP and SFTP support are both enabled by default in this configuration.

-The lib folder contains the sshd-core jar which is the main jar
-and its required dependencies.
+The artifacts are distributed as follows:
+
+* /bin - contains Linux and Windows scripts that can be used to run
+ the code using the default settings.
+
+* /lib - contains all the JAR(s) necessary to run both SSH client and
+ server - including the various supported I/O factories (default is
+ the built-in NIO2), SCP, SFTP, SOCKS, ed25519 support.
+
+* /extras - contains various SSH-based or SSH-related extra functionality
+ that is not part of SSH per-se. E.g., JGit, Putty, LDAP, Spring SFTP,
+ various contributions.
+
+* /dependencies - contains various required 3rd party artifacts that are
+ used by the extra(s).
+
+* /licenses - contains a copy of all the 3rd party artifacts' licenses
+ that are used by this project

Please send feedback to ***@mina.apache.org.