[java-idp-jetty-base] 02/02: 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=e37c2b9a151eff3a5abd0237ddb98a8b5d81b34d

commit e37c2b9a151eff3a5abd0237ddb98a8b5d81b34d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 15:43:24 2024 +0000

    IDP-2147 Investigate Wix V4
    
    https://shibboleth.atlassian.net/browse/IDP-2147
    
    Add support of a revision (4th digit of the version).  Allows multiple releases of
    the installer from the same jetty-base
---
 pom.xml                     | 5 +++--
 src/main/wix/Jetty-Main.wxs | 2 +-
 src/main/wix/wix.vcxproj    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb45d09..71990da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base-windows</artifactId>
     <packaging>pom</packaging>
-    <version>11.0.19-SNAPSHOT</version>
+    <version>11.0.18.3-SNAPSHOT</version>
 
     <properties>
         <!-- where to put the jetty-base we are making -->
@@ -32,6 +32,7 @@
         <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>
     </properties>
 
@@ -197,7 +198,7 @@
                                     <arguments>
                                         <argument>build</argument>
                                         <argument>src/main/wix/wix.vcxproj</argument>
-                                        <argument>/p:JettyVersion=${jetty.version},SuppressValidation=${supress.validation}</argument>
+                                        <argument>/p:JettyVersion=${jetty.version},SuppressValidation=${supress.validation},JettyRevision=${jetty.revision}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
diff --git a/src/main/wix/Jetty-Main.wxs b/src/main/wix/Jetty-Main.wxs
index ad06f49..b001c26 100644
--- a/src/main/wix/Jetty-Main.wxs
+++ b/src/main/wix/Jetty-Main.wxs
@@ -13,7 +13,7 @@
 <?define UpgradeUUID="FB2B7404-37B2-4CE5-8E2E-EEB53F9FF472"?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="Jetty Installer for the Shibboleth IdP V5" Language="1033" Version="$(var.jettyVersion).0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310"><SummaryInformation Description="Jetty Installation for Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
+    <Package Name="Jetty Installer for the Shibboleth IdP V5" Language="1033" Version="$(var.jettyVersion).$(var.jettyRevision)" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310"><SummaryInformation Description="Jetty Installation for Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
         <MediaTemplate EmbedCab="yes" />
diff --git a/src/main/wix/wix.vcxproj b/src/main/wix/wix.vcxproj
index e24ede5..59ce63e 100644
--- a/src/main/wix/wix.vcxproj
+++ b/src/main/wix/wix.vcxproj
@@ -13,7 +13,7 @@
 	<JettyBaseUnpackDir>..\..\..\target\idp-jetty-base</JettyBaseUnpackDir>
 	<JettyUnpackDir>..\..\..\target\jetty-home-$(JettyVersion)</JettyUnpackDir>
 	<ProcrunUnpackDir>..\..\..\target\procrun</ProcrunUnpackDir>
-	<DefineConstants>ProcrunSrc=$(ProcrunUnpackDir);jettyBaseSrc=$(JettyBaseUnpackDir);jettySrc=$(JettyUnpackDir);jettyVersion=$(JettyVersion)</DefineConstants>
+	<DefineConstants>ProcrunSrc=$(ProcrunUnpackDir);jettyBaseSrc=$(JettyBaseUnpackDir);jettySrc=$(JettyUnpackDir);jettyVersion=$(JettyVersion);jettyRevision=$(JettyRevision)</DefineConstants>
 	<SuppressIces>ICE61</SuppressIces>
     </PropertyGroup>
 

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