Merge pull request #2 from nextbreakpoint/development

add automatic-module-name property to manifest

Author: nextbreakpoint

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016, Andrea Medeghini
+Copyright (c) 2016-2018, Andrea Medeghini
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -25,4 +25,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

README.md

@@ -1,4 +1,4 @@
-# FFmpeg4Java 3.1.1-1.0
+# FFmpeg4Java 3.1.1-1.1
 
 FFmpeg4Java provides a JNI wrapper of FFmpeg library version 3.1.1.
 
@@ -7,23 +7,23 @@ FFmpeg4Java provides a JNI wrapper of FFmpeg library version 3.1.1.
 
 FFmpeg4Java is distributed under the terms of BSD 3-Clause License.
 
-    Copyright (c) 2016, Andrea Medeghini
+    Copyright (c) 2016-2018, Andrea Medeghini
     All rights reserved.
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
-    
+
     * Redistributions of source code must retain the above copyright notice, this
         list of conditions and the following disclaimer.
-    
+
     * Redistributions in binary form must reproduce the above copyright notice,
         this list of conditions and the following disclaimer in the documentation
         and/or other materials provided with the distribution.
-    
+
     * Neither the name of FFmpeg4Java nor the names of its
         contributors may be used to endorse or promote products derived from
         this software without specific prior written permission.
-    
+
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -133,7 +133,7 @@ The native library will be created in directory:
     build/com.nextbreakpoint.ffmpeg4java/src/main/resources/win32
 
 
-## Create and install artifacts 
+## Create and install artifacts
 
 We use Apache Maven to compile and package the artifacts.
 
@@ -176,4 +176,3 @@ Run tests on Windows:
 ## TODO
 
 - Add sample application to show how to use the library
-

maven/com.nextbreakpoint.ffmpeg4java/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.nextbreakpoint</groupId>
 	<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
-	<version>3.1.1-1.0</version>
+	<version>3.1.1-1.1</version>
 	<packaging>jar</packaging>
 	<name>FFmpeg4Java</name>
 	<description>FFmpeg4Java provides a JNI wrapper of FFmpeg library</description>
@@ -68,25 +68,45 @@
 			<plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-jar-plugin</artifactId>
-		        <version>3.0.2</version>
-	            <configuration>
-	              	<includes>
-	            		<include>**/*.class</include>
-	              	</includes>
-	            </configuration>
+		        <version>3.1.0</version>
 		        <executions>
+							<execution>
+			        	<id>jar</id>
+			            <phase>package</phase>
+			            <goals>
+			            	<goal>jar</goal>
+			            </goals>
+			            <configuration>
+											<archive>
+									      <manifestEntries>
+									        <Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java</Automatic-Module-Name>
+									      </manifestEntries>
+									    </archive>
+											<classifier>classes</classifier>
+			              	<excludes>
+			              	</excludes>
+			              	<includes>
+												<include>**/*.class</include>
+			              	</includes>
+			            </configuration>
+			        </execution>
 			        <execution>
 			        	<id>linux</id>
 			            <phase>package</phase>
 			            <goals>
 			            	<goal>jar</goal>
 			            </goals>
 			            <configuration>
+											<archive>
+												<manifestEntries>
+													<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.linux</Automatic-Module-Name>
+												</manifestEntries>
+											</archive>
 			              	<classifier>linux_x86_64</classifier>
 			              	<excludes>
 			              	</excludes>
 			              	<includes>
-			            		<include>**/linux/*</include>
+			            			<include>**/linux/*</include>
 			              	</includes>
 			            </configuration>
 			        </execution>
@@ -97,11 +117,16 @@
 			            	<goal>jar</goal>
 			            </goals>
 			            <configuration>
+											<archive>
+												<manifestEntries>
+													<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.macos</Automatic-Module-Name>
+												</manifestEntries>
+											</archive>
 			              	<classifier>macos_x86_64</classifier>
 			              	<excludes>
 			              	</excludes>
 			              	<includes>
-			            		<include>**/macos/*</include>
+			            			<include>**/macos/*</include>
 			              	</includes>
 			            </configuration>
 		          	</execution>
@@ -112,11 +137,16 @@
 			            	<goal>jar</goal>
 			            </goals>
 			            <configuration>
+											<archive>
+												<manifestEntries>
+													<Automatic-Module-Name>com.nextbreakpoint.ffmpeg4java.win32</Automatic-Module-Name>
+												</manifestEntries>
+											</archive>
 			              	<classifier>win32_x86_64</classifier>
 			              	<excludes>
 			              	</excludes>
 			              	<includes>
-			            		<include>**/win32/*</include>
+			            			<include>**/win32/*</include>
 			              	</includes>
 			            </configuration>
 		          	</execution>
@@ -138,7 +168,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -251,4 +281,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>