Skip to content

Commit 082bc4a

Browse files
author
stoecker
committed
fix old Java related stuff
git-svn-id: https://josm.openstreetmap.de/svn/trunk@19542 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent d0b3f5e commit 082bc4a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

build.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,7 @@ Build-Date: ${build.tstamp}
655655
<arg value="${dist-optimized.jar}"/>
656656
</exec>
657657
</target>
658-
<target name="check-plugins" depends="dist-optimized" description="Check of plugins binary compatibility" unless="isJava21">
659-
<!-- animal_sniffer doesn't support Java 21 yet. The unless statement can be removed after animal_sniffer is updated to 1.24. -->
658+
<target name="check-plugins" depends="dist-optimized" description="Check of plugins binary compatibility">
660659
<local name="dir"/>
661660
<local name="plugins"/>
662661
<property name="dir" value="plugin-check"/>
@@ -683,7 +682,7 @@ Build-Date: ${build.tstamp}
683682
</loadfile>
684683
<!-- Download list of plugins -->
685684
<loadresource property="plugins">
686-
<url url="https://josm.openstreetmap.de/pluginicons?minjava=8&amp;noparams=1"/>
685+
<url url="https://josm.openstreetmap.de/pluginicons?minjava=${java.lang.version}&amp;noparams=1"/>
687686
<filterchain>
688687
<linecontainsregexp negate="true">
689688
<regexp pattern="${deprecated-plugins}"/>
@@ -724,7 +723,7 @@ Build-Date: ${build.tstamp}
724723
<as:build-signatures destfile="${dir}/api.sig">
725724
<path>
726725
<fileset file="${dist-optimized.jar}"/>
727-
<fileset dir="${java.home}/jmods" />
726+
<fileset dir="${java.home}/${java.library.dir}"/>
728727
</path>
729728
</as:build-signatures>
730729
<as:check-signature signature="${dir}/api.sig" failonerror="false">

0 commit comments

Comments
 (0)