From: Jalview Development Admin <jalview-dev-owner@jalview.org>
Date: Thu, 10 Mar 2022 01:34:08 +0000 (+0000)
Subject: Merge branch 'develop' into releases/Release_2_11_2_Branch
X-Git-Tag: Release_2_11_2_0
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=refs%2Ftags%2FRelease_2_11_2_0;hp=834244864559d3569d67c1bee5e72241a1525e53

Merge branch 'develop' into releases/Release_2_11_2_Branch
---

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index aaf923d..b9a27ff 100755
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -59,7 +59,7 @@ li:before {
     <tr>
       <td width="60" align="center" nowrap><strong><a
           id="Jalview.2.11.2">2.11.2</a><a id="Jalview.2.11.2.0">.0</a><br />
-          <em>9/03/2022</em></strong></td>
+          <em>10/03/2022</em></strong></td>
       <td align="left" valign="top">
         <ul>
           <li>
diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j
index 6b07bfc..a6d0893 100644
--- a/utils/install4j/install4j9_template.install4j
+++ b/utils/install4j/install4j9_template.install4j
@@ -1105,7 +1105,7 @@ return console.askYesNo(message, true);
           </screen>
         </screens>
       </application>
-      <application name="MacOS Setup" id="2746" beanClass="com.install4j.runtime.beans.applications.CustomApplication" fileset="734">
+      <application name="MacOS Setup" id="2746" beanClass="com.install4j.runtime.beans.applications.CustomApplication" fileset="734" macEntitlementsFile="${compiler:JALVIEW_DIR}/utils/osx_signing/entitlements.txt">
         <serializedBean>
           <property name="executableDirectory">
             <object class="java.io.File">