--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java	Wed Oct 23 10:10:34 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java	Wed Oct 23 10:37:54 2019 -0400
@@ -240,6 +240,11 @@
         return parent != null ? parent.resolve(filename) : Path.of(filename);
     }
 
+    public static String getSuffix(Path path) {
+        String filename = replaceSuffix(path.getFileName(), null).toString();
+        return path.getFileName().toString().substring(filename.length());
+    }
+
     @FunctionalInterface
     public static interface XmlConsumer {
         void accept(XMLStreamWriter xml) throws IOException, XMLStreamException;
@@ -248,7 +253,7 @@
     public static void createXml(Path dstFile, XmlConsumer xmlConsumer) throws
             IOException {
         XMLOutputFactory xmlFactory = XMLOutputFactory.newInstance();
-        try (Writer w = new BufferedWriter(new FileWriter(dstFile.toFile()))) {
+        try (Writer w = Files.newBufferedWriter(dstFile)) {
             // Wrap with pretty print proxy
             XMLStreamWriter xml = (XMLStreamWriter) Proxy.newProxyInstance(
                     XMLStreamWriter.class.getClassLoader(), new Class<?>[]{