[java-identity-provider] branch maint-3.3 updated: IDP-1149 Force create the jetty-base/tmp directory

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/maint-3.3 by this push:
       new  8ab9242   IDP-1149 Force create the jetty-base/tmp directory
8ab9242 is described below

commit 8ab9242cd4db5fa0f501957fc29f539eab1ff9b5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Mar 23 11:30:20 2017 +0000

    IDP-1149 Force create the jetty-base/tmp directory
    
    https://issues.shibboleth.net/jira/browse/IDP-1149
    
    (Merge into maint-3.3)
---
 idp-installer/src/main/wix/IdP.bat                | 5 +++++
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index 080c315..979b21e 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -185,6 +185,11 @@ if ERRORLEVEL 1 (
   echo jetty-base/start.d directory not found?
   goto done;
 )
+
+rem IDP-1149 make doubley sure that we have a jetty-base\tmp dir
+mkdir %idpex%\jetty-base\tmp\
+echo "keeper" > %idpex%\jetty-base\tmp\.keep
+
 cd ..
 
 "%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr INSTALLDIR -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index c361651..9f066c7 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.3.1.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.3.1.1" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V3.3" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />

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