Update some third-party annotations

third-party/java8-annotations/org/jetbrains/annotations/Nullable.java

@@ -27,5 +27,5 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.CLASS)
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.TYPE_USE})
 public @interface Nullable {
-    @NonNls String value() default "";
+    String value() default "";
 }

third-party/java8-annotations/org/jspecify/nullness/NullMarked.java

@@ -1,19 +1,39 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2018-2020 The JSpecify Authors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package org.jspecify.nullness;
 
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
 
+/**
+ * <b>WARNING:</b> This is not the final class name or package name for this annotation. In
+ * addition, we are still discussing questions about semantics, particularly around type-variable
+ * usages. After that, changes and documentation will follow.
+ *
+ * <p>These annotations exist only as a skeleton for the final product. At this point, we are not
+ * even building prototypes that use them.
+ */
 @Documented
-@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE, PACKAGE})
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.CONSTRUCTOR, ElementType.PACKAGE, ElementType.TYPE})
+@Retention(RUNTIME)
 public @interface NullMarked {
-
+    // note for maintainers: When you update this file, please update the file in src/java9 too.
 }

third-party/java8-annotations/org/jspecify/nullness/Nullable.java

@@ -1,14 +1,36 @@
+/*
+ * Copyright 2018-2020 The JSpecify Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jspecify.nullness;
 
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
 
+/**
+ * <b>WARNING:</b> This is not the final package name for this annotation. In addition, we are still
+ * discussing questions about semantics, particularly around type-variable usages. After that,
+ * changes and documentation will follow.
+ *
+ * <p>These annotations exist only as a skeleton for the final product. At this point, we are not
+ * even building prototypes that use them.
+ */
 @Documented
-@Retention(RetentionPolicy.RUNTIME)
+@Target(TYPE_USE)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER})
+@Retention(RUNTIME)
-public @interface Nullable {
+public @interface Nullable {}
-
-}

third-party/java8-annotations/org/jspecify/nullness/NullnessUnspecified.java

@@ -1,19 +1,35 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2018-2020 The JSpecify Authors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package org.jspecify.nullness;
 
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
 
+/**
+ * <b>WARNING:</b> This is not the final class name or package name for this annotation. We are not
+ * even sure if an annotation like this one will make the 1.0 release.
+ *
+ * <p>These annotations exist only as a skeleton for the final product. At this point, we are not
+ * even building prototypes that use them.
+ */
 @Documented
-@Retention(RetentionPolicy.RUNTIME)
+@Target(TYPE_USE)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER})
+@Retention(RUNTIME)
-public @interface NullnessUnspecified {
+public @interface NullnessUnspecified {}
-
-}