Publish 2.5.1 release

a-schild · Jul 16, 2019 · 5a68dc8 · 5a68dc8
1 parent 1be1bb0
commit 5a68dc8
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 43 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,12 +1,12 @@
 # JAVE2
 
 ## Changelog
-- **2.5.1-SNAPSHOT** 
-   - Prepare for next dev cycle
+- **2.5.1** 
    - Renamed native folder where the executables are to nativebin too, to prevent Java 9+ problems
    - Allow to create a MultimediaObject with an URL instead of a file as conversion source
    - Enhanced logging when ffmpeg executable could not be found in resources
    - Make getFFMPEGExecutablePath() public to see what executable is beeing used
+   - Use alternative way to locate executables in jar file for Java 9+
 - **2.5.0** 
    - Prepare for next dev cycle
    - Renamed build artifacts with native in the name to nativebin to avoid module conflicts in Java 9+

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ It includes all binaries for the supported platforms
 <dependency>
  <groupId>ws.schild</groupId>
  <artifactId>jave-all-deps</artifactId>
- <version>2.5.0</version>
+ <version>2.5.1</version>
 </dependency>
 ```
 
@@ -59,7 +59,7 @@ Generally if you want to use for one platform or more what you have to do is add
 <dependency>
     <groupId>ws.schild</groupId>
     <artifactId>jave-core</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ and then the specific jar(s) for your platform(s) :
 <dependency>
     <groupId>ws.schild</groupId>
     <artifactId>jave-nativebin-linux64</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
 </dependency>
 ```
 
@@ -79,7 +79,7 @@ and then the specific jar(s) for your platform(s) :
 <dependency>
     <groupId>ws.schild</groupId>
     <artifactId>jave-nativebin-win64</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
 </dependency>
 ```
 
@@ -88,7 +88,7 @@ and then the specific jar(s) for your platform(s) :
 <dependency>
     <groupId>ws.schild</groupId>
     <artifactId>jave-nativebin-osx64</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
 </dependency>
 ```
 
@@ -97,13 +97,13 @@ and then the specific jar(s) for your platform(s) :
 It includes all binaries for the supported platforms
 
 ``` XML
-compile group: 'ws.schild', name: 'jave-all-deps', version: '2.5.0'
+compile group: 'ws.schild', name: 'jave-all-deps', version: '2.5.1'
 ```
 
 ### For one platform only (Linux 64Bit in this case)
 ``` XML
-compile group: 'ws.schild', name: 'jave-core', version: '2.5.0'
-compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '2.5.0'
+compile group: 'ws.schild', name: 'jave-core', version: '2.5.1'
+compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '2.5.1'
 ```
 
 ### Main Components of Jave2

diff --git a/jave-all-deps/pom.xml b/jave-all-deps/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-all-deps</artifactId>
        <name>Jave all native dependencies package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 
@@ -152,32 +152,32 @@
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-core</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-osx64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>

diff --git a/jave-core-test-java11/pom.xml b/jave-core-test-java11/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-core-test-java11</artifactId>
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
@@ -38,32 +38,32 @@
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-core</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-osx64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>

diff --git a/jave-core-test/pom.xml b/jave-core-test/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-core-test</artifactId>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -38,32 +38,32 @@
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-core</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-osx64</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>

diff --git a/jave-core/pom.xml b/jave-core/pom.xml
@@ -4,7 +4,7 @@
     <groupId>ws.schild</groupId>
     <artifactId>jave-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <name>Jave core package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 
         ffmpeg project. Developers can take take advantage of JAVE2 to transcode 

diff --git a/jave-core/src/main/java/ws/schild/jave/DefaultFFMPEGLocator.java b/jave-core/src/main/java/ws/schild/jave/DefaultFFMPEGLocator.java
@@ -43,7 +43,7 @@ public class DefaultFFMPEGLocator extends FFMPEGLocator {
      * Trace the version of the bundled ffmpeg executable. It's a counter: every
      * time the bundled ffmpeg change it is incremented by 1.
      */
-    private static final String MY_EXE_VERSION = "2.5.1-SNAPSHOT";
+    private static final String MY_EXE_VERSION = "2.5.1";
 
     /**
      * The ffmpeg executable file path.

diff --git a/jave-example/pom.xml b/jave-example/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-example</artifactId>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -66,12 +66,12 @@
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-core</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.1</version>
         </dependency>    
         <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
         <dependency>

diff --git a/jave-nativebin-linux32/pom.xml b/jave-nativebin-linux32/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-nativebin-linux32</artifactId>
     <name>Jave linux 32 bit native package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 

diff --git a/jave-nativebin-linux64/pom.xml b/jave-nativebin-linux64/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-nativebin-linux64</artifactId>
     <name>Jave linux 64 bit native package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 

diff --git a/jave-nativebin-osx64/pom.xml b/jave-nativebin-osx64/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-nativebin-osx64</artifactId>
     <name>Jave OSX 64 bit native package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 

diff --git a/jave-nativebin-win32/pom.xml b/jave-nativebin-win32/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-nativebin-win32</artifactId>
     <name>Jave windows 32 bit native package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 

diff --git a/jave-nativebin-win64/pom.xml b/jave-nativebin-win64/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ws.schild</groupId>
     <packaging>jar</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <artifactId>jave-nativebin-win64</artifactId>
     <name>Jave windows 64 bit native package</name>
     <description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the 

diff --git a/pom.xml b/pom.xml
@@ -4,14 +4,14 @@
     <artifactId>jave-modules</artifactId>
     <packaging>pom</packaging>
     <properties>
-        <revision>2.5.1-SNAPSHOT</revision>
+        <revision>2.5.1</revision>
         <!-- Don't forget to change it also in DefaultFFMPEGLocator.java  -->
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.5.1</version>
     <name>Jave master project</name>
     <description>Jave master project</description>
     <url>https://github.com/a-schild/jave2</url>