Skip to content

Removed usage of System class Loader #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Julius-Babies wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removed usage of System class Loader #478

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae34b4
Replaced System Class Loader
Feb 26, 2025
d12bf9f
Bumped up version
Feb 26, 2025
5624152
Revert build related changes
Julius-Babies Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions isoparser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<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>
Comment thread
Julius-Babies marked this conversation as resolved.
<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>
Comment thread
Julius-Babies marked this conversation as resolved.
Outdated
<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>
Expand Down Expand Up @@ -116,19 +115,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
Comment thread
Julius-Babies marked this conversation as resolved.
Outdated
<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>
Expand Down
9 changes: 4 additions & 5 deletions isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
6 changes: 3 additions & 3 deletions muxer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions streaming/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down