[java-identity-provider] branch main updated: Tidy

Rod Widdowson rdw at steadingsoftware.com
Tue Jul 18 13:06:08 UTC 2023


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

rdw pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
     new 5754e99d3 Tidy
5754e99d3 is described below

commit 5754e99d392ed86f59a83ecae8d1c421b9931bd8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 18 14:02:32 2023 +0100

    Tidy
---
 idp-installer/src/main/wix/ShibbolethIdP-registry.wxs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index f5c3878c9..0ce2a30bf 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -89,11 +89,6 @@
             <RegistrySearch Id="JvmMx" Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\shibd_idp\Parameters\Java" Name="JvmMx" Type="raw" Win64="no" />
         </Property>
 
-        <!-- Make a best effort to find where the Quick Installer was installed to -->
-        <Property Id="QI_INSTALL_DIR" Secure="yes">
-            <RegistrySearch Id="OldQIDir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D54EF89F-F134-450C-A64D-593F5602F175}" Name="InstallLocation" Type="raw" Win64="no" />
-        </Property>
-
 	<!-- Should be in Mergemodule -->
         <Property Id="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes"/>
         <Property Id="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes"/>
@@ -108,5 +103,6 @@
             <RegistrySearch Id="OldInstallJettydUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJettydUser" Type="raw" Win64="no" />
         </Property>
     </Fragment>
-</Wix> <!--msiexec /lv* log.log /i idp-x64.msi JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7=SHIBD_USER JETTYD_PASSSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7=Gold12! -->
+</Wix>
+
 

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


More information about the commits mailing list