[java-idp-oidc] branch main updated: JOIDC-3 Package the zip distro with windows line endings
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Mar 17 11:50:09 UTC 2021
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=cb5f852434f09d5368bb5878ffc495564fecf813
The following commit(s) were added to refs/heads/main by this push:
new cb5f8524 JOIDC-3 Package the zip distro with windows line endings
cb5f8524 is described below
commit cb5f852434f09d5368bb5878ffc495564fecf813
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Mar 17 13:46:43 2021 +0200
JOIDC-3 Package the zip distro with windows line endings
https://issues.shibboleth.net/jira/browse/JOIDC-3
Fixed the formatting of the distribution-module's pom file.
Instead of single dep.xml, now assembly files for tgz and zip like with other
plugins. Removed tar.bz2 format. tarLongFileMode set to gnu.
---
idp-oidc-extension-distribution/pom.xml | 59 +++++++++++-----------
.../assembly/plugin-assembly-tgz.xml} | 4 +-
.../assembly/plugin-assembly-zip.xml} | 5 +-
3 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/idp-oidc-extension-distribution/pom.xml b/idp-oidc-extension-distribution/pom.xml
index 94ab983d..c8f7b174 100644
--- a/idp-oidc-extension-distribution/pom.xml
+++ b/idp-oidc-extension-distribution/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- See LICENSE.txt file in the root directory of this repository for the
- copyright/license information. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ copyright/license information. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -9,7 +10,7 @@
<groupId>net.shibboleth.idp.plugin.oidc</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>idp-plugin-oidc-op-distribution</artifactId>
<name>Shibboleth IdP :: Plugins :: OpenID Connect Provider Distribution</name>
<description>OpenID Connect Provider plugin distribution.</description>
@@ -18,33 +19,31 @@
<checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
<automatic.module.name>net.shibboleth.idp.plugin.oidc.op.distribution</automatic.module.name>
<dist.finalName>shibboleth-idp-plugin-oidc-op-${project.version}</dist.finalName>
- </properties>
+ </properties>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <descriptors>
- <descriptor>src/assembly/dep.xml</descriptor>
- </descriptors>
- <finalName>${dist.finalName}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
+ </descriptors>
+ <finalName>${dist.finalName}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
-
diff --git a/idp-oidc-extension-distribution/src/assembly/dep.xml b/idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-tgz.xml
similarity index 95%
copy from idp-oidc-extension-distribution/src/assembly/dep.xml
copy to idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-tgz.xml
index b413d0fa..fe0956e6 100644
--- a/idp-oidc-extension-distribution/src/assembly/dep.xml
+++ b/idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-tgz.xml
@@ -1,11 +1,9 @@
<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-targz</id>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
</formats>
<fileSets>
<fileSet>
diff --git a/idp-oidc-extension-distribution/src/assembly/dep.xml b/idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-zip.xml
similarity index 95%
rename from idp-oidc-extension-distribution/src/assembly/dep.xml
rename to idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-zip.xml
index b413d0fa..1f8c7a14 100644
--- a/idp-oidc-extension-distribution/src/assembly/dep.xml
+++ b/idp-oidc-extension-distribution/src/main/assembly/plugin-assembly-zip.xml
@@ -1,10 +1,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">
- <id>bin</id>
+ <id>assembly-zip</id>
<formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
<fileSets>
@@ -43,6 +41,7 @@
<includes>
<include>plugin.properties</include>
</includes>
+ <lineEnding>windows</lineEnding>
</fileSet>
</fileSets>
</assembly>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list