[java-idp-jetty-base] 02/03: IDP-2147 Investigate Wix V4

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2147
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=1f25130f12419dd50a87acee888dc90cd931f17a

commit 1f25130f12419dd50a87acee888dc90cd931f17a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Mar 10 13:38:37 2024 +0000

    IDP-2147 Investigate Wix V4
    
    https://shibboleth.atlassian.net/browse/IDP-2147
    
    Stop zipping up the msi file.
---
 pom.xml                   | 31 +++----------------------------
 src/main/assembly/zip.xml | 18 ------------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71990da..c082412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
         <procrun.version>1.3.4</procrun.version>
         <procrun.classifier>bin-windows</procrun.classifier>
         <jetty.version>11.0.18</jetty.version>
-	<jetty.revision>3</jetty.revision>
-	<supress.validation>false</supress.validation>
+        <jetty.revision>3</jetty.revision>
+        <supress.validation>false</supress.validation>
     </properties>
 
     <dependencies>
@@ -218,37 +218,12 @@
                                 </goals>
                                 <configuration>
                                     <target>
-                                        <copy file="src/main/wix/obj/Debug/wix.msi" tofile="${project.build.directory}/shibboleth-jetty-base-x64-${jetty.version}.msi"/>
+                                        <copy file="src/main/wix/obj/Debug/wix.msi" tofile="${project.build.directory}/shibboleth-jetty-base-x64-${project.version}.msi"/>
                                     </target>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- Assemble the artifacts. -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/assembly/zip.xml</descriptor>
-                            </descriptors>
-			    <!-- Turn off compression -->
-			    <archiverConfig>
-				<compress>false</compress>
-			    </archiverConfig>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml
deleted file mode 100644
index fff2615..0000000
--- a/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-	    <directory>${project.build.directory}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>shibboleth-jetty-base-x64-${jetty.version}.msi</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-    <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>

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