[java-identity-provider] branch master updated: IDP-1439 - correctly package dependencies with "xml" in the middle of their name

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=33f7e57c7823b36051725a860e063db72c59e1ac

The following commit(s) were added to refs/heads/master by this push:
       new  33f7e57   IDP-1439 - correctly package dependencies with "xml" in the middle of their name
33f7e57 is described below

commit 33f7e57c7823b36051725a860e063db72c59e1ac
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Apr 11 19:29:20 2019 +0100

    IDP-1439 - correctly package dependencies with "xml" in the middle of their name
---
 .../src/main/assembly/idp-assembly-zip.xml         | 42 ++++++++++++++--------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/idp-distribution/src/main/assembly/idp-assembly-zip.xml b/idp-distribution/src/main/assembly/idp-assembly-zip.xml
index 3c5ea2e..1ba9526 100644
--- a/idp-distribution/src/main/assembly/idp-assembly-zip.xml
+++ b/idp-distribution/src/main/assembly/idp-assembly-zip.xml
@@ -8,26 +8,40 @@
             <directory>${idp.assemblyDirectory}</directory>
             <outputDirectory></outputDirectory>
             <excludes>
-                <exclude>**/*.bat*</exclude>
-                <exclude>**/*.config*</exclude>
-                <exclude>**/*.ini*</exclude>
-                <exclude>**/*.properties*</exclude>
-                <exclude>**/*.txt*</exclude>
-                <exclude>**/*.vm*</exclude>
-                <exclude>**/*.xml*</exclude>
+                <exclude>**/*.bat</exclude>
+                <exclude>**/*.bat.dist</exclude>
+                <exclude>**/*.config</exclude>
+                <exclude>**/*.config.dist</exclude>
+                <exclude>**/*.ini</exclude>
+                <exclude>**/*.ini.dist</exclude>
+                <exclude>**/*.properties</exclude>
+                <exclude>**/*.properties.dist</exclude>
+                <exclude>**/*.txt</exclude>
+                <exclude>**/*.txt.dist</exclude>
+                <exclude>**/*.vm</exclude>
+                <exclude>**/*.vm.dist</exclude>
+                <exclude>**/*.xml</exclude>
+                <exclude>**/*.xml.dist</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>${idp.assemblyDirectory}</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>**/*.bat*</include>
-                <include>**/*.config*</include>
-                <include>**/*.ini*</include>
-                <include>**/*.properties*</include>
-                <include>**/*.txt*</include>
-                <include>**/*.vm*</include>
-                <include>**/*.xml*</include>
+                <include>**/*.bat</include>
+                <include>**/*.bat.dist</include>
+                <include>**/*.config</include>
+                <include>**/*.config.dist</include>
+                <include>**/*.ini</include>
+                <include>**/*.ini.dist</include>
+                <include>**/*.properties</include>
+                <include>**/*.properties.dist</include>
+                <include>**/*.txt</include>
+                <include>**/*.txt.dist</include>
+                <include>**/*.vm</include>
+                <include>**/*.vm.dist</include>
+                <include>**/*.xml</include>
+                <include>**/*.xml.dist</include>
             </includes>
             <lineEnding>windows</lineEnding>
         </fileSet>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.