[java-identity-provider COMMIT] in /tags/3.1.2.1: ./ idp-installer/src/main/wix/MergeModule.wxs idp-installer/src/mai...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul  1 13:41:29 2015
New Revision: 7619

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7619&view=rev
Log:
Tag 3.1.2.1

Added:
    tags/3.1.2.1/   (props changed)
      - copied from r7617, tags/3.1.2/
    tags/3.1.2.1/idp-installer/src/main/wix/download/
    tags/3.1.2.1/idp-installer/src/main/wix/download/commons-daemon-1.0.15-bin-windows-signed.zip   (with props)
    tags/3.1.2.1/idp-installer/src/main/wix/download/commons-daemon-1.0.15-bin-windows-signed.zip.asc   (with props)
    tags/3.1.2.1/idp-installer/src/main/wix/download/jetty-distribution-9.2.11.v20150529.zip   (with props)
    tags/3.1.2.1/idp-installer/src/main/wix/download/jetty-distribution-9.2.11.v20150529.zip.asc   (with props)
Modified:
    tags/3.1.2.1/idp-installer/src/main/wix/MergeModule.wxs
    tags/3.1.2.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

Modified: tags/3.1.2.1/idp-installer/src/main/wix/MergeModule.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/tags/3.1.2.1/idp-installer/src/main/wix/MergeModule.wxs?rev=7619&r1=7617&r2=7619&view=diff
==============================================================================
--- tags/3.1.2.1/idp-installer/src/main/wix/MergeModule.wxs	(original)
+++ tags/3.1.2.1/idp-installer/src/main/wix/MergeModule.wxs	Wed Jul  1 13:41:29 2015
@@ -16,7 +16,7 @@
    permissions and limitations under the License.  -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Module Id="Jetty" Language="1033" Version="1.1.1.1">
+    <Module Id="Jetty" Language="1033" Version="1.1.2.1">
         <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium.  Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="$(var.msitype)" />
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="JETTYROOT" Name="Jetty" />

Modified: tags/3.1.2.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/tags/3.1.2.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=7619&r1=7617&r2=7619&view=diff
==============================================================================
--- tags/3.1.2.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	(original)
+++ tags/3.1.2.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	Wed Jul  1 13:41:29 2015
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.1.2.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.1.2.1" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V3.1.2" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />