Index: trunk/native/file-associations/bz2.properties
===================================================================
--- trunk/native/file-associations/bz2.properties	(revision 18136)
+++ trunk/native/file-associations/bz2.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=bz2
+mime-type=application/x-bzip2
+description=OpenStreetMap BZipped
Index: trunk/native/file-associations/geojson.properties
===================================================================
--- trunk/native/file-associations/geojson.properties	(revision 18136)
+++ trunk/native/file-associations/geojson.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=geojson
+mime-type=application/geo+json
+description=GeoJSON
Index: trunk/native/file-associations/gpx.properties
===================================================================
--- trunk/native/file-associations/gpx.properties	(revision 18136)
+++ trunk/native/file-associations/gpx.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=gpx
+mime-type=application/gpx+xml
+description=GPS Exchange Format (GPX)
Index: trunk/native/file-associations/gz.properties
===================================================================
--- trunk/native/file-associations/gz.properties	(revision 18136)
+++ trunk/native/file-associations/gz.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=gz
+mime-type=application/gzip
+description=OpenStreetMap GZipped
Index: trunk/native/file-associations/jos.properties
===================================================================
--- trunk/native/file-associations/jos.properties	(revision 18136)
+++ trunk/native/file-associations/jos.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=jos
+mime-type=application/x-josm-session+xml
+description=JOSM Session
Index: trunk/native/file-associations/joz.properties
===================================================================
--- trunk/native/file-associations/joz.properties	(revision 18136)
+++ trunk/native/file-associations/joz.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=joz
+mime-type=application/x-josm-session+zip
+description=JOSM Zipped Session
Index: trunk/native/file-associations/osm.properties
===================================================================
--- trunk/native/file-associations/osm.properties	(revision 18136)
+++ trunk/native/file-associations/osm.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=osm
+mime-type=application/x-osm+xml
+description=OpenStreetMap
Index: trunk/native/file-associations/zip.properties
===================================================================
--- trunk/native/file-associations/zip.properties	(revision 18136)
+++ trunk/native/file-associations/zip.properties	(revision 18136)
@@ -0,0 +1,3 @@
+extension=zip
+mime-type=application/zip
+description=OpenStreetMap Zipped
Index: trunk/native/macosx/bz2.properties
===================================================================
--- trunk/native/macosx/bz2.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=bz2
-mime-type=application/x-bzip2
-description=OpenStreetMap BZipped
Index: trunk/native/macosx/geojson.properties
===================================================================
--- trunk/native/macosx/geojson.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=geojson
-mime-type=application/geo+json
-description=GeoJSON
Index: trunk/native/macosx/gpx.properties
===================================================================
--- trunk/native/macosx/gpx.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=gpx
-mime-type=application/gpx+xml
-description=GPS Exchange Format (GPX)
Index: trunk/native/macosx/gz.properties
===================================================================
--- trunk/native/macosx/gz.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=gz
-mime-type=application/gzip
-description=OpenStreetMap GZipped
Index: trunk/native/macosx/jos.properties
===================================================================
--- trunk/native/macosx/jos.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=jos
-mime-type=application/x-josm-session+xml
-description=JOSM Session
Index: trunk/native/macosx/joz.properties
===================================================================
--- trunk/native/macosx/joz.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=joz
-mime-type=application/x-josm-session+zip
-description=JOSM Zipped Session
Index: trunk/native/macosx/macos-jpackage.sh
===================================================================
--- trunk/native/macosx/macos-jpackage.sh	(revision 18003)
+++ trunk/native/macosx/macos-jpackage.sh	(revision 18136)
@@ -55,5 +55,5 @@
 fi
 
-echo "Building and signin app"
+echo "Building and signing app"
     jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
Index: trunk/native/macosx/osm.properties
===================================================================
--- trunk/native/macosx/osm.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=osm
-mime-type=application/x-osm+xml
-description=OpenStreetMap
Index: trunk/native/macosx/zip.properties
===================================================================
--- trunk/native/macosx/zip.properties	(revision 18003)
+++ 	(revision )
@@ -1,3 +1,0 @@
-extension=zip
-mime-type=application/zip
-description=OpenStreetMap Zipped
Index: trunk/native/windows/win-jpackage.sh
===================================================================
--- trunk/native/windows/win-jpackage.sh	(revision 18136)
+++ trunk/native/windows/win-jpackage.sh	(revision 18136)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -Eeou pipefail
+
+# Don't show one time passwords
+set +x
+
+if [ -z "${1-}" ]
+then
+    echo "Usage: $0 josm_revision"
+    exit 1
+fi
+
+echo "Building JOSM.app"
+
+mkdir app
+
+JPACKAGEOPTIONS=""
+
+echo "Building app"
+    jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
+    --main-class org.openstreetmap.josm.gui.MainApplication \
+    --icon ./native/windows/logo.ico --type app-image --dest app \
+    --java-options "--add-exports=java.base/sun.security.action=ALL-UNNAMED" \
+    --java-options "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" \
+    --java-options "--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" \
+    --java-options "--add-opens=java.base/java.lang=ALL-UNNAMED" \
+    --java-options "--add-opens=java.base/java.nio=ALL-UNNAMED" \
+    --java-options "--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED" \
+    --java-options "--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED" \
+    --java-options "--add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED" \
+    --java-options "--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED" \
+    --java-options "--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED" \
+    --app-version "$1" \
+    --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
+    --vendor "https://josm.openstreetmap.de" \
+    --file-associations native/file-associations/bz2.properties \
+    --file-associations native/file-associations/geojson.properties \
+    --file-associations native/file-associations/gpx.properties \
+    --file-associations native/file-associations/gz.properties \
+    --file-associations native/file-associations/jos.properties \
+    --file-associations native/file-associations/joz.properties \
+    --file-associations native/file-associations/osm.properties \
+    --file-associations native/file-associations/zip.properties \
+    --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.sql,java.transaction.xa,java.xml,jdk.crypto.ec,jdk.jfr,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom
+
+echo "Building done."