From b28a39a059a1e377d9928e92779d6fdd183acdf5 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Sat, 6 Feb 2016 15:58:45 -0600
Subject: [PATCH] Issue #18: Updating packaging to work more reliably.

---
 pom.xml | 89 ++++++---------------------------------------------------
 1 file changed, 9 insertions(+), 80 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a288a7..35a1700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,37 +12,17 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mainClass>jace.JaceApplication</mainClass>
+        <netbeans.hint.license>apache20</netbeans.hint.license>
     </properties>
 
     <organization>
-        <name>badvision</name>
+        <!-- Used as the 'Vendor' for JNLP generation -->
+        <name>org.badvision</name>
     </organization>
 
     <build>
+        <finalName>Jace</finalName>
         <plugins>
-            <plugin>
-                <groupId>com.zenjava</groupId>
-                <artifactId>javafx-maven-plugin</artifactId>
-                <version>8.1.2</version>
-                <configuration>
-                    JavaAppleComputerEmulator
-                    <mainClass>jace.JaceApplication</mainClass>
-                    <!-- only required if signing the jar file -->
-                    <keyStoreAlias>example-user</keyStoreAlias>
-                    <keyStorePassword>example-password</keyStorePassword>
-                    <allPermissions>true</allPermissions>
-                    <bundleType>ALL</bundleType>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>                        
-                    </execution>
-                </executions>            
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -62,21 +42,19 @@
                     </execution>
                 </executions>
             </plugin>
-
-<!--            <plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <executions>
                     <execution>
                         <id>unpack-dependencies</id>
-                        
                         <phase>package</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>${java.home}/../bin/javafxpackager</executable>
+                            <executable>${java.home}/../bin/javapackager</executable>
                             <arguments>
                                 <argument>-createjar</argument>
                                 <argument>-nocss2bin</argument>
@@ -91,66 +69,17 @@
                             </arguments>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>default-cli</id>
-                        <goals>
-                            <goal>exec</goal>                            
-                        </goals>
-                        <configuration>
-                            <executable>${java.home}/bin/java</executable>
-                            <commandlineArgs>${runfx.args}</commandlineArgs>
-                        </configuration>
-                    </execution>
                 </executions>  
-            </plugin>-->
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-                    <compilerArguments>
-                        <bootclasspath>${sun.boot.class.path}${path.separator}${java.home}/lib/jfxrt.jar</bootclasspath>
-                    </compilerArguments>
                 </configuration>
+                <version>3.5</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18</version>
-                <configuration>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>${java.home}/lib/jfxrt.jar</additionalClasspathElement>
-                    </additionalClasspathElements>
-                </configuration>
-            </plugin>
-<!-- BEGIN -->
-<!-- https://ivan-site.com/2012/05/download-oracle-java-jre-jdk-using-a-script/ -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <phase>package</phase>
-                    <goals>
-                      <goal>single</goal>
-                    </goals>
-                  </execution>
-                </executions>
-                <configuration>
-                  <archive>
-                  <manifest>
-                    <addClasspath>true</addClasspath>
-                    <mainClass>jace.JaceApplication</mainClass>
-                  </manifest>
-                  </archive>
-
-                  <descriptorRefs>
-                    <descriptorRef>jar-with-dependencies</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-            </plugin> 
-<!-- END -->
         </plugins>
     </build>