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 2019/01/29 06:41:11 UTC

[mina-sshd] branch master updated: Fixed assembly descriptor handling of OpenPGP files

This is an automated email from the ASF dual-hosted git repository.

lgoldstein 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 97238ca  Fixed assembly descriptor handling of OpenPGP files
97238ca is described below

commit 97238ca7e98c23e4bd42a85673385812973bc3a9
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Tue Jan 29 08:41:07 2019 +0200

    Fixed assembly descriptor handling of OpenPGP files
---
 assembly/src/main/descriptors/unix-src.xml    | 3 +++
 assembly/src/main/descriptors/windows-src.xml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index 4ff61ba..f0b8c62 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -40,6 +40,8 @@
                 <include>**/*.bin</include>
                 <include>**/*.jnilib</include>
                 <include>**/*.cert</include>
+
+                <include>sshd-openpgp/src/test/resources/**/*</include>
             </includes>
             <excludes>
                 <exclude>**/eclipse-classes/**</exclude>
@@ -86,6 +88,7 @@
                 <exclude>**/key.pem</exclude>
 
                 <exclude>sshd-core/src/docs/*.txt</exclude>
+                <exclude>sshd-openpgp/src/test/resources/**/*</exclude>
             </excludes>
             <lineEnding>unix</lineEnding>
         </fileSet>
diff --git a/assembly/src/main/descriptors/windows-src.xml b/assembly/src/main/descriptors/windows-src.xml
index 8ea2d1e..b85d165 100644
--- a/assembly/src/main/descriptors/windows-src.xml
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -40,6 +40,8 @@
                 <include>**/*.bin</include>
                 <include>**/*.jnilib</include>
                 <include>**/*.cert</include>
+
+                <include>sshd-openpgp/src/test/resources/**/*</include>
             </includes>
             <excludes>
                 <exclude>**/eclipse-classes/**</exclude>
@@ -74,7 +76,7 @@
                 <exclude>**/eclipse-classes/**</exclude>
                 <exclude>**/.*</exclude>
                 <exclude>**/.*/**</exclude>
-
+                <exclude>**/*.gpg</exclude>
                 <exclude>**/surefire*</exclude>
                 <exclude>**/svn-commit*</exclude>
 
@@ -86,6 +88,7 @@
                 <exclude>**/key.pem</exclude>
 
                 <exclude>sshd-core/src/docs/*.txt</exclude>
+                <exclude>sshd-openpgp/src/test/resources/**/*</exclude>
             </excludes>
             <lineEnding>dos</lineEnding>
         </fileSet>