Make annotation dependencies non-optional.

Fixes #2721 Discussion: [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=146128219
google · Jan 31, 2017 · 0e29934 · 0e29934
1 parent 7356947
commit 0e29934
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
@@ -43,25 +43,6 @@
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
-    <!-- GWT requires a library's transitive dependencies to be present when
-         compiling a project that uses that library, thanks to its full-program
-         compilation, so we don't use optional=true. -->
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.j2objc</groupId>
-      <artifactId>j2objc-annotations</artifactId>
-      <optional>false</optional>
-    </dependency>
-
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
@@ -25,7 +25,6 @@
     <dependency>
       <groupId>com.google.j2objc</groupId>
       <artifactId>j2objc-annotations</artifactId>
-      <optional>true</optional><!-- needed only for annotations -->
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/guava/pom.xml b/guava/pom.xml
@@ -22,23 +22,19 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <optional>true</optional><!-- needed only for annotations -->
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <optional>true</optional><!-- needed only for annotations -->
     </dependency>
     <dependency>
       <groupId>com.google.j2objc</groupId>
       <artifactId>j2objc-annotations</artifactId>
-      <optional>true</optional><!-- needed only for annotations -->
     </dependency>
     <dependency>
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>animal-sniffer-annotations</artifactId>
       <version>${animal.sniffer.version}</version>
-      <optional>true</optional><!-- needed only for annotations -->
     </dependency>
     <!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
     <!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->