Remove deprecated methods from Throwables These methods were marked for removal in 2.5.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b06f6ceb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b06f6ceb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b06f6ceb Branch: refs/heads/LOG4J2-1395 Commit: b06f6ceb21096310f74568eabfe09740d850c596 Parents: 9ec2b5b Author: Matt Sicker <[email protected]> Authored: Mon Jun 6 19:26:23 2016 -0500 Committer: Matt Sicker <[email protected]> Committed: Mon Jun 6 19:26:23 2016 -0500 ---------------------------------------------------------------------- .../logging/log4j/core/util/Throwables.java | 39 -------------------- 1 file changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b06f6ceb/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java index 5f006a0..0d56ef1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java @@ -34,20 +34,6 @@ public final class Throwables { } /** - * Has no effect on Java 6 and below. - * - * @param throwable a Throwable - * @param suppressedThrowable a suppressed Throwable - * @see Throwable#addSuppressed(Throwable) - * @deprecated If compiling on Java 7 and above use {@link Throwable#addSuppressed(Throwable)}. - * Marked as deprecated because Java 6 is deprecated. Will be removed in 2.5. - */ - @Deprecated - public static void addSuppressed(final Throwable throwable, final Throwable suppressedThrowable) { - throwable.addSuppressed(suppressedThrowable); - } - - /** * Returns the deepest cause of the given {@code throwable}. * * @param throwable the throwable to navigate @@ -63,31 +49,6 @@ public final class Throwables { } /** - * Has no effect on Java 6 and below. - * - * @param throwable a Throwable - * @return see Java 7's {@link Throwable#getSuppressed()} - * @see Throwable#getSuppressed() - * @deprecated If compiling on Java 7 and above use {@link Throwable#getSuppressed()}. Marked as deprecated because - * Java 6 is deprecated. Will be removed 2.5. - */ - @Deprecated - public static Throwable[] getSuppressed(final Throwable throwable) { - return throwable.getSuppressed(); - } - - /** - * Returns true if the getSuppressed method is available. - * - * @return True if getSuppressed is available. As of 2.4, always returns true. - * @deprecated Will be removed in 2.5. As of 2.4, always returns true. - */ - @Deprecated - public static boolean isGetSuppressedAvailable() { - return true; - } - - /** * Converts a Throwable stack trace into a List of Strings. * * @param throwable the Throwable
