From 3ae34b4835dc1cd909f5651f6c7df509cf0c8bb4 Mon Sep 17 00:00:00 2001
From: Julius Vincent Babies <julius.babies@3m5.de>
Date: Wed, 26 Feb 2025 08:02:17 +0100
Subject: [PATCH 1/3] Replaced System Class Loader

---
 isoparser/pom.xml                                        | 9 ++++-----
 .../main/java/org/mp4parser/PropertyBoxParserImpl.java   | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/isoparser/pom.xml b/isoparser/pom.xml
index 3725b4c76..5634d5c20 100644
--- a/isoparser/pom.xml
+++ b/isoparser/pom.xml
@@ -1,13 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.mp4parser</groupId>
     <artifactId>isoparser</artifactId>
     <packaging>jar</packaging>
     <name>ISO Parser</name>
     <description>A generic parser and writer for all ISO 14496 based files (MP4, Quicktime, DCF, PDCF, ...)
     </description>
     <url>https://github.com/sannies/mp4parser</url>
-    <version>1.9.57-SNAPSHOT</version>
+    <version>1.9.58-SNAPSHOT</version>
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
@@ -116,19 +115,19 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.14.0</version>
             <scope>test</scope>
         </dependency>
        <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.13</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java
index 14980cf32..b6b0747fe 100644
--- a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java
+++ b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java
@@ -45,15 +45,14 @@ public PropertyBoxParserImpl(String... customProperties) {
         if (BOX_MAP_CACHE != null) {
             mapping = new Properties(BOX_MAP_CACHE);
         } else {
-            InputStream is = ClassLoader.getSystemResourceAsStream("isoparser2-default.properties");
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            if (cl == null) cl = ClassLoader.getSystemClassLoader();
+
+            InputStream is = cl.getResourceAsStream("isoparser2-default.properties");
             try {
                 mapping = new Properties();
                 try {
                     mapping.load(is);
-                    ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                    if (cl == null) {
-                        cl = ClassLoader.getSystemClassLoader();
-                    }
                     Enumeration<URL> enumeration = cl.getResources("isoparser-custom.properties");
 
                     while (enumeration.hasMoreElements()) {

From d12bf9fae883ad19f267540faefad19694220551 Mon Sep 17 00:00:00 2001
From: Julius Vincent Babies <julius.babies@3m5.de>
Date: Wed, 26 Feb 2025 08:07:48 +0100
Subject: [PATCH 2/3] Bumped up version

---
 isoparser/pom.xml | 2 +-
 muxer/pom.xml     | 6 +++---
 pom.xml           | 2 +-
 streaming/pom.xml | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/isoparser/pom.xml b/isoparser/pom.xml
index 5634d5c20..84517a06b 100644
--- a/isoparser/pom.xml
+++ b/isoparser/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.57-SNAPSHOT</version>
+        <version>1.9.58-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/muxer/pom.xml b/muxer/pom.xml
index 94ccb426a..ad837c281 100644
--- a/muxer/pom.xml
+++ b/muxer/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mp4parser</groupId>
-    <version>1.9.57-SNAPSHOT</version>
+    <version>1.9.58-SNAPSHOT</version>
     <artifactId>muxer</artifactId>
     <name>File Muxer</name>
     <url>https://github.com/sannies/mp4parser</url>
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.57-SNAPSHOT</version>
+        <version>1.9.58-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>isoparser</artifactId>
-            <version>1.9.57-SNAPSHOT</version>
+            <version>1.9.58-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index ca555f665..f5eb75e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.mp4parser</groupId>
     <artifactId>mp4parser-project</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.57-SNAPSHOT</version>
+    <version>1.9.58-SNAPSHOT</version>
     <name>MP4 Parser Project</name>
     <description>MP4 Parser Project (parent) </description>
     <developers>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index dc14f3fba..df1c2bd61 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mp4parser</groupId>
     <artifactId>streaming</artifactId>
-    <version>1.9.57-SNAPSHOT</version>
+    <version>1.9.58-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>isoparser</artifactId>
-            <version>1.9.57-SNAPSHOT</version>
+            <version>1.9.58-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>muxer</artifactId>
-            <version>1.9.57-SNAPSHOT</version>
+            <version>1.9.58-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -38,7 +38,7 @@
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.57-SNAPSHOT</version>
+        <version>1.9.58-SNAPSHOT</version>
     </parent>
     <profiles>
         <profile>

From 5624152c638c7935ec2e3c25e1874812e2a5b184 Mon Sep 17 00:00:00 2001
From: Julius Vincent Babies <julius@familie-babies.de>
Date: Thu, 27 Feb 2025 13:59:32 +0100
Subject: [PATCH 3/3] Revert build related changes

---
 isoparser/pom.xml | 11 ++++++-----
 muxer/pom.xml     |  6 +++---
 pom.xml           |  2 +-
 streaming/pom.xml |  8 ++++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/isoparser/pom.xml b/isoparser/pom.xml
index 84517a06b..3725b4c76 100644
--- a/isoparser/pom.xml
+++ b/isoparser/pom.xml
@@ -1,16 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mp4parser</groupId>
     <artifactId>isoparser</artifactId>
     <packaging>jar</packaging>
     <name>ISO Parser</name>
     <description>A generic parser and writer for all ISO 14496 based files (MP4, Quicktime, DCF, PDCF, ...)
     </description>
     <url>https://github.com/sannies/mp4parser</url>
-    <version>1.9.58-SNAPSHOT</version>
+    <version>1.9.57-SNAPSHOT</version>
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.58-SNAPSHOT</version>
+        <version>1.9.57-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -115,19 +116,19 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.12</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>2.5</version>
             <scope>test</scope>
         </dependency>
        <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.13</version>
+            <version>1.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/muxer/pom.xml b/muxer/pom.xml
index ad837c281..94ccb426a 100644
--- a/muxer/pom.xml
+++ b/muxer/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mp4parser</groupId>
-    <version>1.9.58-SNAPSHOT</version>
+    <version>1.9.57-SNAPSHOT</version>
     <artifactId>muxer</artifactId>
     <name>File Muxer</name>
     <url>https://github.com/sannies/mp4parser</url>
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.58-SNAPSHOT</version>
+        <version>1.9.57-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>isoparser</artifactId>
-            <version>1.9.58-SNAPSHOT</version>
+            <version>1.9.57-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index f5eb75e7f..ca555f665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.mp4parser</groupId>
     <artifactId>mp4parser-project</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.58-SNAPSHOT</version>
+    <version>1.9.57-SNAPSHOT</version>
     <name>MP4 Parser Project</name>
     <description>MP4 Parser Project (parent) </description>
     <developers>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index df1c2bd61..dc14f3fba 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mp4parser</groupId>
     <artifactId>streaming</artifactId>
-    <version>1.9.58-SNAPSHOT</version>
+    <version>1.9.57-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>isoparser</artifactId>
-            <version>1.9.58-SNAPSHOT</version>
+            <version>1.9.57-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.mp4parser</groupId>
             <artifactId>muxer</artifactId>
-            <version>1.9.58-SNAPSHOT</version>
+            <version>1.9.57-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -38,7 +38,7 @@
     <parent>
         <artifactId>mp4parser-project</artifactId>
         <groupId>org.mp4parser</groupId>
-        <version>1.9.58-SNAPSHOT</version>
+        <version>1.9.57-SNAPSHOT</version>
     </parent>
     <profiles>
         <profile>