X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=a414491c9e1068b082f44e1cb5201e8778f68753;hb=refs%2Fheads%2Fspike%2FJAL-2778_changelookandfeelOpaqueWindows;hp=350e475223693a3dfcd2cefbd193488a391cac48;hpb=288b7a4d1cfca2a322572ac407d72ca1cf2898e9;p=jalview.git

diff --git a/build.xml b/build.xml
index 350e475..a414491 100755
--- a/build.xml
+++ b/build.xml
@@ -425,19 +425,20 @@
           <offline_allowed />
         </information>
         <resources>
-          <j2se version="9+" />
+          <j2se version="1.7+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
             <include name="*.jar" />
             <include name="*_*.jar" />
-            <exclude name="*jnilib.jar" />
+            <exclude name="*quaqua*.jar" />
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />
         </resources>
         <resources os="Mac OS X">
           <fileset dir="${packageDir}">
-            <include name="*quaqua*.jnilib.jar" />
+          	 <include name="quaqua-filechooser-only-8.0.jar"/>
+            <include name="*quaqua64*.jnilib.jar" />
           </fileset>
         </resources>
 
@@ -450,9 +451,9 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}" />
-    <!-- add a j2se entry for java 9 -->
-    <replace file="${jnlpFile}" value="j2se version=&quot;9+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.rmi,java.xml,java.xml.bind,java.xml.ws&quot;">
-          <replacetoken>j2se version="9+"</replacetoken>
+    <!-- add the add-modules j2se attribute for java 9 -->
+    <replace file="${jnlpFile}" value="j2se version=&quot;1.7+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
+          <replacetoken>j2se version="1.7+"</replacetoken>
            
         </replace>
   </target>