Skip to content

Commit ab43d17

Browse files
a-schilda-schild
committed
Updated maven build environment
Updated tests Release 3.4.0
1 parent 02da387 commit ab43d17

File tree

26 files changed

+334
-305
lines changed

26 files changed

+334
-305
lines changed

‎Changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
## Changelog
44
- **3.4.0**
55
- Added PresetEnum to API
6+
- Added quit encoding to api, thanks to sam80180
7+
- Added module name for java 9+ compatibility, thanks to Stickerifier
8+
- Use proper class for semaphore, thanks to leeychee
9+
- Updated maven build environment
610
- **3.3.1**
711
- Fixed naming of binary for OSX M1 platform
812
- Windows 64bit + 32bit binary on 4.4.1 too

‎README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ see the JAVE manual for details.
2121

2222
| Operating System | Windows x32,x64 | MacOS x64 | MacOS m1 | Linux x32,x64 | Linux arm32,arm64 |
2323
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
24-
| Supported? | YES | YES | YES | YES | YES |
24+
| Supported? | YES | Partial,YES | YES | YES | YES |
2525

2626
Please note that the arm+win 32 bit versions are still on 4.4.0
27+
The win32 binaries will be removed in the next release
2728

2829
## Projects using Jave2
2930
* [XR3Player](https://github.com/goxr3plus/XR3Player)
@@ -50,7 +51,7 @@ It includes all binaries for the supported platforms
5051
<dependency>
5152
<groupId>ws.schild</groupId>
5253
<artifactId>jave-all-deps</artifactId>
53-
<version>3.3.1</version>
54+
<version>3.4.0</version>
5455
</dependency>
5556
```
5657

@@ -64,7 +65,7 @@ Include the following in your pom files.
6465
<dependency>
6566
<groupId>ws.schild</groupId>
6667
<artifactId>jave-core</artifactId>
67-
<version>3.3.1</version>
68+
<version>3.4.0</version>
6869
</dependency>
6970
```
7071

@@ -75,7 +76,7 @@ and then the specific jar(s) for your platform(s) :
7576
<dependency>
7677
<groupId>ws.schild</groupId>
7778
<artifactId>jave-nativebin-linux64</artifactId>
78-
<version>3.3.1</version>
79+
<version>3.4.0</version>
7980
</dependency>
8081
```
8182

@@ -84,7 +85,7 @@ and then the specific jar(s) for your platform(s) :
8485
<dependency>
8586
<groupId>ws.schild</groupId>
8687
<artifactId>jave-nativebin-linux-arm64</artifactId>
87-
<version>3.3.1</version>
88+
<version>3.4.0</version>
8889
</dependency>
8990
```
9091

@@ -93,7 +94,7 @@ and then the specific jar(s) for your platform(s) :
9394
<dependency>
9495
<groupId>ws.schild</groupId>
9596
<artifactId>jave-nativebin-linux-arm32</artifactId>
96-
<version>3.3.1</version>
97+
<version>3.4.0</version>
9798
</dependency>
9899
```
99100

@@ -102,7 +103,7 @@ and then the specific jar(s) for your platform(s) :
102103
<dependency>
103104
<groupId>ws.schild</groupId>
104105
<artifactId>jave-nativebin-win64</artifactId>
105-
<version>3.3.1</version>
106+
<version>3.4.0</version>
106107
</dependency>
107108
```
108109

@@ -111,7 +112,7 @@ and then the specific jar(s) for your platform(s) :
111112
<dependency>
112113
<groupId>ws.schild</groupId>
113114
<artifactId>jave-nativebin-osx64</artifactId>
114-
<version>3.3.1</version>
115+
<version>3.4.0</version>
115116
</dependency>
116117
```
117118

@@ -120,13 +121,13 @@ and then the specific jar(s) for your platform(s) :
120121
It includes all binaries for the supported platforms
121122

122123
``` XML
123-
compile group: 'ws.schild', name: 'jave-all-deps', version: '3.3.1'
124+
compile group: 'ws.schild', name: 'jave-all-deps', version: '3.4.0'
124125
```
125126

126127
### For one platform only (Linux 64Bit in this case)
127128
``` XML
128-
compile group: 'ws.schild', name: 'jave-core', version: '3.3.1'
129-
compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.3.1'
129+
compile group: 'ws.schild', name: 'jave-core', version: '3.4.0'
130+
compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.4.0'
130131
```
131132

132133
### Main Components of Jave2

‎jave-all-deps/pom.xml

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ws.schild</groupId>
77
<packaging>jar</packaging>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
<artifactId>jave-all-deps</artifactId>
1010
<name>Jave all native dependencies package</name>
1111
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
@@ -35,16 +35,16 @@
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
<maven.compiler.target>1.8</maven.compiler.target>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
39-
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
40-
<maven-deploy-plugin.version>3.0.1-M1</maven-deploy-plugin.version>
38+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
39+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
40+
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
4141
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
42-
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
43-
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
44-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
45-
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
46-
<maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
47-
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
42+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
43+
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
44+
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
45+
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
46+
<maven-scm-provider-gitexe.version>2.0.1</maven-scm-provider-gitexe.version>
47+
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
4848
</properties>
4949

5050
<build>
@@ -154,47 +154,47 @@
154154
<dependency>
155155
<groupId>ws.schild</groupId>
156156
<artifactId>jave-core</artifactId>
157-
<version>3.3.1</version>
157+
<version>3.4.0</version>
158158
</dependency>
159159
<dependency>
160160
<groupId>ws.schild</groupId>
161161
<artifactId>jave-nativebin-win32</artifactId>
162-
<version>3.3.1</version>
162+
<version>3.4.0</version>
163163
</dependency>
164164
<dependency>
165165
<groupId>ws.schild</groupId>
166166
<artifactId>jave-nativebin-win64</artifactId>
167-
<version>3.3.1</version>
167+
<version>3.4.0</version>
168168
</dependency>
169169
<dependency>
170170
<groupId>ws.schild</groupId>
171171
<artifactId>jave-nativebin-linux32</artifactId>
172-
<version>3.3.1</version>
172+
<version>3.4.0</version>
173173
</dependency>
174174
<dependency>
175175
<groupId>ws.schild</groupId>
176176
<artifactId>jave-nativebin-linux64</artifactId>
177-
<version>3.3.1</version>
177+
<version>3.4.0</version>
178178
</dependency>
179179
<dependency>
180180
<groupId>ws.schild</groupId>
181181
<artifactId>jave-nativebin-osx64</artifactId>
182-
<version>3.3.1</version>
182+
<version>3.4.0</version>
183183
</dependency>
184184
<dependency>
185185
<groupId>ws.schild</groupId>
186186
<artifactId>jave-nativebin-osxm1</artifactId>
187-
<version>3.3.1</version>
187+
<version>3.4.0</version>
188188
</dependency>
189189
<dependency>
190190
<groupId>ws.schild</groupId>
191191
<artifactId>jave-nativebin-linux-arm32</artifactId>
192-
<version>3.3.1</version>
192+
<version>3.4.0</version>
193193
</dependency>
194194
<dependency>
195195
<groupId>ws.schild</groupId>
196196
<artifactId>jave-nativebin-linux-arm64</artifactId>
197-
<version>3.3.1</version>
197+
<version>3.4.0</version>
198198
</dependency>
199199
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
200200
<dependency>

‎jave-core-test-java11/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>ws.schild</groupId>
55
<packaging>jar</packaging>
6-
<version>3.3.1</version>
6+
<version>3.4.0</version>
77
<artifactId>jave-core-test-java11</artifactId>
88
<properties>
99
<maven.compiler.source>11</maven.compiler.source>
1010
<maven.compiler.target>11</maven.compiler.target>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
13-
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
14-
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
12+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
13+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
14+
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
1515
<slf4j-simple.version>1.7.26</slf4j-simple.version>
1616
</properties>
1717
<build>
@@ -38,32 +38,32 @@
3838
<dependency>
3939
<groupId>ws.schild</groupId>
4040
<artifactId>jave-core</artifactId>
41-
<version>3.3.1</version>
41+
<version>3.4.0</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>ws.schild</groupId>
4545
<artifactId>jave-nativebin-win32</artifactId>
46-
<version>3.3.1</version>
46+
<version>3.4.0</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>ws.schild</groupId>
5050
<artifactId>jave-nativebin-win64</artifactId>
51-
<version>3.3.1</version>
51+
<version>3.4.0</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>ws.schild</groupId>
5555
<artifactId>jave-nativebin-linux32</artifactId>
56-
<version>3.3.1</version>
56+
<version>3.4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>ws.schild</groupId>
6060
<artifactId>jave-nativebin-linux64</artifactId>
61-
<version>3.3.1</version>
61+
<version>3.4.0</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>ws.schild</groupId>
6565
<artifactId>jave-nativebin-osx64</artifactId>
66-
<version>3.3.1</version>
66+
<version>3.4.0</version>
6767
</dependency>
6868
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
6969
<dependency>

‎jave-core-test/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ws.schild</groupId>
77
<packaging>jar</packaging>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
<artifactId>jave-core-test</artifactId>
1010
<properties>
1111
<maven.compiler.source>1.8</maven.compiler.source>
1212
<maven.compiler.target>1.8</maven.compiler.target>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
15-
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
16-
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
14+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
15+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
16+
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
1717
<slf4j-simple.version>1.7.26</slf4j-simple.version>
1818
</properties>
1919
<build>
@@ -40,32 +40,32 @@
4040
<dependency>
4141
<groupId>ws.schild</groupId>
4242
<artifactId>jave-core</artifactId>
43-
<version>3.3.1</version>
43+
<version>3.4.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>ws.schild</groupId>
4747
<artifactId>jave-nativebin-win32</artifactId>
48-
<version>3.3.1</version>
48+
<version>3.4.0</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>ws.schild</groupId>
5252
<artifactId>jave-nativebin-win64</artifactId>
53-
<version>3.3.1</version>
53+
<version>3.4.0</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>ws.schild</groupId>
5757
<artifactId>jave-nativebin-linux32</artifactId>
58-
<version>3.3.1</version>
58+
<version>3.4.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>ws.schild</groupId>
6262
<artifactId>jave-nativebin-linux64</artifactId>
63-
<version>3.3.1</version>
63+
<version>3.4.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>ws.schild</groupId>
6767
<artifactId>jave-nativebin-osx64</artifactId>
68-
<version>3.3.1</version>
68+
<version>3.4.0</version>
6969
</dependency>
7070
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
7171
<dependency>

‎jave-core-test/src/test/java/ws/schild/jave/ConcatEncoderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void testConcatVideo1() throws Exception {
7979
video.setComplexFiltergraph(complexFiltergraph);
8080
encoder.encode(src, target, attrs);
8181
assertTrue(target.exists(), "Output file missing");
82-
assertTrue(target.length() == 107384, "Output file incorrect size");
82+
assertTrue(target.length() == 107872, "Output file incorrect size, expecting 107872 bytes, got "+target.length());
8383
}
8484

8585
/**
@@ -126,7 +126,7 @@ public void testConcatVideo2() throws Exception {
126126

127127
encoder.encode(src, target, attrs);
128128
assertTrue(target.exists(), "Output file missing");
129-
assertTrue(target.length() == 1368738, "Output file incorrect size");
129+
assertTrue(target.length() == 1360228, "Output file incorrect size, expecting 1360228 bytes, got "+target.length());
130130
}
131131

132132
@Test
@@ -162,7 +162,7 @@ public void testContactAudio01() throws Exception {
162162
attributes.setVideoAttributes(video);
163163
encoder.encode(src, target, attributes);
164164
assertTrue(target.exists(), "Output file missing");
165-
assertTrue(target.length() == 20477182, "Output file incorrect size");
165+
assertTrue(target.length() == 20477182, "Output file incorrect size, expecting 20477182 bytes, got "+target.length());
166166
}
167167

168168
}

‎jave-core-test/src/test/java/ws/schild/jave/filters/ScaleFilterTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
package ws.schild.jave.filters;
77

88
import java.io.File;
9-
import static jdk.nashorn.internal.objects.NativeRegExp.source;
109
import static org.junit.jupiter.api.Assertions.assertTrue;
1110
import org.junit.jupiter.api.Test;
1211
import ws.schild.jave.AMediaTest;
1312
import ws.schild.jave.Encoder;
14-
import ws.schild.jave.EncoderException;
1513
import ws.schild.jave.MultimediaObject;
1614
import ws.schild.jave.encode.AudioAttributes;
1715
import ws.schild.jave.encode.EncodingAttributes;

‎jave-core-test/src/test/java/ws/schild/jave/filters/VideoFilterTest.java

+7
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,13 @@ public void thatTrimAndWatermarkFilterProducesCorrectFiltergraphs() throws Excep
223223
.collect(Collectors.toList());
224224
File fooPng = new File("foo.png");
225225
String fooPath = fooPng.getAbsolutePath();
226+
// Check for windows path
227+
String os = System.getProperty("os.name").toLowerCase();
228+
boolean isWindows = os.contains("windows");
229+
if (isWindows) {
230+
fooPath= fooPath.replace("\\", "\\\\");
231+
fooPath= fooPath.replace(":", "\\:");
232+
}
226233

227234
assertEquals(
228235
"[0]trim='duration=1.0:start=0.5',setpts='PTS-STARTPTS'[filtered0];"

0 commit comments

Comments
 (0)