3737import fvarrui .maven .plugin .javapackager .utils .FileUtils ;
3838import fvarrui .maven .plugin .javapackager .utils .JavaUtils ;
3939import fvarrui .maven .plugin .javapackager .utils .Logger ;
40- import fvarrui .maven .plugin .javapackager .utils .ProcessUtils ;
40+ import fvarrui .maven .plugin .javapackager .utils .CommandUtils ;
4141import fvarrui .maven .plugin .javapackager .utils .VelocityUtils ;
4242
4343@ Mojo (name = "package" , defaultPhase = LifecyclePhase .PACKAGE , requiresDependencyResolution = ResolutionScope .RUNTIME )
@@ -307,7 +307,7 @@ private void generateRpmPackage() throws MojoExecutionException {
307307
308308 try {
309309 // executes alien command to generate rpm package folder from deb file
310- ProcessUtils .execute (assetsFolder , "alien" , "-g" , "--to-rpm" , debFile );
310+ CommandUtils .execute (assetsFolder , "alien" , "-g" , "--to-rpm" , debFile );
311311 } catch (MojoExecutionException e ) {
312312 getLog ().warn ("alien command execution failed" , e );
313313 return ;
@@ -318,7 +318,7 @@ private void generateRpmPackage() throws MojoExecutionException {
318318
319319 try {
320320 // rebuilds rpm package
321- ProcessUtils .execute (assetsFolder , "rpmbuild" , "--buildroot" , packageFolder , "--nodeps" , "-bb" , specFile );
321+ CommandUtils .execute (assetsFolder , "rpmbuild" , "--buildroot" , packageFolder , "--nodeps" , "-bb" , specFile );
322322 } catch (MojoExecutionException e ) {
323323 getLog ().warn ("rpmbuild command execution failed" , e );
324324 return ;
@@ -393,7 +393,7 @@ private void createMacApp() throws MojoExecutionException {
393393
394394 // codesigns app folder
395395 if (currentPlatform == Platform .mac ) {
396- ProcessUtils .execute ("codesign" , "--force" , "--deep" , "--sign" , "-" , appFile );
396+ CommandUtils .execute ("codesign" , "--force" , "--deep" , "--sign" , "-" , appFile );
397397 }
398398
399399 }
@@ -531,7 +531,7 @@ private void generateWindowsInstaller() throws MojoExecutionException {
531531 VelocityUtils .render ("windows/iss.vtl" , issFile , info );
532532
533533 // generates windows installer with inno setup command line compiler
534- ProcessUtils .execute ("iscc" , "/O" + outputDirectory .getAbsolutePath (), "/F" + name + "_" + version , issFile );
534+ CommandUtils .execute ("iscc" , "/O" + outputDirectory .getAbsolutePath (), "/F" + name + "_" + version , issFile );
535535
536536 }
537537
@@ -642,7 +642,7 @@ private void generateDmgImage() throws MojoExecutionException {
642642 // creates the DMG file including app folder's content
643643 getLog ().info ("Generating the Disk Image file" );
644644 File diskImageFile = new File (outputDirectory , name + "_" + version + ".dmg" );
645- ProcessUtils .execute ("hdiutil" , "create" , "-srcfolder" , appFolder , "-volname" , name , diskImageFile );
645+ CommandUtils .execute ("hdiutil" , "create" , "-srcfolder" , appFolder , "-volname" , name , diskImageFile );
646646
647647 }
648648
@@ -727,7 +727,7 @@ private boolean bundleJre(File jreFolder, File libsFolder) throws MojoExecutionE
727727 if (jreFolder .exists ()) FileUtils .removeFolder (jreFolder );
728728
729729 // generates customized jre using modules
730- ProcessUtils .execute (jlink .getAbsolutePath (), "--module-path" , modulesDir , "--add-modules" , modules , "--output" , jreFolder , "--no-header-files" , "--no-man-pages" , "--strip-debug" , "--compress=2" );
730+ CommandUtils .execute (jlink .getAbsolutePath (), "--module-path" , modulesDir , "--add-modules" , modules , "--output" , jreFolder , "--no-header-files" , "--no-man-pages" , "--strip-debug" , "--compress=2" );
731731
732732 // sets execution permissions on executables in jre
733733 File binFolder = new File (jreFolder , "bin" );
@@ -774,12 +774,12 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
774774 } else if (customizedJre && JavaUtils .getJavaMajorVersion () >= 13 ) {
775775
776776 String modules =
777- ProcessUtils .execute (
777+ CommandUtils .execute (
778778 jdeps .getAbsolutePath (),
779779 "-q" ,
780+ "--multi-release" , JavaUtils .getJavaMajorVersion (),
780781 "--ignore-missing-deps" ,
781782 "--print-module-deps" ,
782- "--multi-release" , JavaUtils .getJavaMajorVersion (),
783783 jarLibs ,
784784 jarFile
785785 );
@@ -792,11 +792,11 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
792792 } else if (customizedJre && JavaUtils .getJavaMajorVersion () >= 9 ) {
793793
794794 String modules =
795- ProcessUtils .execute (
795+ CommandUtils .execute (
796796 jdeps .getAbsolutePath (),
797797 "-q" ,
798- "--list-deps" ,
799798 "--multi-release" , JavaUtils .getJavaMajorVersion (),
799+ "--list-deps" ,
800800 jarLibs ,
801801 jarFile
802802 );
0 commit comments