[java-identity-provider COMMIT] /branches/3.1/idp-installer/src/main/wix/MergeModule.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 31 05:58:38 2015
New Revision: 7459

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7459&view=rev
Log:
Merge forward 3.1.1.1 Version

Modified:
    branches/3.1/idp-installer/src/main/wix/MergeModule.wxs

Modified: branches/3.1/idp-installer/src/main/wix/MergeModule.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-installer/src/main/wix/MergeModule.wxs?rev=7459&r1=7458&r2=7459&view=diff
==============================================================================
--- branches/3.1/idp-installer/src/main/wix/MergeModule.wxs (original)
+++ branches/3.1/idp-installer/src/main/wix/MergeModule.wxs Tue Mar 31 05:58:38 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.0.1">
+    <Module Id="Jetty" Language="1033" Version="1.1.1.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" />