Changeset 34604 in osm

Timestamp:

2018-08-27T13:27:51+02:00 (6 years ago)

Author:

donvip

Message:

see #josm16682 - new property Plugin-Minimum-Java-Version for openjfx plugin

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (3 diffs)
• openjfx/build.xml (modified) (1 diff)

applications/editors/josm/plugins/build-common.xml

@@ -195 +195 @@
             <param name="property.value" value="${plugin.canloadatruntime}"/>
         </antcall>
+        <antcall target="add-manifest-attribute">
+            <param name="manifest.attribute" value="Plugin-Minimum-Java-Version"/>
+            <param name="property.name" value="plugin.minimum.java.version"/>
+            <param name="property.value" value="${plugin.minimum.java.version}"/>
+        </antcall>
         <antcall target="additional-manifest" />
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="MANIFEST" manifestencoding="UTF-8">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="MANIFEST" manifestencoding="UTF-8" duplicate="preserve" level="9">
             <restrict>
                 <not><or>
@@ -205 +210 @@
                     <name name="META-INF/*.RSA"/>
                     <name name="META-INF/*.SF"/>
+                    <name name="module-info.class"/>
                 </or></not>
                 <archives>
@@ -213 +219 @@
             </restrict>
         </jar>
-        <jar destfile="${plugin.sources.jar}" basedir="${plugin.src.dir}"/>
-        <jar destfile="${plugin.javadoc.jar}" basedir="${plugin.doc.dir}"/>
+        <jar destfile="${plugin.sources.jar}" basedir="${plugin.src.dir}" level="9"/>
+        <jar destfile="${plugin.javadoc.jar}" basedir="${plugin.doc.dir}" level="9"/>
         <delete file="MANIFEST" failonerror="no"/>
         <antcall target="post-dist" />

applications/editors/josm/plugins/openjfx/build.xml

@@ -12 +12 @@
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.jaxb.OpenJfxPlugin"/>
     <property name="plugin.description" value="Provides the OpenJFX (JavaFX) library for JOSM core and other JOSM plugins. Provides additional features such as MP3 audio playback."/>
+    <property name="plugin.minimum.java.version" value="11"/>
     <!--<property name="plugin.icon" value="..."/>-->
     <!--<property name="plugin.link" value="..."/>-->