diff --git a/type_annotations/src/main/java/com/google/errorprone/annotations/ImmutableTypeParameter.java b/annotations/src/main/java/com/google/errorprone/annotations/ImmutableTypeParameter.java similarity index 100% rename from type_annotations/src/main/java/com/google/errorprone/annotations/ImmutableTypeParameter.java rename to annotations/src/main/java/com/google/errorprone/annotations/ImmutableTypeParameter.java diff --git a/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java b/annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java similarity index 100% rename from type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java rename to annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java diff --git a/core/pom.xml b/core/pom.xml index fe7614e283e..38b143c3f37 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -49,12 +49,6 @@ error_prone_annotation ${project.version} - - - com.google.errorprone - error_prone_type_annotations - ${project.version} - com.google.errorprone @@ -424,7 +418,6 @@ com.github.kevinstern:software-and-algorithms com.google.errorprone:error_prone_annotation com.google.errorprone:error_prone_annotations - com.google.errorprone:error_prone_type_annotations com.google.errorprone:error_prone_check_api org.pcollections:pcollections com.google.guava:guava diff --git a/pom.xml b/pom.xml index 2b7b6439a0b..697d0298640 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,6 @@ core annotation annotations - type_annotations docgen docgen_processor refaster diff --git a/type_annotations/pom.xml b/type_annotations/pom.xml deleted file mode 100644 index 365123af188..00000000000 --- a/type_annotations/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 4.0.0 - - - com.google.errorprone - error_prone_parent - 1.0-HEAD-SNAPSHOT - - - error-prone type annotations - error_prone_type_annotations - - - - - com.google.errorprone - error_prone_annotations - ${project.version} - provided - - - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - -