diff --git a/core/src/main/java/hudson/util/IOUtils.java b/core/src/main/java/hudson/util/IOUtils.java index 1155046e18..7bb9121661 100644 --- a/core/src/main/java/hudson/util/IOUtils.java +++ b/core/src/main/java/hudson/util/IOUtils.java @@ -152,49 +152,11 @@ public class IOUtils { } } - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#DIR_SEPARATOR_UNIX} - */ - @Deprecated - public static final char DIR_SEPARATOR_UNIX = org.apache.commons.io.IOUtils.DIR_SEPARATOR_UNIX; - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#DIR_SEPARATOR_WINDOWS} - */ - @Deprecated - public static final char DIR_SEPARATOR_WINDOWS = org.apache.commons.io.IOUtils.DIR_SEPARATOR_WINDOWS; - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#DIR_SEPARATOR} - */ - @Deprecated - public static final char DIR_SEPARATOR = org.apache.commons.io.IOUtils.DIR_SEPARATOR; - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#LINE_SEPARATOR_UNIX} - */ - @Deprecated - public static final String LINE_SEPARATOR_UNIX = org.apache.commons.io.IOUtils.LINE_SEPARATOR_UNIX; - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#LINE_SEPARATOR_WINDOWS} - */ - @Deprecated - public static final String LINE_SEPARATOR_WINDOWS = org.apache.commons.io.IOUtils.LINE_SEPARATOR_WINDOWS; - - /** - * @deprecated Use instead {@link org.apache.commons.io.IOUtils#LINE_SEPARATOR} - */ - @Deprecated - public static final String LINE_SEPARATOR; - static { // avoid security issues StringWriter buf = new StringWriter(4); PrintWriter out = new PrintWriter(buf); out.println(); - LINE_SEPARATOR = buf.toString(); } /** diff --git a/core/src/main/resources/META-INF/upgrade/IOUtils.hint b/core/src/main/resources/META-INF/upgrade/IOUtils.hint index bfbaf27a94..bc995ed09a 100644 --- a/core/src/main/resources/META-INF/upgrade/IOUtils.hint +++ b/core/src/main/resources/META-INF/upgrade/IOUtils.hint @@ -1,10 +1,4 @@ -hudson.util.IOUtils.DIR_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.DIR_SEPARATOR_UNIX;; -hudson.util.IOUtils.DIR_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.DIR_SEPARATOR_WINDOWS;; -hudson.util.IOUtils.DIR_SEPARATOR => org.apache.commons.io.IOUtils.DIR_SEPARATOR;; -hudson.util.IOUtils.LINE_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.LINE_SEPARATOR_UNIX;; -hudson.util.IOUtils.LINE_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.LINE_SEPARATOR_WINDOWS;; -hudson.util.IOUtils.LINE_SEPARATOR => org.apache.commons.io.IOUtils.LINE_SEPARATOR;; hudson.util.IOUtils.closeQuietly($args$) => org.apache.commons.io.IOUtils.closeQuietly($args$);; hudson.util.IOUtils.toByteArray($args$) => org.apache.commons.io.IOUtils.toByteArray($args$);; hudson.util.IOUtils.toCharArray($args$) => org.apache.commons.io.IOUtils.toCharArray($args$);;