From bf3bc4d6e19c17f5614b3abee0cc1d5ec685fc43 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 18 Dec 2018 15:56:09 +0100 Subject: [PATCH] Remove CallerSensitive (#26112) Having this file at all was a workaround for a problem with building on jdk9 for jdk8, but I can no longer reproduce this problem. See also https://github.com/akka/akka/pull/25326 --- .../java/sun/reflect/CallerSensitive.java | 41 ------------------- project/build.properties | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 akka-actor/src/main/java/sun/reflect/CallerSensitive.java diff --git a/akka-actor/src/main/java/sun/reflect/CallerSensitive.java b/akka-actor/src/main/java/sun/reflect/CallerSensitive.java deleted file mode 100644 index 1822fbe66d..0000000000 --- a/akka-actor/src/main/java/sun/reflect/CallerSensitive.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2013, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.reflect; - -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; - -/** - * A method annotated @CallerSensitive is sensitive to its calling class, - * via {@link sun.reflect.Reflection#getCallerClass Reflection.getCallerClass}, - * or via some equivalent. - * - * @author John R. Rose - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({METHOD}) -public @interface CallerSensitive { -} diff --git a/project/build.properties b/project/build.properties index 7c58a83abf..72f902892a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.2.7