This is an automated email from the ASF dual-hosted git repository. twolf pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push: new 383ca353d Add Automatic-Module-Name to generated MANIFEST.MF 383ca353d is described below commit 383ca353d69120dadcee6c55bfd414a685e3d98b Author: Thomas Wolf <tw...@apache.org> AuthorDate: Sun Mar 26 19:56:21 2023 +0200 Add Automatic-Module-Name to generated MANIFEST.MF Also declare the direct dependency from sshd-ldap to sshd-common. --- CHANGES.md | 4 +++- pom.xml | 1 + sshd-ldap/pom.xml | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 72ae4c5c1..f24e808fa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,8 +35,10 @@ * [GH-298](https://github.com/apache/mina-sshd/issues/298) Server side heartbeat not working. * [GH-300](https://github.com/apache/mina-sshd/issues/300) Read the channel id in `SSH_MSG_CHANNEL_OPEN_CONFIRMATION` as unsigned int. * [GH-313](https://github.com/apache/mina-sshd/issues/313) Log exceptions in the SFTP subsystem before sending a failure status reply. -* [GH-325](https://github.com/apache/mina-sshd/issues/325) SftpFileSystemProvider: fix deletions of symlinks through Files.delete(). * [GH-322](https://github.com/apache/mina-sshd/issues/322) Add basic Android O/S awareness. +* [GH-325](https://github.com/apache/mina-sshd/issues/325) SftpFileSystemProvider: fix deletions of symlinks through Files.delete(). + + * [SSHD-1295](https://issues.apache.org/jira/browse/SSHD-1295) Fix cancellation of futures and add options to cancel futures on time-outs. * [SSHD-1315](https://issues.apache.org/jira/browse/SSHD-1315) Do not log sensitive data at log level `TRACE`. * [SSHD-1316](https://issues.apache.org/jira/browse/SSHD-1316) Possible OOM in `ChannelPipedInputStream` (fix channel window). diff --git a/pom.xml b/pom.xml index aa4e0693a..a41a60c6f 100644 --- a/pom.xml +++ b/pom.xml @@ -1466,6 +1466,7 @@ <configuration> <supportIncrementalBuild>true</supportIncrementalBuild> <instructions> + <Automatic-Module-Name>${project.groupId}.${project.artifactId}</Automatic-Module-Name> <Import-Package><![CDATA[ org.apache.sshd*;version="$<range;[===,=+);$<maven_version;${project.version}>>", org.slf4j*;version="$<range;[==,${slf4j.upper.bound})>", diff --git a/sshd-ldap/pom.xml b/sshd-ldap/pom.xml index c5e930af9..d63cd3212 100644 --- a/sshd-ldap/pom.xml +++ b/sshd-ldap/pom.xml @@ -72,6 +72,11 @@ <artifactId>sshd-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-common</artifactId> + <version>${project.version}</version> + </dependency> <!-- Test dependencies --> <dependency>