--- a/src/jdk.jlink/share/classes/module-info.java	Mon Apr 22 08:53:37 2019 -0400
+++ b/src/jdk.jlink/share/classes/module-info.java	Fri May 03 14:51:28 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,4 +77,4 @@
         jdk.tools.jlink.internal.plugins.IncludeLocalesPlugin,
         jdk.tools.jlink.internal.plugins.GenerateJLIClassesPlugin,
         jdk.tools.jlink.internal.plugins.ReleaseInfoPlugin;
-}
+ }

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Mon Apr 22 08:53:37 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Fri May 03 14:51:28 2019 -0400
@@ -323,7 +323,7 @@
         List<Map<String, ? super Object>> entryPoints =
                 StandardBundlerParam.ADD_LAUNCHERS.fetchFrom(params);
         for (Map<String, ? super Object> entryPoint : entryPoints) {
-            Map<String, ? super Object> tmp = 
+            Map<String, ? super Object> tmp =
                     AddLauncherArguments.merge(originalParams, entryPoint);
 
             // add executable for add launcher

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java	Mon Apr 22 08:53:37 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java	Fri May 03 14:51:28 2019 -0400
@@ -55,21 +55,21 @@
             switch (platform) {
                 case MAC:
                     types = "{\"pkg\", \"dmg\"}";
-		    pLaunchOptions = I18N.getString("MSG_Help_mac_launcher");
+                    pLaunchOptions = I18N.getString("MSG_Help_mac_launcher");
                     pInstallOptions = "";
                     pInstallDir
                             = I18N.getString("MSG_Help_mac_linux_install_dir");
                     break;
                 case LINUX:
                     types = "{\"rpm\", \"deb\"}";
-		    pLaunchOptions = "";
+                    pLaunchOptions = "";
                     pInstallOptions = I18N.getString("MSG_Help_linux_install");
                     pInstallDir
                             = I18N.getString("MSG_Help_mac_linux_install_dir");
                     break;
                 case WINDOWS:
                     types = "{\"exe\", \"msi\"}";
-		    pLaunchOptions = I18N.getString("MSG_Help_win_launcher");
+                    pLaunchOptions = I18N.getString("MSG_Help_win_launcher");
                     pInstallOptions = I18N.getString("MSG_Help_win_install");
                     pInstallDir
                             = I18N.getString("MSG_Help_win_install_dir");
@@ -77,8 +77,8 @@
                 default:
                     types =
                       "{\"exe\", \"msi\", \"rpm\", \"deb\", \"pkg\", \"dmg\"}";
-		    pLaunchOptions = I18N.getString("MSG_Help_win_launcher")
-		            + I18N.getString("MSG_Help_mac_launcher");
+                    pLaunchOptions = I18N.getString("MSG_Help_win_launcher")
+                            + I18N.getString("MSG_Help_mac_launcher");
                     pInstallOptions = I18N.getString("MSG_Help_win_install")
                             + I18N.getString("MSG_Help_linux_install");
                     pInstallDir

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java	Mon Apr 22 08:53:37 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java	Fri May 03 14:51:28 2019 -0400
@@ -214,7 +214,7 @@
                     mainJarType == ModFile.ModType.ModularJar) {
                 addModules.add(ModuleHelper.ALL_DEFAULT);
             }
-        } 
+        }
 
         Set<String> validModules =
                   getValidModules(modulePath, addModules, limitModules);
@@ -279,7 +279,7 @@
                 .stream()
                 .map(ResolvedModule::name)
                 .collect(Collectors.toSet());
-    } 
+    }
 
     /*
      * Returns true if the given module exports an API to all module.
@@ -333,7 +333,7 @@
                 Set<String> limitModules) {
             boolean addAllModulePath = false;
             boolean addDefaultMods = false;
-            
+
             for (Iterator<String> iterator = addModules.iterator();
                     iterator.hasNext();) {
                 String module = iterator.next();
@@ -422,7 +422,7 @@
                 args.add("--bind-services");
             }
         }
-        
+
         StringWriter writer = new StringWriter();
         PrintWriter pw = new PrintWriter(writer);
 

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java	Mon Apr 22 08:53:37 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java	Fri May 03 14:51:28 2019 -0400
@@ -52,7 +52,7 @@
         LAUNCHER,   // valid when creating a launcher
         INSTALL     // valid when creating an installer
     }
-        
+
     private static final HashMap<String, USE> options = new HashMap<>();
 
 
@@ -88,7 +88,7 @@
         options.put(CLIOptions.INSTALL_DIR.getId(), USE.INSTALL);
         options.put(CLIOptions.PREDEFINED_APP_IMAGE.getId(), USE.INSTALL);
 
-        options.put(CLIOptions.FILE_ASSOCIATIONS.getId(), 
+        options.put(CLIOptions.FILE_ASSOCIATIONS.getId(),
             (Platform.getPlatform() == Platform.MAC) ?  USE.ALL : USE.INSTALL);
 
         if (Platform.getPlatform() == Platform.WINDOWS) {