From e48bb0143c123f044da7f502998b368f7a861205 Mon Sep 17 00:00:00 2001
From: Clement <clement0210@gmail.com>
Date: Fri, 15 Jul 2016 09:58:41 +0200
Subject: [PATCH] DEV refs #13 : packaging, still an issue with dependencies
 not signed

---
 avek-gui/pom.xml | 81 ++++++++++--------------------------------------
 pom.xml          | 12 +++++++
 2 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/avek-gui/pom.xml b/avek-gui/pom.xml
index 98a4998..603575d 100644
--- a/avek-gui/pom.xml
+++ b/avek-gui/pom.xml
@@ -23,58 +23,20 @@
     </repositories>
 
     <build>
-        <!-- Include FXML resources -->
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </resource>
-        </resources>
 
         <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>fr.axonic.avek.gui.Main</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase> <!-- bind to the packaging phase -->
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.zenjava</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>8.5.0</version>
                 <configuration>
+                    <appName>#AVEK</appName>
+                    <vendor>AXONIC</vendor>
                     <mainClass>fr.axonic.avek.gui.Main</mainClass>
-                    <verbose>true</verbose>
-                    <appName>AVEK</appName>
-                    <bundleArguments>
-                        <!-- to include "dtjava.js" and other related files, set this to TRUE -->
-                        <jnlp.includeDT>true</jnlp.includeDT>
-
-                        <!-- the JNLP-bundler needs this, they don't use "appName" for the filename ... you have to set this, otherwise it doesn't build -->
-                        <!-- for details of that JNLP-bundler, please have a look at the source -->
-                        <!-- https://github.com/Debian/openjfx/blob/e32fd960e20c58c9b7db27e426b4bca6d52add2f/modules/fxpackager/src/main/java/com/oracle/tools/packager/jnlp/JNLPBundler.java#L84 -->
-                        <jnlp.outfile>AVEK</jnlp.outfile>
-                    </bundleArguments>
-                    <bundler>jnlp</bundler>
+                    <keyStoreAlias>myalias</keyStoreAlias>
+                    <keyStorePassword>password</keyStorePassword>
+                    <allPermissions>true</allPermissions>
+                    <skipSigningJarFilesJNLP185>true</skipSigningJarFilesJNLP185>
                 </configuration>
                 <executions>
                     <execution>
@@ -86,35 +48,24 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>create-native</id>
+                        <id>create-web</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>build-native</goal>
+                            <goal>build-web</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jarsigner-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <id>sign</id>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>com.zenjava</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>8.5.0</version>
                 <configuration>
-                    <keystore>${project.basedir}/keystore/keystore.p12</keystore>
-                    <alias>AVEK</alias>
-                    <storepass>AVEK.AXONIC.fr</storepass>
-                    <keypass>AVEK.AXONIC.fr</keypass>
-
-                    <verbose>true</verbose>
-                    <certs>true</certs>
+                    <certDomain>fr.axonic</certDomain>
+                    <certOrgUnit>axonic</certOrgUnit>
+                    <certOrg>AXONIC</certOrg>
+                    <certState>PACA</certState>
+                    <certCountry>FR</certCountry>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 294e44b..0ea6c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.zenjava</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>8.5.0</version>
+                <configuration>
+                    <certDomain>fr.axonic</certDomain>
+                    <certOrgUnit>axonic</certOrgUnit>
+                    <certOrg>AXONIC</certOrg>
+                    <certState>PACA</certState>
+                    <certCountry>FR</certCountry>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <organization><name>AXONIC</name></organization>