Merge branch 'devel'

fvarrui · Mar 10, 2022 · 4281b3a · 4281b3a
2 parents 135a780 + e3ee8c5
commit 4281b3a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Add the following `plugin` tag to your `pom.xml`:
 <plugin>
     <groupId>io.github.fvarrui</groupId>
     <artifactId>javapackager</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
     <executions>
         <execution>
             <phase>package</phase>
@@ -71,7 +71,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'io.github.fvarrui:javapackager:1.6.4'
+        classpath 'io.github.fvarrui:javapackager:1.6.5'
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -70,7 +70,7 @@ dependencies {
 }
 
 group = 'io.github.fvarrui'
-version = '1.6.4'
+version = '1.6.5'
 description = 'Hybrid Maven/Gradle plugin to package Java applications as native Windows, Mac OS X or GNU/Linux executables and create installers for them'
 
 sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java b/src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java
@@ -150,6 +150,12 @@ protected File doApply(Packager packager) throws Exception {
 		if (legalFolder.exists()) {
 			FileUtils.removeFolder(legalFolder);
 		}
+
+		// removes jre/man folder as it causes problems when codesigning from Mac OS
+		File manFolder = new File(destinationFolder, "man");
+		if (manFolder.exists()) {
+			FileUtils.removeFolder(manFolder);
+		}
 
 		if (bundleJre) {
 			Logger.infoUnindent("JRE bundled in " + destinationFolder.getAbsolutePath() + "!");