[java-idp-plugin-duo] branch main updated: Add windows line endings to ZIP package

[Phil Smart]

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

philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=4198e3b7bb45584d1d632a2d2c3c22baeab86663

The following commit(s) were added to refs/heads/main by this push:
       new  4198e3b   Add windows line endings to ZIP package
4198e3b is described below

commit 4198e3b7bb45584d1d632a2d2c3c22baeab86663
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Mar 17 12:07:37 2021 +0000

    Add windows line endings to ZIP package
    
     - which involved splitting out the assembly into two for each plugin
     - remove tar.bz2 package format
---
 idp-duo-nimbus-distribution/pom.xml                                   | 3 ++-
 .../assembly/{duo-nimbus-assembly.xml => duo-nimbus-assembly-tgz.xml} | 2 --
 .../assembly/{duo-nimbus-assembly.xml => duo-nimbus-assembly-zip.xml} | 4 ++--
 idp-duo-sdk-distribution/pom.xml                                      | 3 ++-
 .../{duo-native-sdk-assembly.xml => duo-native-sdk-assembly-tgz.xml}  | 2 --
 .../{duo-native-sdk-assembly.xml => duo-native-sdk-assembly-zip.xml}  | 4 ++--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/idp-duo-nimbus-distribution/pom.xml b/idp-duo-nimbus-distribution/pom.xml
index 0a3e25c..6be5560 100644
--- a/idp-duo-nimbus-distribution/pom.xml
+++ b/idp-duo-nimbus-distribution/pom.xml
@@ -35,7 +35,8 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/main/assembly/duo-nimbus-assembly.xml</descriptor>
+                                <descriptor>src/main/assembly/duo-nimbus-assembly-tgz.xml</descriptor>
+                                <descriptor>src/main/assembly/duo-nimbus-assembly-zip.xml</descriptor>
                             </descriptors>
                             <finalName>${dist.nimbus.finalName}</finalName>
                             <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-tgz.xml
similarity index 97%
copy from idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
copy to idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-tgz.xml
index 3f0aadb..388e990 100644
--- a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
+++ b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-tgz.xml
@@ -4,8 +4,6 @@
     <id>bin-nimbus</id>
     <formats>
         <format>tar.gz</format>
-        <format>tar.bz2</format>
-        <format>zip</format>
     </formats>
     <fileSets>
         <!--  Our impl -->
diff --git a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml
similarity index 96%
rename from idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
rename to idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml
index 3f0aadb..7ca5c97 100644
--- a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
+++ b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml
@@ -3,8 +3,6 @@
     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-nimbus</id>
     <formats>
-        <format>tar.gz</format>
-        <format>tar.bz2</format>
         <format>zip</format>
     </formats>
     <fileSets>
@@ -61,6 +59,7 @@
             <includes>
                 <include>plugin.properties</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
         <fileSet>
             <!--  The signing certificates -->
@@ -69,6 +68,7 @@
             <includes>
                 <include>keys.txt</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/idp-duo-sdk-distribution/pom.xml b/idp-duo-sdk-distribution/pom.xml
index d6c8621..6d637c8 100644
--- a/idp-duo-sdk-distribution/pom.xml
+++ b/idp-duo-sdk-distribution/pom.xml
@@ -35,7 +35,8 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/main/assembly/duo-native-sdk-assembly.xml</descriptor>
+                                <descriptor>src/main/assembly/duo-native-sdk-assembly-tgz.xml</descriptor>
+                                <descriptor>src/main/assembly/duo-native-sdk-assembly-zip.xml</descriptor>
                             </descriptors>
                             <finalName>${dist.duosdk.finalName}</finalName>
                             <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-tgz.xml
similarity index 97%
copy from idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
copy to idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-tgz.xml
index 6da5dd7..3aadbc9 100644
--- a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-tgz.xml
@@ -4,8 +4,6 @@
     <id>bin-native</id>
     <formats>
         <format>tar.gz</format>
-        <format>tar.bz2</format>
-        <format>zip</format>
     </formats>
     <fileSets>
          <!--  Our impl -->
diff --git a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml
similarity index 96%
rename from idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
rename to idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml
index 6da5dd7..c310f9b 100644
--- a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml
@@ -3,8 +3,6 @@
     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-native</id>
     <formats>
-        <format>tar.gz</format>
-        <format>tar.bz2</format>
         <format>zip</format>
     </formats>
     <fileSets>
@@ -61,6 +59,7 @@
             <includes>
                 <include>plugin.properties</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
         <fileSet>
             <!--  The signing certificates -->
@@ -69,6 +68,7 @@
             <includes>
                 <include>keys.txt</include>
             </includes>
+            <lineEnding>windows</lineEnding>
         </fileSet>
     </fileSets>
 </assembly>

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