[java-identity-provider] 01/01: IDP-2397 Use project.version to set msi internal version

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2397
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=580189d288a15489413ce1556c54025e0fa6805d

commit 580189d288a15489413ce1556c54025e0fa6805d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 21 11:00:13 2025 +0100

    IDP-2397 Use project.version to set msi internal version
    
    https://shibboleth.atlassian.net/browse/IDP-2397
---
 idp-msi/pom.xml | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/idp-msi/pom.xml b/idp-msi/pom.xml
index ededc414b..b5ca699ed 100644
--- a/idp-msi/pom.xml
+++ b/idp-msi/pom.xml
@@ -7,7 +7,6 @@
     <parent>
         <groupId>net.shibboleth.idp</groupId>
         <artifactId>idp-parent</artifactId>
-        <!-- DO NO CHANGE VERSION without changing msi.version below -->
         <version>5.2.0-SNAPSHOT</version>
     </parent>
 
@@ -20,11 +19,12 @@
     <properties>
         <!-- where to put the jetty-base we are making -->
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
-        <!-- msi Version  - CHANGE IN LOCKSTEP WITH THE VERSION ABOVE
-             99 is shorthand for SNAPSHOT
-        -->
-        <msi.version>5.2.0.0</msi.version>
         <supress.validation>false</supress.validation>
+	<!-- This is the fourth digit of the installer version.
+             We would only change this if reissued the installer for the same
+             IdP version -->
+	<msi.upgrade>0</msi.upgrade>
+        <maven-build-helper-plugin.version>3.6.1</maven-build-helper-plugin.version>
     </properties>
 
     <profiles>
@@ -63,7 +63,28 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- WIX  -->
+                    <!-- Version for Wix -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>${maven-build-helper-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>set-msi-version</id>
+                                <goals>
+                                    <goal>regex-property</goal>
+                                </goals>
+                                <configuration>
+                                    <value>${project.version}</value>
+                                    <name>msi.version</name>
+                                    <regex>-SNAPSHOT</regex>
+                                    <replacement/>
+                                    <failIfNoMatch>false</failIfNoMatch>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Build using Wix  -->
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
@@ -98,7 +119,7 @@
                                     <arguments>
                                         <argument>build</argument>
                                         <argument>src/main/wix/idp.vcxproj</argument>
-                                        <argument>/p:MsiVersion=${msi.version};IdpVersion=${project.version};SuppressValidation=${supress.validation}</argument>
+                                        <argument>/p:MsiVersion=${msi.version}.${msi.upgrade};IdpVersion=${project.version};SuppressValidation=${supress.validation}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -133,9 +154,9 @@
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
-	    <properties>
-		<maven-gpg-plugin.version>3.2.3</maven-gpg-plugin.version>
-	    </properties>
+            <properties>
+                <maven-gpg-plugin.version>3.2.3</maven-gpg-plugin.version>
+            </properties>
             <build>
                 <plugins>
                     <!-- Create gnupg-homedir and import secret key from env. -->

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