[java-idp-plugin-scripting] branch main updated: Stop building zip distributions

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-idp-plugin-scripting.

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

The following commit(s) were added to refs/heads/main by this push:
     new d434318  Stop building zip distributions
d434318 is described below

commit d434318b3087522f23bbb283a5cc34083925e8ae
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 2 14:17:56 2023 +0100

    Stop building zip distributions
---
 nashorn-jdk-dist/pom.xml                           |  3 +-
 .../src/main/assembly/plugin-assembly-zip.xml      | 52 ----------------------
 rhino-dist/pom.xml                                 |  3 +-
 .../src/main/assembly/plugin-assembly-zip.xml      | 52 ----------------------
 4 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/nashorn-jdk-dist/pom.xml b/nashorn-jdk-dist/pom.xml
index f22a0d7..e3967a9 100644
--- a/nashorn-jdk-dist/pom.xml
+++ b/nashorn-jdk-dist/pom.xml
@@ -41,7 +41,6 @@
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
                         <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
-                        <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
                     </descriptors>
                     <finalName>${nashorn.finalName}</finalName>
                     <overrideUid>1000</overrideUid>
@@ -74,7 +73,7 @@
                                     <dataVersion>${maven-dist-enforcer-data.version}</dataVersion>
                                     <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}/..</parentPomDir>
-                                    <zipFiles>${project.build.directory}/${nashorn.finalName}.zip</zipFiles>
+                                    <zipFiles/>
                                     <tgzFiles>${project.build.directory}/${nashorn.finalName}.tar.gz</tgzFiles>
                                     <checkSignatures>true</checkSignatures>
                                     <checkDependencies>true</checkDependencies>
diff --git a/nashorn-jdk-dist/src/main/assembly/plugin-assembly-zip.xml b/nashorn-jdk-dist/src/main/assembly/plugin-assembly-zip.xml
deleted file mode 100644
index 4dfafa3..0000000
--- a/nashorn-jdk-dist/src/main/assembly/plugin-assembly-zip.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<assembly>
-    <id>assembly-zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <!--  Our impl -->
-            <directory>../nashorn-jdk-impl/target</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>idp-plugin-nashorn-jdk-impl-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-                <exclude>*javadoc.jar</exclude>
-                <exclude>*sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <!--  Our dependencies -->
-            <directory>../nashorn-jdk-impl/target/dependency</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-                <exclude>*javadoc.jar</exclude>
-                <exclude>*sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <!--  The shared property file -->
-            <directory>../nashorn-jdk-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn/jdk</directory>
-            <outputDirectory>bootstrap</outputDirectory>
-            <includes>
-                <include>plugin.properties</include>
-            </includes>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-        <fileSet>
-            <!--  The signing keys -->
-            <directory>src/main/resources/bootstrap</directory>
-            <outputDirectory>bootstrap</outputDirectory>
-            <includes>
-                <include>keys.txt</include>
-            </includes>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/rhino-dist/pom.xml b/rhino-dist/pom.xml
index d4e0950..a177ddc 100644
--- a/rhino-dist/pom.xml
+++ b/rhino-dist/pom.xml
@@ -41,7 +41,6 @@
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
                         <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
-                        <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
                     </descriptors>
                     <finalName>${dist.finalName}</finalName>
                     <overrideUid>1000</overrideUid>
@@ -74,7 +73,7 @@
                                     <dataVersion>${maven-dist-enforcer-data.version}</dataVersion>
                                     <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}/..</parentPomDir>
-                                    <zipFiles>${project.build.directory}/${dist.finalName}.zip</zipFiles>
+                                    <zipFiles/>
                                     <tgzFiles>${project.build.directory}/${dist.finalName}.tar.gz</tgzFiles>
                                     <checkSignatures>true</checkSignatures>
                                     <checkDependencies>true</checkDependencies>
diff --git a/rhino-dist/src/main/assembly/plugin-assembly-zip.xml b/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
deleted file mode 100644
index cec1229..0000000
--- a/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<assembly>
-    <id>assembly-zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <!--  Our impl -->
-            <directory>../rhino-impl/target</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>idp-plugin-rhino-impl-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-                <exclude>*javadoc.jar</exclude>
-                <exclude>*sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <!--  Our dependencies -->
-            <directory>../rhino-impl/target/dependency</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-                <exclude>*javadoc.jar</exclude>
-                <exclude>*sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <!--  The shared property file -->
-            <directory>../rhino-impl/target/classes/net/shibboleth/idp/plugin/scripting/rhino</directory>
-            <outputDirectory>bootstrap</outputDirectory>
-            <includes>
-                <include>plugin.properties</include>
-            </includes>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-        <fileSet>
-            <!--  The signing keys -->
-            <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.