Corrected argument escaping

a-schild · Apr 12, 2021 · 155db46 · 155db46
1 parent 6b77c54
commit 155db46
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 40 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,8 @@
 # JAVE2
 
 ## Changelog
+- **3.1.1**
+   - Modified quoting for command line arguments
 - **3.1.0**
    - Added support for arm32 bit (Thanks to jmformenti)
    - Added option to use a specific quote character for command line

diff --git a/jave-all-deps/pom.xml b/jave-all-deps/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ws.schild</groupId>
 	<packaging>jar</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.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 
@@ -154,42 +154,42 @@
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-win32</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-win64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux32</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-osx64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux-arm32</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux-arm64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win32</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-win64</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux64</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-osx64</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.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
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ws.schild</groupId>
 	<packaging>jar</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1</version>
 	<artifactId>jave-core-test</artifactId>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -40,32 +40,32 @@
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-win32</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-win64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux32</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-linux64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ws.schild</groupId>
 			<artifactId>jave-nativebin-osx64</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
 		<dependency>

diff --git a/jave-core-test/src/test/java/ws/schild/jave/filters/VideoFilterTest.java b/jave-core-test/src/test/java/ws/schild/jave/filters/VideoFilterTest.java
@@ -154,19 +154,19 @@ public void testOverlayWatermarkExpression() {
     }
     OverlayWatermark checkMe = new OverlayWatermark(fooPng, OverlayLocation.BOTTOM_RIGHT, -10, -10);
     assertEquals(
-        "movie=\""
+        "movie=\'"
             + fooPath
-            + "\"[watermark];[0:v][watermark]overlay=\"main_w-overlay_w-10:main_h-overlay_h-10\"",
+            + "\'[watermark];[0:v][watermark]overlay=\'main_w-overlay_w-10:main_h-overlay_h-10\'",
         checkMe.getExpression());
 
     checkMe = new OverlayWatermark(fooPng, OverlayLocation.TOP_LEFT, null, null);
     assertEquals(
-        "movie=\"" + fooPath + "\"[watermark];[0:v][watermark]overlay=\"0:0\"",
+        "movie=\'" + fooPath + "\'[watermark];[0:v][watermark]overlay=\'0:0\'",
         checkMe.getExpression());
 
     checkMe = new OverlayWatermark(fooPng, OverlayLocation.TOP_RIGHT, null, 10);
     assertEquals(
-        "movie=\"" + fooPath + "\"[watermark];[0:v][watermark]overlay=\"main_w-overlay_w:10\"",
+        "movie=\'" + fooPath + "\'[watermark];[0:v][watermark]overlay=\'main_w-overlay_w:10\'",
         checkMe.getExpression());
   }
 

diff --git a/jave-core/pom.xml b/jave-core/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>ws.schild</groupId>
 	<artifactId>jave-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.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-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>3.1.1-SNAPSHOT</version>
+    <version>3.1.1</version>
     <artifactId>jave-example</artifactId>
     <properties>
         <maven.compiler.source>12</maven.compiler.source>
@@ -66,12 +66,12 @@
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-core</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <dependency>
             <groupId>ws.schild</groupId>
             <artifactId>jave-nativebin-linux32</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1</version>
         </dependency>    
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
         <dependency>

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

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

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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.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>3.1.1-SNAPSHOT</revision>
+        <revision>3.1.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>3.1.1-SNAPSHOT</version>
+    <version>3.1.1</version>
     <name>Jave master project</name>
     <description>Jave master project</description>
     <url>https://github.com/a-schild/jave2</url>