--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	2017-12-07 16:43:20.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	2017-12-07 16:43:20.000000000 -0800
@@ -38,6 +38,10 @@
 import java.util.*;
 import com.oracle.tools.packager.IOUtils;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public abstract class AbstractBundler implements Bundler {
 
     private static final ResourceBundle I18N =
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/AbstractImageBundler.java	2017-12-07 16:43:20.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/AbstractImageBundler.java	2017-12-07 16:43:20.000000000 -0800
@@ -44,7 +44,10 @@
 
 /**
  * Common utility methods used by app image bundlers.
+ * 
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
+@Deprecated(since="10", forRemoval=true)
 public abstract class AbstractImageBundler extends AbstractBundler {
 
     private static final ResourceBundle I18N =
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/BasicBundlers.java	2017-12-07 16:43:21.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/BasicBundlers.java	2017-12-07 16:43:21.000000000 -0800
@@ -58,7 +58,10 @@
  *     <LI>Linux RPM</LI>
  *
  * </UL>
+ * 
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
+@Deprecated(since="10", forRemoval=true)
 public class BasicBundlers implements Bundlers {
 
     boolean defaultsLoaded = false;
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Bundler.java	2017-12-07 16:43:22.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Bundler.java	2017-12-07 16:43:22.000000000 -0800
@@ -29,9 +29,11 @@
 import java.util.Collection;
 import java.util.Map;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public interface Bundler {
-
-
     /**
      * @return User Friendly name of this bundler.
      */
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/BundlerParamInfo.java	2017-12-07 16:43:22.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/BundlerParamInfo.java	2017-12-07 16:43:22.000000000 -0800
@@ -30,8 +30,11 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class BundlerParamInfo<T> {
-
     /**
      * The user friendly name of the parameter
      */
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Bundlers.java	2017-12-07 16:43:23.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Bundlers.java	2017-12-07 16:43:23.000000000 -0800
@@ -29,7 +29,10 @@
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public interface Bundlers {
 
     /**
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/ConfigException.java	2017-12-07 16:43:24.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/ConfigException.java	2017-12-07 16:43:24.000000000 -0800
@@ -25,6 +25,10 @@
 
 package com.oracle.tools.packager;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class ConfigException extends Exception {
     final String advice;
 
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/EnumeratedBundlerParam.java	2017-12-07 16:43:24.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/EnumeratedBundlerParam.java	2017-12-07 16:43:24.000000000 -0800
@@ -49,7 +49,9 @@
  *     params.put(MAC_CATEGORY.getID(), value);
  * }</pre>
  *
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
+@Deprecated(since="10", forRemoval=true)
 public class EnumeratedBundlerParam<T> extends BundlerParamInfo<T> {
     //Not sure if this is the correct order, my idea is that from and IDE's perspective
     //the string to display to the user is the key and then the value is some type of
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/IOUtils.java	2017-12-07 16:43:25.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/IOUtils.java	2017-12-07 16:43:25.000000000 -0800
@@ -31,6 +31,10 @@
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class IOUtils {
 
     public static boolean deleteRecursive(File path) throws FileNotFoundException {
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/InvalidBundlerParamException.java	2017-12-07 16:43:26.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/InvalidBundlerParamException.java	2017-12-07 16:43:26.000000000 -0800
@@ -25,6 +25,10 @@
 
 package com.oracle.tools.packager;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class InvalidBundlerParamException extends RuntimeException {
     public InvalidBundlerParamException(String message) {
         super(message);
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/JreUtils.java	2017-12-07 16:43:26.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/JreUtils.java	2017-12-07 16:43:26.000000000 -0800
@@ -29,6 +29,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class JreUtils {
 
     public static class Rule {
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Log.java	2017-12-07 16:43:27.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Log.java	2017-12-07 16:43:27.000000000 -0800
@@ -29,6 +29,10 @@
 import java.io.IOException;
 import java.io.PrintStream;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class Log {
     public static class Logger {
         private boolean verbose = false;
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Platform.java	2017-12-07 16:43:28.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/Platform.java	2017-12-07 16:43:28.000000000 -0800
@@ -44,8 +44,10 @@
  *      //TODO Do something else
  *    }
  *  }
+ * 
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
-
+@Deprecated(since="10", forRemoval=true)
 public enum Platform {UNKNOWN, WINDOWS, LINUX, MAC;
     private static final Platform platform;
     private static final int majorVersion;
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/RelativeFileSet.java	2017-12-07 16:43:28.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/RelativeFileSet.java	2017-12-07 16:43:28.000000000 -0800
@@ -31,6 +31,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class RelativeFileSet {
 
     public enum Type {
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	2017-12-07 16:43:29.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	2017-12-07 16:43:29.000000000 -0800
@@ -59,6 +59,10 @@
 import static jdk.packager.internal.legacy.JLinkBundlerHelper.findPathOfModule;
 import static jdk.packager.internal.legacy.JLinkBundlerHelper.listOfPathToString;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class StandardBundlerParam<T> extends BundlerParamInfo<T> {
 
     public static final String MANIFEST_JAVAFX_MAIN ="JavaFX-Application-Class";
--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/UnsupportedPlatformException.java	2017-12-07 16:43:30.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/UnsupportedPlatformException.java	2017-12-07 16:43:30.000000000 -0800
@@ -25,4 +25,8 @@
 
 package com.oracle.tools.packager;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class UnsupportedPlatformException extends Exception {}
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CachingPrintStream.java	2017-12-07 16:43:31.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CachingPrintStream.java	2017-12-07 16:43:30.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.PrintStream;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class CachingPrintStream {
 
     private PrintStream ps;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CommonParams.java	2017-12-07 16:43:31.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CommonParams.java	2017-12-07 16:43:31.000000000 -0800
@@ -27,8 +27,11 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public abstract class CommonParams {
-
     File outdir;
     boolean verbose;
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CreateBSSParams.java	2017-12-07 16:43:32.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CreateBSSParams.java	2017-12-07 16:43:32.000000000 -0800
@@ -31,6 +31,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class CreateBSSParams extends CommonParams {
     final List<PackagerResource> resources = new ArrayList<PackagerResource>();
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CreateJarParams.java	2017-12-07 16:43:32.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/CreateJarParams.java	2017-12-07 16:43:32.000000000 -0800
@@ -31,8 +31,11 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class CreateJarParams extends CommonParams {
-
     final List<PackagerResource> resources = new ArrayList<PackagerResource>();
 
     String applicationClass;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	2017-12-07 16:43:33.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	2017-12-07 16:43:33.000000000 -0800
@@ -47,7 +47,10 @@
 
 import static com.oracle.tools.packager.jnlp.JNLPBundler.*;
 
-@Deprecated
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class DeployParams extends CommonParams {
     public enum RunMode {
         WEBSTART, EMBEDDED, STANDALONE, ALL
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/HtmlParam.java	2017-12-07 16:43:34.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/HtmlParam.java	2017-12-07 16:43:34.000000000 -0800
@@ -25,7 +25,10 @@
 
 package com.sun.javafx.tools.packager;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class HtmlParam extends Param {
     boolean needEscape = true;
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/JSCallback.java	2017-12-07 16:43:34.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/JSCallback.java	2017-12-07 16:43:34.000000000 -0800
@@ -29,8 +29,9 @@
  * Ant-independent version of the Callback class.
  *
  * @see com.sun.javafx.tools.ant.Callback
- *
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
+@Deprecated(since="10", forRemoval=true)
 class JSCallback {
 
     private String name;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/JarSignature.java	2017-12-07 16:43:35.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/JarSignature.java	2017-12-07 16:43:35.000000000 -0800
@@ -80,7 +80,10 @@
  *   - add entries using updateWithEntry()
  *   - use isValid() to validate result
  *   - use getCodeSigners() to get list of code signers used
+ * 
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
  */
+@Deprecated(since="10", forRemoval=true)
 public class JarSignature {
     //name of jar manifest attribute that contains signature
     public static final String BLOB_SIGNATURE = "META-INF/SIGNATURE.BSF";
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Log.java	2017-12-07 16:43:36.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Log.java	2017-12-07 16:43:36.000000000 -0800
@@ -29,6 +29,10 @@
 import java.io.IOException;
 import java.io.PrintStream;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class Log extends com.oracle.tools.packager.Log {
     public static class Logger extends com.oracle.tools.packager.Log.Logger{
         public Logger(boolean v) {
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Main.java	2017-12-07 16:43:36.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Main.java	2017-12-07 16:43:36.000000000 -0800
@@ -42,7 +42,10 @@
 
 import jdk.packager.internal.legacy.JLinkBundlerHelper;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class Main {
 
     private static final ResourceBundle bundle =
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/MakeAllParams.java	2017-12-07 16:43:37.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/MakeAllParams.java	2017-12-07 16:43:37.000000000 -0800
@@ -25,6 +25,10 @@
 
 package com.sun.javafx.tools.packager;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class MakeAllParams {
     String appClass;
     String preloader;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/PackagerException.java	2017-12-07 16:43:38.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/PackagerException.java	2017-12-07 16:43:38.000000000 -0800
@@ -28,7 +28,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class PackagerException extends Exception {
     private static final ResourceBundle bundle =
             ResourceBundle.getBundle("com/sun/javafx/tools/packager/Bundle");
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	2017-12-07 16:43:38.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	2017-12-07 16:43:38.000000000 -0800
@@ -81,6 +81,10 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class PackagerLib {
     public static final String JAVAFX_VERSION = System.getProperty("java.version");
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Param.java	2017-12-07 16:43:39.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Param.java	2017-12-07 16:43:39.000000000 -0800
@@ -25,7 +25,10 @@
 
 package com.sun.javafx.tools.packager;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class Param {
     String name;
     String value;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/SignJarParams.java	2017-12-07 16:43:40.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/SignJarParams.java	2017-12-07 16:43:39.000000000 -0800
@@ -31,6 +31,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class SignJarParams extends CommonParams {
 
     final List<PackagerResource> resources = new ArrayList<PackagerResource>();
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/TemplatePlaceholders.java	2017-12-07 16:43:40.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/TemplatePlaceholders.java	2017-12-07 16:43:40.000000000 -0800
@@ -25,6 +25,10 @@
 
 package com.sun.javafx.tools.packager;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public enum TemplatePlaceholders {
 
     //location of dtjava.js
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	2017-12-07 16:43:41.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	2017-12-07 16:43:41.000000000 -0800
@@ -39,7 +39,10 @@
 
 import jdk.packager.internal.legacy.JLinkBundlerHelper;
 
-
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class BundleParams {
 
     final protected Map<String, ? super Object> params;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/Bundler.java	2017-12-07 16:43:41.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/Bundler.java	2017-12-07 16:43:41.000000000 -0800
@@ -25,7 +25,10 @@
 
 package com.sun.javafx.tools.packager.bundlers;
 
-@Deprecated
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public final class Bundler {
 
     private Bundler() {}
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/ConfigException.java	2017-12-07 16:43:42.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/ConfigException.java	2017-12-07 16:43:42.000000000 -0800
@@ -25,6 +25,10 @@
 
 package com.sun.javafx.tools.packager.bundlers;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class ConfigException extends com.oracle.tools.packager.ConfigException {
 
     public ConfigException(String msg, String advice) {
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/RelativeFileSet.java	2017-12-07 16:43:43.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/RelativeFileSet.java	2017-12-07 16:43:43.000000000 -0800
@@ -31,6 +31,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class RelativeFileSet extends com.oracle.tools.packager.RelativeFileSet {
     public RelativeFileSet(File base, Set<File> files) {
         super(base, files);
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/UnsupportedPlatformException.java	2017-12-07 16:43:43.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/bundlers/UnsupportedPlatformException.java	2017-12-07 16:43:43.000000000 -0800
@@ -25,4 +25,8 @@
 
 package com.sun.javafx.tools.packager.bundlers;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class UnsupportedPlatformException extends com.oracle.tools.packager.UnsupportedPlatformException {}
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ConsolidatedResources.java	2017-12-07 16:43:44.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ConsolidatedResources.java	2017-12-07 16:43:44.000000000 -0800
@@ -30,6 +30,10 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public final class ConsolidatedResources {
     private final SortedMap<ResourceKey, ResourceRecord> resourceMap;
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/DeployResource.java	2017-12-07 16:43:45.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/DeployResource.java	2017-12-07 16:43:45.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class DeployResource extends PackagerResource {
     private final Type type;
     private final String mode;
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/DetailedResourceTraversal.java	2017-12-07 16:43:45.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/DetailedResourceTraversal.java	2017-12-07 16:43:45.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public abstract class DetailedResourceTraversal implements ResourceTraversal {
     private String lastRelativePath;
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/PackagerResource.java	2017-12-07 16:43:46.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/PackagerResource.java	2017-12-07 16:43:46.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public class PackagerResource {
     private static final ResourceFilter ACCEPT_ALL_FILTER =
             new ResourceFilter() {
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ResourceFilter.java	2017-12-07 16:43:47.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ResourceFilter.java	2017-12-07 16:43:46.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public interface ResourceFilter {
     boolean descent(File file, String relativePath);
 
--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ResourceTraversal.java	2017-12-07 16:43:47.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/resource/ResourceTraversal.java	2017-12-07 16:43:47.000000000 -0800
@@ -27,6 +27,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated use {@link ToolProvider} to locate the {@code "javapackager"} tool instead.
+ */
+@Deprecated(since="10", forRemoval=true)
 public interface ResourceTraversal {
     boolean traverse(PackagerResource rootResource,
                      File file,
--- old/modules/jdk.packager/src/main/java/module-info.java	2017-12-07 16:43:48.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/module-info.java	2017-12-07 16:43:48.000000000 -0800
@@ -29,6 +29,7 @@
  * @moduleGraph
  * @since 9
  */
+@SuppressWarnings("removal")
 module jdk.packager {
     requires jdk.jlink;