From 1ae6c71c27d726f921b86396837010ad7a76edf6 Mon Sep 17 00:00:00 2001
From: Igor Azarny <iazarny@yahoo.com>
Date: Sat, 2 Mar 2024 13:33:55 +0200
Subject: [PATCH] Mac installer

---
 ge-mac-installer.sh | 21 ++++++++++---
 pom.xml             | 73 +++++++++------------------------------------
 2 files changed, 31 insertions(+), 63 deletions(-)

diff --git a/ge-mac-installer.sh b/ge-mac-installer.sh
index fda031e..13fb7aa 100755
--- a/ge-mac-installer.sh
+++ b/ge-mac-installer.sh
@@ -1,10 +1,23 @@
 #!/bin/sh
+mkdir app
+mv target/gitember-2.5-spring-boot.jar app
 
-jpackage --verbose --input shade/  --name Gitember2 --vendor "Igor Azarny"  --main-jar gitember.jar  --app-version 2.5   --main-class com.az.gitember.GitemberLauncher   --type "dmg"     --icon src/main/resources/icon/gitember.icns
-#jpackage --verbose --input build   --name i2Brain                           --main-jar i2brain.jar   --app-version 3.3.2                             --type app-image --runtime-image ./smalljre
-mv Gitember2-1.0.dmg Gitember2.dmg
+jpackage \
+   --input app/  --name Gitember2 --vendor "Igor Azarny" \
+   --main-jar gitember-2.5-spring-boot.jar  --app-version 2.5 \
+   --icon src/main/resources/icon/gitember.icns \
+   --type "dmg" \
+   --mac-sign \
+   --mac-package-signing-prefix "com.az.gitember" \
+   --mac-signing-key-user-name "Igor Azarny (3........8)"
 
+mv Gitember2-2.5.dmg Gitember2.5.dmg
 
-#export PATH="/Users/ec2-user/jdk-16.0.1.jdk/Contents/Home/bin:/Users/ec2-user/apache-maven-3.8.1/bin:$PATH"
+# .dmg signing is required for notarization.
+codesign --timestamp -s "3H6449CVS8" "Gitember2.5.dmg"
 
+####### notarization #######
+xcrun notarytool submit "Gitember2.5.dmg" --wait --keychain-profile "Igor Azarny"
+xcrun stapler staple "Gitember2.5.dmg"
+spctl -a -t open --context context:primary-signature -vv "Gitember2.5.dmg"
 
diff --git a/pom.xml b/pom.xml
index 0b6b098..fad0ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.az</groupId>
     <artifactId>gitember</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
@@ -13,7 +13,6 @@
         <jgit.version>6.8.0.202311291450-r</jgit.version>
         <apache.tika.version>1.28.5</apache.tika.version>
         <slf4j.version>2.0.11</slf4j.version>
-
         <javafx.version>20.0.2</javafx.version>
     </properties>
 
@@ -245,6 +244,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-maven-plugin</artifactId>
+            <version>3.2.3</version>
+        </dependency>
 
     </dependencies>
     <build>
@@ -273,75 +277,26 @@
                     <jlinkZipName>gitember2</jlinkZipName> -->
                 </configuration>
             </plugin>
+
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>project-classifier</shadedClassifierName>
-                            <outputFile>shade\${project.artifactId}.jar</outputFile>
-                            <transformers>
-                                <transformer implementation=
-                                                     "org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.az.gitember.GitemberLauncher</mainClass>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
+                            <classifier>spring-boot</classifier>
+                            <mainClass>
+                                com.az.gitember.GitemberLauncher
+                            </mainClass>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
 
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.az.gitember.App</mainClass>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    &lt;!&ndash; filter out signature files from signed dependencies, else repackaging fails with security ex &ndash;&gt;
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
-
         </plugins>
     </build>
 </project>
\ No newline at end of file