[java-oidc-common] 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-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=2ad1609b4af18a7f75eb724d3f730f772c617364

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

commit 2ad1609b4af18a7f75eb724d3f730f772c617364
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Mar 17 14:05:08 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
---
 oidc-common-dist/pom.xml                                               | 3 ++-
 .../src/main/assembly/{plugin-assembly.xml => plugin-assembly-tgz.xml} | 1 -
 .../src/main/assembly/{plugin-assembly.xml => plugin-assembly-zip.xml} | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/oidc-common-dist/pom.xml b/oidc-common-dist/pom.xml
index 09244b0..b94f5b7 100644
--- a/oidc-common-dist/pom.xml
+++ b/oidc-common-dist/pom.xml
@@ -57,7 +57,8 @@
 				<configuration>
 					<appendAssemblyId>false</appendAssemblyId>
 					<descriptors>
-						<descriptor>src/main/assembly/plugin-assembly.xml</descriptor>
+						<descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
+						<descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
 					</descriptors>
 					<finalName>${dist.finalName}</finalName>
 					<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/oidc-common-dist/src/main/assembly/plugin-assembly.xml b/oidc-common-dist/src/main/assembly/plugin-assembly-tgz.xml
similarity index 99%
copy from oidc-common-dist/src/main/assembly/plugin-assembly.xml
copy to oidc-common-dist/src/main/assembly/plugin-assembly-tgz.xml
index 662a0f9..fcef674 100644
--- a/oidc-common-dist/src/main/assembly/plugin-assembly.xml
+++ b/oidc-common-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -1,7 +1,6 @@
 <assembly>
 	<id>assembly</id>
 	<formats>
-		<format>zip</format>
 		<format>tar.gz</format>
 	</formats>
 	<fileSets>
diff --git a/oidc-common-dist/src/main/assembly/plugin-assembly.xml b/oidc-common-dist/src/main/assembly/plugin-assembly-zip.xml
similarity index 98%
rename from oidc-common-dist/src/main/assembly/plugin-assembly.xml
rename to oidc-common-dist/src/main/assembly/plugin-assembly-zip.xml
index 662a0f9..dc27f6e 100644
--- a/oidc-common-dist/src/main/assembly/plugin-assembly.xml
+++ b/oidc-common-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -2,7 +2,6 @@
 	<id>assembly</id>
 	<formats>
 		<format>zip</format>
-		<format>tar.gz</format>
 	</formats>
 	<fileSets>
 		<!-- attribute -->
@@ -187,6 +186,7 @@
 			<includes>
 				<include>plugin.properties</include>
 			</includes>
+			<lineEnding>windows</lineEnding>
 		</fileSet>
 		<fileSet>
 			<!-- The signing certificates -->
@@ -195,6 +195,7 @@
 			<includes>
 				<include>keys.txt</include>
 			</includes>
+			<lineEnding>windows</lineEnding>
 		</fileSet>
 
 

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