From c99db71fc7d843226612f1617dac1faff91ceacc Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Fri, 22 Nov 2024 10:01:46 +0100
Subject: [PATCH 1/2] Issue #422: Exclude release-related marker files from
 source distributions

- Exclude release profile marker files from release source ZIP
- Exclude release profile marker files from GitHub ZIP
---
 .gitattributes            | 3 +++
 src/main/assembly/src.xml | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index e708bb192e..18d6a85cc6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,3 +18,6 @@
 #   The internal repo form for these is always lf, 
 #   The eol=lf means on check-out do nothing, and on check-in, if the file has crlf, convert to lf
 *.sh text eol=lf
+
+marker-file-enabling-auto-staging export-ignore
+marker-file-enabling-release-notes export-ignore
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 82ada158b0..e2dfc52f69 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -78,6 +78,13 @@ under the License.
         <exclude>**/checkpoint_synchPoint.xml</exclude>
         <exclude>**/checkpoint_synchPoint.xml.prev</exclude>
 
+        <!-- 
+          - Marker files enabling release-supporting profiles that expect a git repository and/or svn to be available
+          - and are therefore not suitable for use when building from the source archive.
+          -->
+        <exclude>**/marker-file-enabling-auto-staging</exclude>
+        <exclude>**/marker-file-enabling-release-notes</exclude>
+
         <!-- 
           File that seems to be temporarily placed into the CWD during the build but no idea where 
           it comes from. 

From 64d984eec0e661cd087f623fb45c7419e8d78a7e Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Fri, 22 Nov 2024 13:52:39 +0100
Subject: [PATCH 2/2] Issue #409: Update dependencies

- commons-io 2.17.0 -> 2.18.0
---
 uimaj-parent-internal/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uimaj-parent-internal/pom.xml b/uimaj-parent-internal/pom.xml
index e2c5b45ebf..2e575fd954 100644
--- a/uimaj-parent-internal/pom.xml
+++ b/uimaj-parent-internal/pom.xml
@@ -64,7 +64,7 @@
     <bytebuddy-version>1.15.10</bytebuddy-version>
     <commons-csv-version>1.12.0</commons-csv-version>
     <commons-collections4-version>4.4</commons-collections4-version>
-    <commons-io-version>2.17.0</commons-io-version>
+    <commons-io-version>2.18.0</commons-io-version>
     <commons-lang3-version>3.17.0</commons-lang3-version>
     <commons-math3-version>3.6.1</commons-math3-version>
     <jackson-version>2.18.1</jackson-version>