git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2897 updated unit test for code change
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
c965bc9
..
89c3d24
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-106,8
+106,8
@@
<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
<property name="j2sev" value="1.7+" />
<!-- Java Compilation settings - source and target javac version -->
<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
<property name="j2sev" value="1.7+" />
<!-- Java Compilation settings - source and target javac version -->
- <property name="javac.source" value="1.7" />
- <property name="javac.target" value="1.7" />
+ <property name="javac.source" value="1.8" />
+ <property name="javac.target" value="1.8" />
<!-- Permissions for running Java applets and applications. -->
<!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
<!-- Permissions for running Java applets and applications. -->
<!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
@@
-425,8
+425,7
@@
<offline_allowed />
</information>
<resources>
<offline_allowed />
</information>
<resources>
- <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
- <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}" java-vm-args="--add-modules java.rmi,java.xml,java.xml.bind,java.xml.ws"/>
+ <j2se version="1.8+" />
<jar main="true" href="jalview.jar"/>
<fileset dir="${packageDir}">
<exclude name="jalview.jar" />
<jar main="true" href="jalview.jar"/>
<fileset dir="${packageDir}">
<exclude name="jalview.jar" />
@@
-451,7
+450,10
@@
</presetdef>
<jnlpf toFile="${jnlpFile}" />
</presetdef>
<jnlpf toFile="${jnlpFile}" />
-
+ <!-- add the add-modules j2se attribute for java 9 -->
+ <replace file="${jnlpFile}" value="j2se version="1.8+" initial-heap-size="${inih}" max-heap-size="${maxh}" java-vm-args="--add-modules=java.se.ee --illegal-access=warn"">
+ <replacetoken>j2se version="1.8+"</replacetoken>
+ </replace>
</target>
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
</target>
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
@@
-621,7
+623,7
@@
<include name="plugin.jar" />
</fileset>
</path>
<include name="plugin.jar" />
</fileset>
</path>
- <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
+ <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard_5.3.3.jar" />
<proguard verbose="true" >
<injar file="in.jar" />
<proguard verbose="true" >
<injar file="in.jar" />