Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

diff --git a/appletlib/plugin.jar b/appletlib/plugin.jar
deleted file mode 100644 (file)
index d19dcc5..0000000
Binary files a/appletlib/plugin.jar and /dev/null differ

diff --git a/build.xml b/build.xml
index b23293f..00fdf04 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -613,7 +613,9 @@
     <pathelement location="appletlib/${jsoup}" />
     <pathelement location="appletlib/${jsonSimple}" />
     <pathelement location="appletlib/${javaJson}" />
-    <pathelement location="appletlib/plugin.jar" />
+       <fileset dir="${java.home}/lib">
+        <include name="plugin.jar" />
+    </fileset>
   </path>
   <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />