[java-idp-plugin-duo] branch main updated: Remove zip packaging
Phil Smart
philip.smart at jisc.ac.uk
Fri Sep 8 09:27:19 UTC 2023
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=92fa47f06b7f0628c699040ab02e9292fae09e98
The following commit(s) were added to refs/heads/main by this push:
new 92fa47f Remove zip packaging
92fa47f is described below
commit 92fa47f06b7f0628c699040ab02e9292fae09e98
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Sep 8 10:27:16 2023 +0100
Remove zip packaging
---
idp-duo-nimbus-distribution/pom.xml | 2 -
.../src/main/assembly/duo-nimbus-assembly-zip.xml | 74 ----------------------
idp-duo-sdk-distribution/pom.xml | 2 -
.../main/assembly/duo-native-sdk-assembly-zip.xml | 74 ----------------------
4 files changed, 152 deletions(-)
diff --git a/idp-duo-nimbus-distribution/pom.xml b/idp-duo-nimbus-distribution/pom.xml
index 13532d1..a33036c 100644
--- a/idp-duo-nimbus-distribution/pom.xml
+++ b/idp-duo-nimbus-distribution/pom.xml
@@ -36,7 +36,6 @@
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<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>
<overrideUid>1000</overrideUid>
@@ -71,7 +70,6 @@
<dataVersion>${maven-dist-enforcer-data.version}</dataVersion>
<dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
<parentPomDir>${basedir}/..</parentPomDir>
- <zipFiles>${project.build.directory}/${dist.nimbus.finalName}.zip</zipFiles>
<tgzFiles>${project.build.directory}/${dist.nimbus.finalName}.tar.gz</tgzFiles>
<checkSignatures>true</checkSignatures>
<checkDependencies>true</checkDependencies>
diff --git a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml
deleted file mode 100644
index daf5a3b..0000000
--- a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly-zip.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<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-nimbus-zip</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- Our impl -->
- <fileSet>
- <directory>../idp-duo-impl/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../idp-duo-nimbus-client-impl/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-nimbus-client-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <!-- Our API -->
- <fileSet>
- <directory>../idp-duo-api/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-api-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <!-- Our dependencies -->
- <fileSet>
- <directory>../idp-duo-nimbus-client-impl/target/dependency</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>nimbus-jose-jwt-*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <!-- The shared property file -->
- <directory>../idp-duo-nimbus-client-impl/target/classes/net/shibboleth/idp/plugin/authn/duo/nimbus/</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <includes>
- <include>plugin.properties</include>
- </includes>
- <lineEnding>windows</lineEnding>
- </fileSet>
- <fileSet>
- <!-- The signing certificates -->
- <directory>src/main/resources/bootstrap</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <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 0aff3be..11fbbd0 100644
--- a/idp-duo-sdk-distribution/pom.xml
+++ b/idp-duo-sdk-distribution/pom.xml
@@ -35,7 +35,6 @@
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<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>
<overrideUid>1000</overrideUid>
@@ -70,7 +69,6 @@
<dataVersion>${maven-dist-enforcer-data.version}</dataVersion>
<dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
<parentPomDir>${basedir}/..</parentPomDir>
- <zipFiles>${project.build.directory}/${dist.duosdk.finalName}.zip</zipFiles>
<tgzFiles>${project.build.directory}/${dist.duosdk.finalName}.tar.gz</tgzFiles>
<checkSignatures>true</checkSignatures>
<checkDependencies>true</checkDependencies>
diff --git a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml
deleted file mode 100644
index 670ae44..0000000
--- a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly-zip.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<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-native-zip</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- Our impl -->
- <fileSet>
- <directory>../idp-duo-impl/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../idp-duo-sdk-client-impl/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-sdk-client-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <!-- Our API -->
- <fileSet>
- <directory>../idp-duo-api/target</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-api-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <!-- Our dependencies -->
- <fileSet>
- <directory>../idp-duo-sdk-client-impl/target/dependency</directory>
- <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <!-- The shared property file -->
- <directory>../idp-duo-sdk-client-impl/target/classes/net/shibboleth/idp/plugin/authn/duo/sdk/</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <includes>
- <include>plugin.properties</include>
- </includes>
- <lineEnding>windows</lineEnding>
- </fileSet>
- <fileSet>
- <!-- The signing certificates -->
- <directory>src/main/resources/bootstrap</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <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.
More information about the commits
mailing list