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

Ian Young ian at iay.org.uk
Mon Apr 15 04:38:16 EDT 2019


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=90574df8857506de3bea90500e48c4eeb7520d93

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

commit 90574df8857506de3bea90500e48c4eeb7520d93
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Apr 15 09:38:10 2019 +0100

    IDP-1439 - correctly package dependencies with "xml" in the middle of their name
    
    We don't need to target ".dist" files for line ending conversion any more, as those are no longer shipped in the .zip package.
---
 idp-distribution/src/main/assembly/idp-assembly-zip.xml | 14 --------------
 1 file changed, 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 1ba9526..26544a3 100644
--- a/idp-distribution/src/main/assembly/idp-assembly-zip.xml
+++ b/idp-distribution/src/main/assembly/idp-assembly-zip.xml
@@ -9,19 +9,12 @@
             <outputDirectory></outputDirectory>
             <excludes>
                 <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>
@@ -29,19 +22,12 @@
             <outputDirectory></outputDirectory>
             <includes>
                 <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.


More information about the commits mailing list