From b434a6f96e336e7cccb1a0c962c00e304130f272 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 20 May 2024 14:44:39 -0500
Subject: [PATCH 01/17] Correct syntax

---
 .github/workflows/ant-app.yml | 8 ++++----
 .github/workflows/ant.yml     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index e9f68426..afa6d672 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -382,7 +382,7 @@ jobs:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
         regex: true
-        file: '${{ inputs.use_hdf }}-osx.*\\.tar.gz'
+        file: '\$\{\{ inputs.use_hdf \}\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -390,7 +390,7 @@ jobs:
             ls ${{ runner.workspace }}
 
     - name: Uncompress gh binary (mac)
-      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf }}-osx.*\\.tar.gz
+      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf }}-osx*.tar.gz
 
     - name: Uncompress hdf4 binary (mac)
       run: |
@@ -410,7 +410,7 @@ jobs:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
         regex: true
-        file: '${{ inputs.use_hdf5 }}-osx.*\\.tar.gz'
+        file: '\$\{\{ inputs.use_hdf5 \}\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -418,7 +418,7 @@ jobs:
             ls ${{ runner.workspace }}
 
     - name: Uncompress gh binary (mac)
-      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx.*\\.tar.gz
+      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx*.tar.gz
 
     - name: Uncompress hdf5 binary (mac)
       run:  |
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 3d0c023d..84852d38 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -382,7 +382,7 @@ jobs:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
         regex: true
-        file: '${{ inputs.use_hdf }}-osx.*\\.tar.gz'
+        file: '\$\{\{ inputs.use_hdf \}\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -390,7 +390,7 @@ jobs:
             ls ${{ runner.workspace }}
 
     - name: Uncompress gh binary (mac)
-      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf }}-osx.*\\.tar.gz
+      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf }}-osx*.tar.gz
 
     - name: Uncompress hdf4 binary (mac)
       run: |
@@ -410,7 +410,7 @@ jobs:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
         regex: true
-        file: '${{ inputs.use_hdf5 }}-osx.*\\.tar.gz'
+        file: '\$\{\{ inputs.use_hdf5 \}\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -418,7 +418,7 @@ jobs:
             ls ${{ runner.workspace }}
 
     - name: Uncompress gh binary (mac)
-      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx.*\\.tar.gz
+      run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx*.tar.gz
 
     - name: Uncompress hdf5 binary (mac)
       run:  |

From 98f10a0ce7d82797c40626e59f751b3081dad94f Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 20 May 2024 14:50:52 -0500
Subject: [PATCH 02/17] Use double slash

---
 .github/workflows/ant-app.yml | 4 ++--
 .github/workflows/ant.yml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index afa6d672..68455048 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -382,7 +382,7 @@ jobs:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
         regex: true
-        file: '\$\{\{ inputs.use_hdf \}\}-osx.*\\.tar.gz'
+        file: '\\$\\{\\{ inputs.use_hdf \\}\\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -410,7 +410,7 @@ jobs:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
         regex: true
-        file: '\$\{\{ inputs.use_hdf5 \}\}-osx.*\\.tar.gz'
+        file: '\\$\\{\\{ inputs.use_hdf5 \\}\\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 84852d38..886d29d0 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -382,7 +382,7 @@ jobs:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
         regex: true
-        file: '\$\{\{ inputs.use_hdf \}\}-osx.*\\.tar.gz'
+        file: '\\$\\{\\{ inputs.use_hdf \\}\\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -410,7 +410,7 @@ jobs:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
         regex: true
-        file: '\$\{\{ inputs.use_hdf5 \}\}-osx.*\\.tar.gz'
+        file: '\\$\\{\\{ inputs.use_hdf5 \\}\\}-osx.*\\.tar.gz'
 
     - name: List files for the space (mac)
       run: |

From 6544a49bd9b556f526da86b5e615bfc13ff099ed Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 20 May 2024 15:06:02 -0500
Subject: [PATCH 03/17] Just try both ways

---
 .github/workflows/ant-app.yml | 22 ++++++++++++++++++----
 .github/workflows/ant.yml     | 22 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 68455048..7046872a 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -381,8 +381,15 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
-        regex: true
-        file: '\\$\\{\\{ inputs.use_hdf \\}\\}-osx.*\\.tar.gz'
+        file: '${{ inputs.use_hdf }}-osx.tar.gz'
+
+    - name: Get hdf4 release osx12
+      if: failure()
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -409,8 +416,15 @@ jobs:
       with:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
-        regex: true
-        file: '\\$\\{\\{ inputs.use_hdf5 \\}\\}-osx.*\\.tar.gz'
+        file: '${{ inputs.use_hdf5 }}-osx.tar.gz'
+
+    - name: Get hdf5 release osx12
+      if: failure()
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf5'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf5 }}-osx12.tar.gz'
 
     - name: List files for the space (mac)
       run: |
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 886d29d0..f1df4bc6 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -381,8 +381,15 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/snapshot'
-        regex: true
-        file: '\\$\\{\\{ inputs.use_hdf \\}\\}-osx.*\\.tar.gz'
+        file: '${{ inputs.use_hdf }}-osx.tar.gz'
+
+    - name: Get hdf4 release osx12
+      if: failure()
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
     - name: List files for the space (mac)
       run: |
@@ -409,8 +416,15 @@ jobs:
       with:
         repo: 'HDFGroup/hdf5'
         version: 'tags/snapshot'
-        regex: true
-        file: '\\$\\{\\{ inputs.use_hdf5 \\}\\}-osx.*\\.tar.gz'
+        file: '${{ inputs.use_hdf5 }}-osx.tar.gz'
+
+    - name: Get hdf5 release osx12
+      if: failure()
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf5'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf5 }}-osx12.tar.gz'
 
     - name: List files for the space (mac)
       run: |

From 7ed4505bb9c3fc87b3fa4caeb5f57a6ed0d745de Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 20 May 2024 15:20:39 -0500
Subject: [PATCH 04/17] Continue if error

---
 .github/workflows/ant-app.yml | 2 ++
 .github/workflows/ant.yml     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 7046872a..cfdc1303 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -377,6 +377,7 @@ jobs:
         distribution: 'temurin'
 
     - name: Get hdf4 release
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf4'
@@ -412,6 +413,7 @@ jobs:
         echo "HDFLIB_ENV=$HDFDIR$FILE_NAME_HDF" >> $GITHUB_OUTPUT
 
     - name: Get hdf5 release
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index f1df4bc6..82de2858 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -377,6 +377,7 @@ jobs:
         distribution: 'temurin'
 
     - name: Get hdf4 release
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf4'
@@ -412,6 +413,7 @@ jobs:
         echo "HDFLIB_ENV=$HDFDIR$FILE_NAME_HDF" >> $GITHUB_OUTPUT
 
     - name: Get hdf5 release
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'

From 648fdf6f82c2c892fa1356442cd101265ea5b865 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 20 May 2024 16:35:03 -0500
Subject: [PATCH 05/17] Just continue

---
 .github/workflows/ant-app.yml | 4 ++--
 .github/workflows/ant.yml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index cfdc1303..25c55cb2 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -385,7 +385,7 @@ jobs:
         file: '${{ inputs.use_hdf }}-osx.tar.gz'
 
     - name: Get hdf4 release osx12
-      if: failure()
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf4'
@@ -421,7 +421,7 @@ jobs:
         file: '${{ inputs.use_hdf5 }}-osx.tar.gz'
 
     - name: Get hdf5 release osx12
-      if: failure()
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 82de2858..91f286fb 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -385,7 +385,7 @@ jobs:
         file: '${{ inputs.use_hdf }}-osx.tar.gz'
 
     - name: Get hdf4 release osx12
-      if: failure()
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf4'
@@ -421,7 +421,7 @@ jobs:
         file: '${{ inputs.use_hdf5 }}-osx.tar.gz'
 
     - name: Get hdf5 release osx12
-      if: failure()
+      continue-on-error: true
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'

From bfb27cf38b3614b3ad42edcd616ab5b41c2190a2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 22 May 2024 16:19:44 -0500
Subject: [PATCH 06/17] Use vars for keychain name

---
 .github/workflows/ant-app.yml | 2 +-
 .github/workflows/ant.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 25c55cb2..9c7fe5b2 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -486,7 +486,7 @@ jobs:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
         KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
-        KEYCHAIN_NAME: app-signing
+        KEYCHAIN_NAME: ${{ vars.KEYCHAIN_NAME }}
         SIGNER: ${{ vars.SIGNER }}
         NOTARY_USER: ${{ vars.NOTARY_USER }}
         NOTARY_KEY: ${{ vars.NOTARY_KEY }}
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 91f286fb..7bf5d304 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -486,7 +486,7 @@ jobs:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
         KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
-        KEYCHAIN_NAME: app-signing
+        KEYCHAIN_NAME: ${{ vars.KEYCHAIN_NAME }}
         SIGNER: ${{ vars.SIGNER }}
         NOTARY_USER: ${{ vars.NOTARY_USER }}
         NOTARY_KEY: ${{ vars.NOTARY_KEY }}

From 33c7458c33d9ce0c935a209a1cd3b4829897ea70 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 22 May 2024 16:31:15 -0500
Subject: [PATCH 07/17] Add keychain name ext

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 28438f9a..0a5bcb1e 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,7 @@
     <!-- MAC signing: -->
     <property name="sign.account" value="${env.SIGNER}" />
     <property name="pass.keychain_key" value="${env.KEYCHAIN_PASSWD}" />
-    <property name="name.keychain_key" value="${env.KEYCHAIN_NAME}" />
+    <property name="name.keychain_key" value="${env.KEYCHAIN_NAME}.keychain" />
 
     <!-- MAC notary: -->
     <property name="notarize.account" value="${env.NOTARY_USER}" />
@@ -1530,7 +1530,7 @@
             <arg value="--mac-signing-key-user-name" />
             <arg value="The HDF Group (${sign.account})" />
             <arg value="--mac-signing-keychain" />
-            <arg value="${name.keychain_key}.keychain" />
+            <arg value="${name.keychain_key}" />
         </exec>
     </target>
 

From 92c6622f330576ae4bb7c5337cba50776a8bbbbd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 22 May 2024 17:17:14 -0500
Subject: [PATCH 08/17] Use name in all locations

---
 .github/workflows/ant-app.yml | 2 +-
 .github/workflows/ant.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 9c7fe5b2..0141fe8c 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -358,7 +358,7 @@ jobs:
       run: |
           # create variables
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          KEYCHAIN_FILE=app-signing
+          KEYCHAIN_FILE=${{ vars.KEYCHAIN_NAME }}.keychain
           # import certificate from secrets
           echo $BUILD_CERTIFICATE_BASE64 | base64 --decode > $CERTIFICATE_PATH
           security -v create-keychain -p $KEYCHAIN_PASSWD $KEYCHAIN_FILE
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 7bf5d304..fab47751 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -358,7 +358,7 @@ jobs:
       run: |
           # create variables
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          KEYCHAIN_FILE=app-signing
+          KEYCHAIN_FILE=${{ vars.KEYCHAIN_NAME }}.keychain
           # import certificate from secrets
           echo $BUILD_CERTIFICATE_BASE64 | base64 --decode > $CERTIFICATE_PATH
           security -v create-keychain -p $KEYCHAIN_PASSWD $KEYCHAIN_FILE

From 8bbceb3fbaf1ee39659f53fadc978157ba8641e8 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 24 May 2024 16:55:45 -0500
Subject: [PATCH 09/17] Switch back to notary

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 0a5bcb1e..263630b6 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
     <!-- MAC notary: -->
     <property name="notarize.account" value="${env.NOTARY_USER}" />
     <property name="notarize.keychain_key" value="${env.NOTARY_KEY}" />
-    <property name="notarize.altool" value="-altool" />
+    <property name="notarize.altool" value="" />
 
     <!-- Get HDFView, HDF4, HDF5 and HDF-Java version information -->
     <loadfile property="app.version" srcFile="${basedir}/VERSION">

From 0fb35b0ff0a73742d8fa4560e5dbb0ba3dfe3666 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 24 May 2024 17:15:43 -0500
Subject: [PATCH 10/17] remove --file option from notarytool call

---
 build.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.xml b/build.xml
index 263630b6..fbca8513 100644
--- a/build.xml
+++ b/build.xml
@@ -2122,7 +2122,6 @@
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
             <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
-            <arg value="--file"/>
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
         </exec>
         <loadfile property="retUUID" srcfile="retUUID.txt">
@@ -2196,7 +2195,6 @@
                 <arg value="--password"/>
                 <arg value="${notarize.keychain_key}"/>
                 <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
-                <arg value="--file"/>
                 <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
             </exec>
             <loadfile property="retUUID" srcfile="retUUID.txt">

From 93c73665087579c37e3f1fe8530c2569d2eda129 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Sun, 26 May 2024 10:35:40 -0500
Subject: [PATCH 11/17] Adjust notary creds

---
 build.xml | 104 +++++-------------------------------------------------
 1 file changed, 9 insertions(+), 95 deletions(-)

diff --git a/build.xml b/build.xml
index fbca8513..7c1dad52 100644
--- a/build.xml
+++ b/build.xml
@@ -2022,95 +2022,6 @@
           MAC NOTARY FOR JPACKAGE
           ================================================================= -->
 
-    <target name="submit-notary-altool" if="sign.enable">
-        <exec executable="/usr/bin/xcrun" failonerror="true">
-            <redirector output="retUUID.txt" alwayslog="true"/>
-            <arg value="altool"/>
-            <arg value="--notarize-app"/>
-            <arg value="--type"/>
-            <arg value="osx"/>
-            <arg value="--primary-bundle-id"/>
-            <arg value="app.${ant.project.name}-${app.version}"/>
-            <arg value="--username"/>
-            <arg value="${notarize.account}"/>
-            <arg value="--password"/>
-            <arg value="${notarize.keychain_key}"/>
-            <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
-            <arg value="--file"/>
-            <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
-        </exec>
-        <loadfile property="retUUID" srcfile="retUUID.txt">
-            <filterchain>
-                <tokenfilter>
-                    <containsregex
-                         pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
-                         replace="\1" />
-                </tokenfilter>
-                <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-        <echo>notarize-app:${retUUID}</echo>
-    </target>
-
-    <target name="post-notary-altool" if="sign.enable">
-        <loadfile property="retUUID" srcfile="retUUID.txt">
-            <filterchain>
-                <tokenfilter>
-                    <containsregex
-                         pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
-                         replace="\1" />
-                </tokenfilter>
-                <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-        <sleep minutes="10"/>
-        <exec executable="/usr/bin/xcrun" failonerror="true" outputproperty="logInfo" resultproperty="logUUID">
-            <redirector output="notary.txt" alwayslog="true"/>
-            <arg value="altool"/>
-            <arg value="--notarization-info"/>
-            <arg value="${retUUID}"/>
-            <arg value="--username"/>
-            <arg value="${notarize.account}"/>
-            <arg value="--password"/>
-            <arg value="${notarize.keychain_key}"/>
-            <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
-        </exec>
-        <condition property="isnotarized">
-            <resourcecontains resource="notary.txt" substring="success"/>
-        </condition>
-        <echo>notarize-info:${logInfo}</echo>
-    </target>
-
-        <target name="zip-submit-notary-altool" if="sign.enable">
-            <exec executable="/usr/bin/xcrun" failonerror="true">
-                <redirector output="retUUID.txt" alwayslog="true"/>
-                <arg value="altool"/>
-                <arg value="--notarize-app"/>
-                <arg value="--type"/>
-                <arg value="osx"/>
-                <arg value="--primary-bundle-id"/>
-                <arg value="app.${ant.project.name}-${app.version}"/>
-                <arg value="--username"/>
-                <arg value="${notarize.account}"/>
-                <arg value="--password"/>
-                <arg value="${notarize.keychain_key}"/>
-                <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
-                <arg value="--file"/>
-                <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
-            </exec>
-            <loadfile property="retUUID" srcfile="retUUID.txt">
-                <filterchain>
-                    <tokenfilter>
-                        <containsregex
-                             pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
-                             replace="\1" />
-                    </tokenfilter>
-                    <striplinebreaks/>
-                </filterchain>
-            </loadfile>
-            <echo>notarize-app:${retUUID}</echo>
-        </target>
-
     <target name="submit-notary" if="sign.enable">
         <exec executable="/usr/bin/xcrun" failonerror="true">
             <redirector output="retUUID.txt" alwayslog="true"/>
@@ -2121,7 +2032,8 @@
             <arg value="${notarize.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
-            <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
+            <arg value="--team-id"/>
+            <arg value="${sign.account}"/>
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
         </exec>
         <loadfile property="retUUID" srcfile="retUUID.txt">
@@ -2152,12 +2064,13 @@
             <redirector output="notary.txt" alwayslog="true"/>
             <arg value="notarytool"/>
             <arg value="info"/>
-            <arg value="${retUUID}"/>
-            <arg value="--username"/>
+            <arg value="--apple-id"/>
             <arg value="${notarize.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
-            <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
+            <arg value="--team-id"/>
+            <arg value="${sign.account}"/>
+            <arg value="${retUUID}"/>
         </exec>
         <condition property="isnotarized">
             <resourcecontains resource="notary.txt" substring="success"/>
@@ -2190,11 +2103,12 @@
                 <arg value="notarytool"/>
                 <arg value="submit"/>
                 <arg value="--wait"/>
-                <arg value="--username"/>
+                <arg value="--apple-id"/>
                 <arg value="${notarize.account}"/>
                 <arg value="--password"/>
                 <arg value="${notarize.keychain_key}"/>
-                <!-- <arg value="@keychain:${notarize.keychain_key}"/> -->
+                <arg value="--team-id"/>
+                <arg value="${sign.account}"/>
                 <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
             </exec>
             <loadfile property="retUUID" srcfile="retUUID.txt">

From 280100e6334498cd60326422d34de57bcbcdb0e3 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Sun, 26 May 2024 12:04:04 -0500
Subject: [PATCH 12/17] correct regex for new output

---
 build.xml | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 98e9cae5..0b3396cc 100644
--- a/build.xml
+++ b/build.xml
@@ -2042,7 +2042,7 @@
             <filterchain>
                 <tokenfilter>
                     <containsregex
-                         pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
+                         pattern="id\:\s*([0-9a-fA-F-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
@@ -2056,7 +2056,7 @@
             <filterchain>
                 <tokenfilter>
                     <containsregex
-                         pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
+                        pattern="id\:\s*([0-9a-fA-F-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
@@ -2101,6 +2101,7 @@
         </exec>
     </target>
 
+<<<<<<< Upstream, based on branch 'master-syn' of https://github.com/byrnHDF/hdfview.git
         <target name="zip-submit-notary" if="sign.enable">
             <exec executable="/usr/bin/xcrun" failonerror="true">
                 <redirector output="retUUID.txt" alwayslog="true"/>
@@ -2129,6 +2130,34 @@
             </loadfile>
             <echo>notarize-app:${retUUID}</echo>
         </target>
+=======
+    <target name="zip-submit-notary" if="sign.enable">
+        <exec executable="/usr/bin/xcrun" failonerror="true">
+            <redirector output="retUUID.txt" alwayslog="true"/>
+            <arg value="notarytool"/>
+            <arg value="submit"/>
+            <arg value="--wait"/>
+            <arg value="--apple-id"/>
+            <arg value="${notarize.account}"/>
+            <arg value="--password"/>
+            <arg value="${notarize.keychain_key}"/>
+            <arg value="--team-id"/>
+            <arg value="${sign.account}"/>
+            <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
+        </exec>
+        <loadfile property="retUUID" srcfile="retUUID.txt">
+            <filterchain>
+                <tokenfilter>
+                    <containsregex
+                        pattern="id\:\s*([0-9a-fA-F-]+)$"
+                         replace="\1" />
+                </tokenfilter>
+                <striplinebreaks/>
+            </filterchain>
+        </loadfile>
+        <echo>notarize-app:${retUUID}</echo>
+    </target>
+>>>>>>> 533cade correct regex for new output
 
     <!-- Staple the received notarization to the app -->
     <!-- run this after notarization is completed -->

From 1ebbf5ea11a291dab385d031864fcf0754b25a73 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Sun, 26 May 2024 15:07:20 -0500
Subject: [PATCH 13/17] Rework UUID

---
 build.xml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 0b3396cc..6fc796ad 100644
--- a/build.xml
+++ b/build.xml
@@ -2023,8 +2023,8 @@
           ================================================================= -->
 
     <target name="submit-notary" if="sign.enable">
-        <exec executable="/usr/bin/xcrun" failonerror="true">
-            <redirector output="retUUID.txt" alwayslog="true"/>
+        <exec executable="/usr/bin/xcrun" failonerror="true"
+              outputproperty="retUUID.txt">
             <arg value="notarytool"/>
             <arg value="submit"/>
             <arg value="--wait"/>
@@ -2038,30 +2038,24 @@
             <arg value="${sign.account}"/>
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
         </exec>
-        <loadfile property="retUUID" srcfile="retUUID.txt">
+        <echo>notarize-app output:${retUUID.txt}</echo>
+        <sequential>
+        <echo message="@{retUUID.txt}" file="retUUID.txt.file" />
+        <loadfile property="retUUID" srcfile="retUUID.txt.file">
             <filterchain>
                 <tokenfilter>
                     <containsregex
-                         pattern="id\:\s*([0-9a-fA-F-]+)$"
+                         pattern="id:\s*([0-9a-fA-F-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
         </loadfile>
+        </sequential>
         <echo>notarize-app:${retUUID}</echo>
     </target>
 
     <target name="post-notary" if="sign.enable">
-        <loadfile property="retUUID" srcfile="retUUID.txt">
-            <filterchain>
-                <tokenfilter>
-                    <containsregex
-                        pattern="id\:\s*([0-9a-fA-F-]+)$"
-                         replace="\1" />
-                </tokenfilter>
-                <striplinebreaks/>
-            </filterchain>
-        </loadfile>
         <exec executable="/usr/bin/xcrun" failonerror="true" outputproperty="logInfo" resultproperty="logUUID">
             <redirector output="notary.txt" alwayslog="true"/>
             <arg value="notarytool"/>
@@ -2132,8 +2126,8 @@
         </target>
 =======
     <target name="zip-submit-notary" if="sign.enable">
-        <exec executable="/usr/bin/xcrun" failonerror="true">
-            <redirector output="retUUID.txt" alwayslog="true"/>
+        <exec executable="/usr/bin/xcrun" failonerror="true"
+              outputproperty="zipUUID.txt">
             <arg value="notarytool"/>
             <arg value="submit"/>
             <arg value="--wait"/>
@@ -2145,17 +2139,20 @@
             <arg value="${sign.account}"/>
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
         </exec>
-        <loadfile property="retUUID" srcfile="retUUID.txt">
+        <echo>notarize-zip-app:${zipUUID.txt}</echo>
+        <sequential>
+        <echo message="@{zipUUID.txt}" file="zipUUID.txt.file" />
+        <loadfile property="zipUUID" srcfile="zipUUID.txt.file">
             <filterchain>
                 <tokenfilter>
                     <containsregex
-                        pattern="id\:\s*([0-9a-fA-F-]+)$"
+                        pattern="id:\s*([0-9a-fA-F-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
         </loadfile>
-        <echo>notarize-app:${retUUID}</echo>
+        <echo>notarize-zip-app:${zipUUID}</echo>
     </target>
 >>>>>>> 533cade correct regex for new output
 

From e150e0cba7485a4c526469f7f31f12d616893905 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Sun, 26 May 2024 15:37:44 -0500
Subject: [PATCH 14/17] Fix conflicts

---
 build.xml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/build.xml b/build.xml
index 6fc796ad..ca695c37 100644
--- a/build.xml
+++ b/build.xml
@@ -2095,36 +2095,6 @@
         </exec>
     </target>
 
-<<<<<<< Upstream, based on branch 'master-syn' of https://github.com/byrnHDF/hdfview.git
-        <target name="zip-submit-notary" if="sign.enable">
-            <exec executable="/usr/bin/xcrun" failonerror="true">
-                <redirector output="retUUID.txt" alwayslog="true"/>
-                <arg value="notarytool"/>
-                <arg value="submit"/>
-                <arg value="--wait"/>
-                <arg value="--apple-id"/>
-                <arg value="${notarize.account}"/>
-		<arg value="--team-id"/> 
-	        <arg value="${sign.account}"/>
-                <arg value="--password"/>
-                <arg value="${notarize.keychain_key}"/>
-                <arg value="--team-id"/>
-                <arg value="${sign.account}"/>
-                <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
-            </exec>
-            <loadfile property="retUUID" srcfile="retUUID.txt">
-                <filterchain>
-                    <tokenfilter>
-                        <containsregex
-                             pattern="RequestUUID\s*\=\s*([0-9a-fA-F-]+)$"
-                             replace="\1" />
-                    </tokenfilter>
-                    <striplinebreaks/>
-                </filterchain>
-            </loadfile>
-            <echo>notarize-app:${retUUID}</echo>
-        </target>
-=======
     <target name="zip-submit-notary" if="sign.enable">
         <exec executable="/usr/bin/xcrun" failonerror="true"
               outputproperty="zipUUID.txt">
@@ -2153,8 +2123,8 @@
             </filterchain>
         </loadfile>
         <echo>notarize-zip-app:${zipUUID}</echo>
+        </sequential>
     </target>
->>>>>>> 533cade correct regex for new output
 
     <!-- Staple the received notarization to the app -->
     <!-- run this after notarization is completed -->

From 8a7ec91f25926aacd07692ac4b271a0230d85f0a Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 28 May 2024 08:30:32 -0500
Subject: [PATCH 15/17] remove old altool option

---
 build.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index cb328ea8..c1012daf 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,6 @@
     <!-- MAC notary: -->
     <property name="notarize.account" value="${env.NOTARY_USER}" />
     <property name="notarize.keychain_key" value="${env.NOTARY_KEY}" />
-    <property name="notarize.altool" value="" />
 
     <!-- Get HDFView, HDF4, HDF5 and HDF-Java version information -->
     <loadfile property="app.version" srcFile="${basedir}/VERSION">
@@ -1789,10 +1788,13 @@
             <arg value="${ant.project.name}-${app.version}.dmg" />
         </exec>
 
-        <antcall target="submit-notary${notarize.altool}" />
+        <echo message="xxxx Notarize dmg xxxx"/>
+        <antcall target="submit-notary" />
 
-        <antcall target="post-notary${notarize.altool}" />
+        <echo message="xxxx Get notary ID xxxx"/>
+        <antcall target="post-notary" />
 
+        <echo message="xxxx Staple notary ID xxxx"/>
         <antcall target="staple-notary" />
 
         <echo message="xxxx Package the mac dmg binary xxxx"/>
@@ -2094,6 +2096,7 @@
             <arg value="${ant.project.name}-${app.version}.dmg"/>
         </exec>
     </target>
+
     <target name="zip-submit-notary" if="sign.enable">
         <exec executable="/usr/bin/xcrun" failonerror="true"
               outputproperty="zipUUID.txt">
@@ -2229,9 +2232,9 @@
             <arg value="${ant.project.name}-${app.version}.zip" />
         </exec>
 
-        <antcall target="zip-submit-notary${notarize.altool}" />
+        <antcall target="zip-submit-notary" />
 
-        <antcall target="post-notary${notarize.altool}" />
+        <antcall target="post-notary" />
 
         <antcall target="zip-staple-notary" />
 

From cd4c98e7df52718b692bafd1a3f4711ffd2cfe2b Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 28 May 2024 09:44:55 -0500
Subject: [PATCH 16/17] Use resource

---
 build.xml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/build.xml b/build.xml
index c1012daf..8bc87cce 100644
--- a/build.xml
+++ b/build.xml
@@ -2033,7 +2033,7 @@
             <arg value="--apple-id"/>
             <arg value="${notarize.account}"/>
             <arg value="--team-id"/> 
-	    <arg value="${sign.account}"/>
+            <arg value="${sign.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
             <arg value="--team-id"/>
@@ -2041,19 +2041,17 @@
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
         </exec>
         <echo>notarize-app output:${retUUID.txt}</echo>
-        <sequential>
-        <echo message="@{retUUID.txt}" file="retUUID.txt.file" />
-        <loadfile property="retUUID" srcfile="retUUID.txt.file">
+        <loadresource property="retUUID">
+            <concat>${retUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <containsregex
-                         pattern="id:\s*([0-9a-fA-F-]+)$"
+                    <replaceregex
+                         pattern="id:\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
-        </loadfile>
-        </sequential>
+        </loadresource>
         <echo>notarize-app:${retUUID}</echo>
     </target>
 
@@ -2064,8 +2062,8 @@
             <arg value="info"/>
             <arg value="--apple-id"/>
             <arg value="${notarize.account}"/>
-	    <arg value="--team-id"/> 
-	    <arg value="${sign.account}"/>
+            <arg value="--team-id"/> 
+            <arg value="${sign.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
             <arg value="--team-id"/>
@@ -2112,20 +2110,18 @@
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
         </exec>
         <echo>notarize-zip-app:${zipUUID.txt}</echo>
-        <sequential>
-        <echo message="@{zipUUID.txt}" file="zipUUID.txt.file" />
-        <loadfile property="zipUUID" srcfile="zipUUID.txt.file">
+        <loadresource property="zipUUID">
+            <concat>${zipUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <containsregex
-                        pattern="id:\s*([0-9a-fA-F-]+)$"
+                    <replaceregex
+                        pattern="id:\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
-        </loadfile>
+        </loadresource>
         <echo>notarize-zip-app:${zipUUID}</echo>
-        </sequential>
     </target>
 
     <!-- Staple the received notarization to the app -->

From 7ed943c31ad4e6102ccab13e96160f1a61f7f5cc Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 28 May 2024 09:56:31 -0500
Subject: [PATCH 17/17] Change search

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 8bc87cce..aff9fa7c 100644
--- a/build.xml
+++ b/build.xml
@@ -2046,7 +2046,7 @@
             <filterchain>
                 <tokenfilter>
                     <replaceregex
-                         pattern="id:\s*([0-9a-fA-F\-]+)$"
+                         pattern="Processing complete\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
@@ -2115,7 +2115,7 @@
             <filterchain>
                 <tokenfilter>
                     <replaceregex
-                        pattern="id:\s*([0-9a-fA-F\-]+)$"
+                        pattern="Processing complete\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>