diff --git a/Changelog.md b/Changelog.md index 2b075a8..4a2c9ee 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,8 @@ # JAVE2 ## Changelog +- **3.0.1** + - Fixed a class loader issue when using it in spring boot environments - **3.0.0** - Reworked base classes to handle the executable (Thanks to Michael Ressler) - Reworked the API to have a fluent and more flexible api (Thanks to Michael Ressler) diff --git a/jave-all-deps/pom.xml b/jave-all-deps/pom.xml index da49391..842883c 100644 --- a/jave-all-deps/pom.xml +++ b/jave-all-deps/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-all-deps Jave all native dependencies package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -37,7 +37,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 @@ -154,32 +154,32 @@ ws.schild jave-core - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-osx64 - 3.0.0 + 3.0.1 diff --git a/jave-core-test-java11/pom.xml b/jave-core-test-java11/pom.xml index 5254a56..76fab9d 100644 --- a/jave-core-test-java11/pom.xml +++ b/jave-core-test-java11/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-core-test-java11 11 @@ -38,32 +38,32 @@ ws.schild jave-core - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-osx64 - 3.0.0 + 3.0.1 diff --git a/jave-core-test/pom.xml b/jave-core-test/pom.xml index 44936b0..6f92d65 100644 --- a/jave-core-test/pom.xml +++ b/jave-core-test/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-core-test 1.8 @@ -40,32 +40,32 @@ ws.schild jave-core - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-win64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux32 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux64 - 3.0.0 + 3.0.1 ws.schild jave-nativebin-osx64 - 3.0.0 + 3.0.1 diff --git a/jave-core/pom.xml b/jave-core/pom.xml index 50980b4..fe8b710 100644 --- a/jave-core/pom.xml +++ b/jave-core/pom.xml @@ -6,7 +6,7 @@ ws.schild jave-core jar - 3.0.0 + 3.0.1 Jave core package The JAVE (Java Audio Video Encoder) library is Java wrapper on the ffmpeg project. Developers can take take advantage of JAVE2 to transcode @@ -43,7 +43,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-core/src/main/java/ws/schild/jave/process/ffmpeg/DefaultFFMPEGLocator.java b/jave-core/src/main/java/ws/schild/jave/process/ffmpeg/DefaultFFMPEGLocator.java index 5657a48..8162f9a 100644 --- a/jave-core/src/main/java/ws/schild/jave/process/ffmpeg/DefaultFFMPEGLocator.java +++ b/jave-core/src/main/java/ws/schild/jave/process/ffmpeg/DefaultFFMPEGLocator.java @@ -91,7 +91,14 @@ public DefaultFFMPEGLocator() { // Everything seems okay path = ffmpegFile.getAbsolutePath(); - LOG.debug("ffmpeg executable found: {}", path); + if (ffmpegFile.exists()) + { + LOG.debug("ffmpeg executable found: {}", path); + } + else + { + LOG.error("ffmpeg executable NOT found: {}", path); + } } @Override @@ -120,6 +127,17 @@ private void copyFile(String path, File dest) { dest.getAbsolutePath()); is = ClassLoader.getSystemResourceAsStream(resourceName); } + if (is == null) { + // Use this for spring boot with different class loaders + resourceName = "ws/schild/jave/nativebin/" + path; + LOG.debug( + "Alternative copy from Thread.currentThread().getContextClassLoader() <{}> to target <{}>", + resourceName, + dest.getAbsolutePath()); + ClassLoader classloader = Thread.currentThread().getContextClassLoader(); + is = classloader.getResourceAsStream(resourceName); + } + if (is != null) { if (copy(is, dest.getAbsolutePath())) { if (dest.exists()) { diff --git a/jave-example/pom.xml b/jave-example/pom.xml index 4320573..c9bbf10 100644 --- a/jave-example/pom.xml +++ b/jave-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-example 12 @@ -66,12 +66,12 @@ ws.schild jave-core - 3.0.0 + 3.0.1 ws.schild jave-nativebin-linux32 - 3.0.0 + 3.0.1 diff --git a/jave-nativebin-arm64/pom.xml b/jave-nativebin-arm64/pom.xml index dc4e619..38ab4bd 100644 --- a/jave-nativebin-arm64/pom.xml +++ b/jave-nativebin-arm64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-linux-arm64 Jave linux arm 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-nativebin-linux32/pom.xml b/jave-nativebin-linux32/pom.xml index d1d140c..d9b3c4a 100644 --- a/jave-nativebin-linux32/pom.xml +++ b/jave-nativebin-linux32/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-linux32 Jave linux 32 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-nativebin-linux64/pom.xml b/jave-nativebin-linux64/pom.xml index 2a54a2b..cc2e27b 100644 --- a/jave-nativebin-linux64/pom.xml +++ b/jave-nativebin-linux64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-linux64 Jave linux 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-nativebin-osx64/pom.xml b/jave-nativebin-osx64/pom.xml index 4cb4ac1..a4aad45 100644 --- a/jave-nativebin-osx64/pom.xml +++ b/jave-nativebin-osx64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-osx64 Jave OSX 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-nativebin-win32/pom.xml b/jave-nativebin-win32/pom.xml index 7d6211f..a8dea00 100644 --- a/jave-nativebin-win32/pom.xml +++ b/jave-nativebin-win32/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-win32 Jave windows 32 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/jave-nativebin-win64/pom.xml b/jave-nativebin-win64/pom.xml index a23df1d..9fb88ed 100644 --- a/jave-nativebin-win64/pom.xml +++ b/jave-nativebin-win64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.0.0 + 3.0.1 jave-nativebin-win64 Jave windows 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -35,7 +35,7 @@ UTF-8 3.8.1 3.1.0 - 3.0.0-M1 + 3.0.1-M1 2.5.3 3.1.0 3.1.0 diff --git a/pom.xml b/pom.xml index b56dadc..2ec3c4f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ jave-modules pom - 3.0.0 + 3.0.1 1.8 1.8 UTF-8 - 3.0.0 + 3.0.1 Jave master project Jave master project https://github.com/a-schild/jave2