[java-metadata-aggregator] 01/02: MDA-266 - Rework module structure and packaging

[Ian Young]

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

iay pushed a commit to branch dev/MDA-266
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=e88fa3012a1124e860252cfe70271155dee916be

commit e88fa3012a1124e860252cfe70271155dee916be
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Dec 6 16:24:59 2021 +0000

    MDA-266 - Rework module structure and packaging
    
    Stage 3: generate both .zip and .tar.gz packages.
---
 mda-distribution/pom.xml                                    | 11 ++++++++++-
 .../src/main/assembly/{bin.xml => assembly-tgz.xml}         | 13 +++++++++----
 .../src/main/assembly/{bin.xml => assembly-zip.xml}         | 11 ++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/mda-distribution/pom.xml b/mda-distribution/pom.xml
index 3544a48..18b0da9 100644
--- a/mda-distribution/pom.xml
+++ b/mda-distribution/pom.xml
@@ -15,6 +15,10 @@
     <artifactId>mda-distribution</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <mda.finalName>mda-distribution-${project.version}</mda.finalName>
+    </properties>
+
     <dependencies>
         <!-- Compile Dependencies -->
 
@@ -59,9 +63,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <ignoreMissingDescriptor>false</ignoreMissingDescriptor>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/assembly-tgz.xml</descriptor>
+                        <descriptor>src/main/assembly/assembly-zip.xml</descriptor>
                     </descriptors>
+                    <finalName>${mda.finalName}</finalName>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/mda-distribution/src/main/assembly/bin.xml b/mda-distribution/src/main/assembly/assembly-tgz.xml
similarity index 75%
copy from mda-distribution/src/main/assembly/bin.xml
copy to mda-distribution/src/main/assembly/assembly-tgz.xml
index ad6dc63..568e3b6 100644
--- a/mda-distribution/src/main/assembly/bin.xml
+++ b/mda-distribution/src/main/assembly/assembly-tgz.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>bin</id>
+    <id>assembly-tgz</id>
     <formats>
-        <format>zip</format>
+        <format>tar.gz</format>
     </formats>
 
     <dependencySets>
@@ -28,6 +30,7 @@
             <includes>
                 <include>*.sh</include>
             </includes>
+            <lineEnding>unix</lineEnding>
         </fileSet>
         <fileSet>
             <outputDirectory/>
@@ -36,12 +39,14 @@
             <includes>
                 <include>*.bat</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
 
         <!-- Documentation pulled from parent project. -->
         <fileSet>
             <directory>${project.basedir}/../doc/</directory>
             <outputDirectory>doc</outputDirectory>
+            <lineEnding>unix</lineEnding>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/mda-distribution/src/main/assembly/bin.xml b/mda-distribution/src/main/assembly/assembly-zip.xml
similarity index 76%
rename from mda-distribution/src/main/assembly/bin.xml
rename to mda-distribution/src/main/assembly/assembly-zip.xml
index ad6dc63..c238c8e 100644
--- a/mda-distribution/src/main/assembly/bin.xml
+++ b/mda-distribution/src/main/assembly/assembly-zip.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>bin</id>
+    <id>assembly-zip</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -28,6 +30,7 @@
             <includes>
                 <include>*.sh</include>
             </includes>
+            <lineEnding>unix</lineEnding>
         </fileSet>
         <fileSet>
             <outputDirectory/>
@@ -36,12 +39,14 @@
             <includes>
                 <include>*.bat</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
 
         <!-- Documentation pulled from parent project. -->
         <fileSet>
             <directory>${project.basedir}/../doc/</directory>
             <outputDirectory>doc</outputDirectory>
+            <lineEnding>windows</lineEnding>
         </fileSet>
     </fileSets>
 </assembly>

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