From cc8fbf607816793fb56ee48987e29b049ade4240 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 8 Sep 2017 17:26:12 +0200 Subject: [PATCH] Store third-party annotations in a separate directory --- .../incremental-compilation-impl.iml | 2 +- .../checkers/AbstractForeignAnnotationsTest.kt | 2 +- .../AbstractForeignJava8AnnotationsTest.kt | 2 +- .../idea/highlighter/Jsr305HighlightingTest.kt | 2 +- license/README.md | 14 +++++++------- .../android/support/annotation/NonNull.java | 0 .../android/support/annotation/Nullable.java | 0 .../com/android/annotations/NonNull.java | 0 .../com/android/annotations/Nullable.java | 0 .../umd/cs/findbugs/annotations/CheckForNull.java | 0 .../edu/umd/cs/findbugs/annotations/NonNull.java | 0 .../edu/umd/cs/findbugs/annotations/Nullable.java | 0 .../umd/cs/findbugs/annotations/PossiblyNull.java | 0 .../cs/findbugs/annotations/UnknownNullness.java | 0 .../io/reactivex/annotations/NonNull.java | 0 .../io/reactivex/annotations/Nullable.java | 0 .../annotations/javax/annotation/CheckForNull.java | 0 .../annotations/javax/annotation/Nonnull.java | 0 .../annotations/javax/annotation/Nullable.java | 0 .../annotation/ParametersAreNonnullByDefault.java | 0 .../javax/annotation/meta/TypeQualifier.java | 0 .../annotation/meta/TypeQualifierDefault.java | 0 .../annotation/meta/TypeQualifierNickname.java | 0 .../annotation/meta/TypeQualifierValidator.java | 0 .../annotations/javax/annotation/meta/When.java | 0 .../annotations/lombok/NonNull.java | 0 .../org/eclipse/jdt/annotation/NonNull.java | 0 .../org/eclipse/jdt/annotation/Nullable.java | 0 .../javax/annotation/CheckForNull.java | 0 .../javax/annotation/Nonnull.java | 0 .../javax/annotation/Nullable.java | 0 .../annotation/ParametersAreNonnullByDefault.java | 0 .../javax/annotation/meta/TypeQualifier.java | 0 .../annotation/meta/TypeQualifierDefault.java | 0 .../annotation/meta/TypeQualifierNickname.java | 0 .../annotation/meta/TypeQualifierValidator.java | 0 .../javax/annotation/meta/When.java | 0 .../checker/nullness/qual/NonNull.java | 0 .../checker/nullness/qual/Nullable.java | 0 .../org/eclipse/jdt/annotation/NonNull.java | 0 .../org/eclipse/jdt/annotation/Nullable.java | 0 41 files changed, 11 insertions(+), 11 deletions(-) rename {compiler/testData/foreignAnnotations => third-party}/annotations/android/support/annotation/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/android/support/annotation/Nullable.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/com/android/annotations/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/com/android/annotations/Nullable.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/edu/umd/cs/findbugs/annotations/CheckForNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/edu/umd/cs/findbugs/annotations/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/edu/umd/cs/findbugs/annotations/Nullable.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/io/reactivex/annotations/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/io/reactivex/annotations/Nullable.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/CheckForNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/Nonnull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/Nullable.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/ParametersAreNonnullByDefault.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/meta/TypeQualifier.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/meta/TypeQualifierDefault.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/meta/TypeQualifierNickname.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/meta/TypeQualifierValidator.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/javax/annotation/meta/When.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/lombok/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/org/eclipse/jdt/annotation/NonNull.java (100%) rename {compiler/testData/foreignAnnotations => third-party}/annotations/org/eclipse/jdt/annotation/Nullable.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/CheckForNull.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/Nonnull.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/Nullable.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/ParametersAreNonnullByDefault.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/meta/TypeQualifier.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/meta/TypeQualifierDefault.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/meta/TypeQualifierNickname.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/meta/TypeQualifierValidator.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/javax/annotation/meta/When.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/org/checkerframework/checker/nullness/qual/NonNull.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/org/checkerframework/checker/nullness/qual/Nullable.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/org/eclipse/jdt/annotation/NonNull.java (100%) rename {compiler/testData/foreignAnnotationsJava8/annotations => third-party/jdk8-annotations}/org/eclipse/jdt/annotation/Nullable.java (100%) diff --git a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml index c6d4241d727..311d82c03a8 100644 --- a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml +++ b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index 32df4acffdd..7013b4d26e3 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.utils.Jsr305State import java.io.File -val FOREIGN_ANNOTATIONS_SOURCES_PATH = "compiler/testData/foreignAnnotations/annotations" +val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations" val TEST_ANNOTATIONS_SOURCE_PATH = "compiler/testData/foreignAnnotations/testAnnotations" abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt index 5cd516a0f39..8556fbc5059 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt @@ -18,5 +18,5 @@ package org.jetbrains.kotlin.checkers abstract class AbstractForeignJava8AnnotationsTest : AbstractForeignAnnotationsTest() { override val annotationsPath: String - get() = "compiler/testData/foreignAnnotationsJava8/annotations" + get() = "third-party/jdk8-annotations" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt index cfda3a94a2c..4ef3108388d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.utils.Jsr305State class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor { - val foreignAnnotationsJar = MockLibraryUtil.compileJvmLibraryToJar("compiler/testData/foreignAnnotations/annotations", "foreign-annotations") + val foreignAnnotationsJar = MockLibraryUtil.compileJvmLibraryToJar("third-party/annotations", "foreign-annotations") val libraryJar = MockLibraryUtil.compileJvmLibraryToJar("idea/testData/highlighterJsr305/library", "jsr305-library", extraClasspath = listOf(foreignAnnotationsJar.absolutePath)) return object : KotlinJdkAndLibraryProjectDescriptor( diff --git a/license/README.md b/license/README.md index 6eea52cdfc9..c361b5fd3cb 100644 --- a/license/README.md +++ b/license/README.md @@ -70,31 +70,31 @@ the Kotlin IntelliJ IDEA plugin: The following source code is used for testing the Kotlin compiler and/or plugin and is not incorporated into any distributions of the compiler, libraries or plugin: - - Path: compiler/testData/foreignAnnotations/annotations/android + - Path: third-party/annotations/android - License: Apache 2 (license/third_party/aosp_license.txt) - Origin: Copyright (C) 2011-15 The Android Open Source Project - - Path: compiler/testData/foreignAnnotations/annotations/com/android + - Path: third-party/annotations/com/android - License: Apache 2 (license/third_party/aosp_license.txt) - Origin: Copyright (C) 2011-15 The Android Open Source Project - - Path: compiler/testData/foreignAnnotations/annotations/org/eclipse + - Path: third-party/annotations/org/eclipse - License: Eclipse Public License v1.0 (license/third_party/testdata/eclipse_license.txt) - Origin: Eclipse JDT, Copyright (c) 2011, 2013 Stephan Herrmann and others. - - Path: compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs + - Path: third-party/annotations/edu/umd/cs/findbugs - License: LGPL 2.1 (license/third_party/testdata/findbugs_license.txt) - Origin: Bytecode Analysis Framework, Copyright (C) 2005 University of Maryland - - Path: compiler/testData/foreignAnnotationsJava8/annotations/org/eclipse + - Path: third-party/jdk8-annotations/org/eclipse - License: Eclipse Public License v1.0 (license/third_party/testdata/eclipse_license.txt) - Origin: Eclipse JDT, Copyright (c) 2011, 2013 Stephan Herrmann and others. - - Path: compiler/testData/foreignAnnotations/annotations/io/reactivex + - Path: third-party/annotations/io/reactivex - License: Apache 2 (license/third_party/testdata/rxjava_license.txt) - Origin: RxJava, Copyright (c) 2016-present, RxJava Contributors - - Path: compiler/testData/foreignAnnotations/annotations/lombok + - Path: third-party/annotations/lombok - License: MIT (license/third_party/testdata/lombok_license.txt) - Origin: Project Lombok, Copyright (C) 2009-2013 The Project Lombok Authors diff --git a/compiler/testData/foreignAnnotations/annotations/android/support/annotation/NonNull.java b/third-party/annotations/android/support/annotation/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/android/support/annotation/NonNull.java rename to third-party/annotations/android/support/annotation/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/android/support/annotation/Nullable.java b/third-party/annotations/android/support/annotation/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/android/support/annotation/Nullable.java rename to third-party/annotations/android/support/annotation/Nullable.java diff --git a/compiler/testData/foreignAnnotations/annotations/com/android/annotations/NonNull.java b/third-party/annotations/com/android/annotations/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/com/android/annotations/NonNull.java rename to third-party/annotations/com/android/annotations/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/com/android/annotations/Nullable.java b/third-party/annotations/com/android/annotations/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/com/android/annotations/Nullable.java rename to third-party/annotations/com/android/annotations/Nullable.java diff --git a/compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/CheckForNull.java b/third-party/annotations/edu/umd/cs/findbugs/annotations/CheckForNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/CheckForNull.java rename to third-party/annotations/edu/umd/cs/findbugs/annotations/CheckForNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/NonNull.java b/third-party/annotations/edu/umd/cs/findbugs/annotations/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/NonNull.java rename to third-party/annotations/edu/umd/cs/findbugs/annotations/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/Nullable.java b/third-party/annotations/edu/umd/cs/findbugs/annotations/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/Nullable.java rename to third-party/annotations/edu/umd/cs/findbugs/annotations/Nullable.java diff --git a/compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java b/third-party/annotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java rename to third-party/annotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java b/third-party/annotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java rename to third-party/annotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java diff --git a/compiler/testData/foreignAnnotations/annotations/io/reactivex/annotations/NonNull.java b/third-party/annotations/io/reactivex/annotations/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/io/reactivex/annotations/NonNull.java rename to third-party/annotations/io/reactivex/annotations/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/io/reactivex/annotations/Nullable.java b/third-party/annotations/io/reactivex/annotations/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/io/reactivex/annotations/Nullable.java rename to third-party/annotations/io/reactivex/annotations/Nullable.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/CheckForNull.java b/third-party/annotations/javax/annotation/CheckForNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/CheckForNull.java rename to third-party/annotations/javax/annotation/CheckForNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/Nonnull.java b/third-party/annotations/javax/annotation/Nonnull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/Nonnull.java rename to third-party/annotations/javax/annotation/Nonnull.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/Nullable.java b/third-party/annotations/javax/annotation/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/Nullable.java rename to third-party/annotations/javax/annotation/Nullable.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/ParametersAreNonnullByDefault.java b/third-party/annotations/javax/annotation/ParametersAreNonnullByDefault.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/ParametersAreNonnullByDefault.java rename to third-party/annotations/javax/annotation/ParametersAreNonnullByDefault.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifier.java b/third-party/annotations/javax/annotation/meta/TypeQualifier.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifier.java rename to third-party/annotations/javax/annotation/meta/TypeQualifier.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierDefault.java b/third-party/annotations/javax/annotation/meta/TypeQualifierDefault.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierDefault.java rename to third-party/annotations/javax/annotation/meta/TypeQualifierDefault.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierNickname.java b/third-party/annotations/javax/annotation/meta/TypeQualifierNickname.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierNickname.java rename to third-party/annotations/javax/annotation/meta/TypeQualifierNickname.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierValidator.java b/third-party/annotations/javax/annotation/meta/TypeQualifierValidator.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/TypeQualifierValidator.java rename to third-party/annotations/javax/annotation/meta/TypeQualifierValidator.java diff --git a/compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/When.java b/third-party/annotations/javax/annotation/meta/When.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/javax/annotation/meta/When.java rename to third-party/annotations/javax/annotation/meta/When.java diff --git a/compiler/testData/foreignAnnotations/annotations/lombok/NonNull.java b/third-party/annotations/lombok/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/lombok/NonNull.java rename to third-party/annotations/lombok/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/org/eclipse/jdt/annotation/NonNull.java b/third-party/annotations/org/eclipse/jdt/annotation/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/org/eclipse/jdt/annotation/NonNull.java rename to third-party/annotations/org/eclipse/jdt/annotation/NonNull.java diff --git a/compiler/testData/foreignAnnotations/annotations/org/eclipse/jdt/annotation/Nullable.java b/third-party/annotations/org/eclipse/jdt/annotation/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotations/annotations/org/eclipse/jdt/annotation/Nullable.java rename to third-party/annotations/org/eclipse/jdt/annotation/Nullable.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/CheckForNull.java b/third-party/jdk8-annotations/javax/annotation/CheckForNull.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/CheckForNull.java rename to third-party/jdk8-annotations/javax/annotation/CheckForNull.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/Nonnull.java b/third-party/jdk8-annotations/javax/annotation/Nonnull.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/Nonnull.java rename to third-party/jdk8-annotations/javax/annotation/Nonnull.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/Nullable.java b/third-party/jdk8-annotations/javax/annotation/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/Nullable.java rename to third-party/jdk8-annotations/javax/annotation/Nullable.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/ParametersAreNonnullByDefault.java b/third-party/jdk8-annotations/javax/annotation/ParametersAreNonnullByDefault.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/ParametersAreNonnullByDefault.java rename to third-party/jdk8-annotations/javax/annotation/ParametersAreNonnullByDefault.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifier.java b/third-party/jdk8-annotations/javax/annotation/meta/TypeQualifier.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifier.java rename to third-party/jdk8-annotations/javax/annotation/meta/TypeQualifier.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierDefault.java b/third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierDefault.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierDefault.java rename to third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierDefault.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierNickname.java b/third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierNickname.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierNickname.java rename to third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierNickname.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierValidator.java b/third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierValidator.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/TypeQualifierValidator.java rename to third-party/jdk8-annotations/javax/annotation/meta/TypeQualifierValidator.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/When.java b/third-party/jdk8-annotations/javax/annotation/meta/When.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/javax/annotation/meta/When.java rename to third-party/jdk8-annotations/javax/annotation/meta/When.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/org/checkerframework/checker/nullness/qual/NonNull.java b/third-party/jdk8-annotations/org/checkerframework/checker/nullness/qual/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/org/checkerframework/checker/nullness/qual/NonNull.java rename to third-party/jdk8-annotations/org/checkerframework/checker/nullness/qual/NonNull.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/org/checkerframework/checker/nullness/qual/Nullable.java b/third-party/jdk8-annotations/org/checkerframework/checker/nullness/qual/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/org/checkerframework/checker/nullness/qual/Nullable.java rename to third-party/jdk8-annotations/org/checkerframework/checker/nullness/qual/Nullable.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/org/eclipse/jdt/annotation/NonNull.java b/third-party/jdk8-annotations/org/eclipse/jdt/annotation/NonNull.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/org/eclipse/jdt/annotation/NonNull.java rename to third-party/jdk8-annotations/org/eclipse/jdt/annotation/NonNull.java diff --git a/compiler/testData/foreignAnnotationsJava8/annotations/org/eclipse/jdt/annotation/Nullable.java b/third-party/jdk8-annotations/org/eclipse/jdt/annotation/Nullable.java similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/annotations/org/eclipse/jdt/annotation/Nullable.java rename to third-party/jdk8-annotations/org/eclipse/jdt/annotation/Nullable.java