Merge branch 'master' into installer

3 files changed, 19 insertions, 3 deletions

diff --git a/core/modules/qemu/module.build b/core/modules/qemu/module.build
index d2ccb921..6a980dd9 100644
--- a/core/modules/qemu/module.build
+++ b/core/modules/qemu/module.build
@@ -14,7 +14,7 @@ build() {
 	mvn -f "${build_dir}" clean package || perror "Could not build runvirt-plugin-qemu with Maven!"
 
 	# install qemu runvirt plugin
-	local build_artifact_filename="runvirt-plugin-qemu-1.0-SNAPSHOT.jar"
+	local build_artifact_filename="runvirt-plugin-qemu-1.0-SNAPSHOT-jar-with-dependencies.jar"
 	local install_dir="${MODULE_BUILD_DIR}/opt/openslx/vmchooser/plugins/qemu"
 	local install_filename="runvirt-plugin-qemu.jar"
 	mkdir -p "${install_dir}"
diff --git a/core/modules/qemu/runvirt-plugin-qemu/pom.xml b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
index 36f62796..9450ef81 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/pom.xml
+++ b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
@@ -126,6 +126,11 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
+        <configuration>
+          <source>${maven.compiler.source}</source>
+          <target>${maven.compiler.target}</target>
+          <compilerArgument>-Xlint:all</compilerArgument>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -136,6 +141,16 @@
         <version>2.22.1</version>
       </plugin>
       <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
index 5ea7b720..c9d47f5e 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
@@ -113,7 +113,8 @@ public class App
 		try {
 			final File xmlInputFile = new File( xmlInputFileName );
 			config = new Domain( xmlInputFile );
-		} catch ( LibvirtXmlDocumentException | LibvirtXmlSerializationException | LibvirtXmlValidationException e ) {
+		} catch ( NullPointerException | LibvirtXmlDocumentException | LibvirtXmlSerializationException
+				| LibvirtXmlValidationException e ) {
 			LOGGER.error( "Failed to read VM input configuration file: " + e.getLocalizedMessage() );
 			hypervisor.close();
 			System.exit( 3 );
@@ -159,7 +160,7 @@ public class App
 			try {
 				final File xmlOutputFile = new File( xmlOutputFileName );
 				config.toXml( xmlOutputFile );
-			} catch ( LibvirtXmlSerializationException e ) {
+			} catch ( NullPointerException | LibvirtXmlSerializationException e ) {
 				LOGGER.error( "Failed to write VM output configuration file: " + e.getLocalizedMessage() );
 				hypervisor.close();
 				System.exit( 5 );