Merge branch 'issue-257' into devel

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java

@@ -147,13 +147,13 @@ protected File doApply(LinuxPackager packager) throws Exception {
 			javaSpawnHelperMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/lib");
 
 			File jSpawnHelperFile = new File(appFolder, jreDirectoryName + "/lib/jspawnhelper");
-
-			Data javaSpawnHelperData = new Data();
-			javaSpawnHelperData.setType("file");
-			javaSpawnHelperData.setSrc(jSpawnHelperFile);
-			javaSpawnHelperData.addMapper(javaSpawnHelperMapper);
-
-			dataProducers.add(javaSpawnHelperData);
+			if (jSpawnHelperFile.exists()) {
+				Data javaSpawnHelperData = new Data();
+				javaSpawnHelperData.setType("file");
+				javaSpawnHelperData.setSrc(jSpawnHelperFile);
+				javaSpawnHelperData.addMapper(javaSpawnHelperMapper);
+				dataProducers.add(javaSpawnHelperData);
+			}
 
 		}
 

src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

@@ -11,7 +11,6 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
 import org.apache.velocity.util.StringBuilderWriter;
@@ -31,14 +30,14 @@ private static VelocityEngine getVelocityEngine() {
 			velocityEngine = new VelocityEngine();
 
 			// specify resource loaders to use
-			velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,class");
+			velocityEngine.setProperty("resource.loaders", "file,class");
 
 			// for the loader 'file', set the FileResourceLoader as the class to use and use 'assets' directory for templates
-			velocityEngine.setProperty("file.resource.loader.class", FileResourceLoader.class.getName());
-			velocityEngine.setProperty("file.resource.loader.path", assetsDir.getAbsolutePath());
+			velocityEngine.setProperty("resource.loader.file.class", FileResourceLoader.class.getName());
+			velocityEngine.setProperty("resource.loader.file.path", assetsDir.getAbsolutePath());
 
 			// for the loader 'class', set the ClasspathResourceLoader as the class to use
-			velocityEngine.setProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());
+			velocityEngine.setProperty("resource.loader.class.class", ClasspathResourceLoader.class.getName());
 
 			velocityEngine.init();