Prepare for release 25.0.

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=194299979

README.md

@@ -18,30 +18,30 @@ Guava comes in two flavors.
 
 ## Latest release
 
-The most recent release is [Guava 24.1][current release], released 2018-03-14.
+The most recent release is [Guava 25.0][current release], released 2018-04-25.
 
 The Maven group ID is `com.google.guava`, and the artifact ID is `guava`. Use
-version `24.1-jre` for the JRE flavor, or `24.1-android` for the Android flavor.
+version `25.0-jre` for the JRE flavor, or `25.0-android` for the Android flavor.
 
 To add a dependency on Guava using Maven, use the following:
 
 ```xml
 <dependency>
   <groupId>com.google.guava</groupId>
   <artifactId>guava</artifactId>
-  <version>24.1-jre</version>
+  <version>25.0-jre</version>
   <!-- or, for Android: -->
-  <version>24.1-android</version>
+  <version>25.0-android</version>
 </dependency>
 ```
 
 To add a dependency using Gradle:
 
 ```
 dependencies {
-  compile 'com.google.guava:guava:24.1-jre'
+  compile 'com.google.guava:guava:25.0-jre'
   // or, for Android:
-  compile 'com.google.guava:guava:24.1-android'
+  compile 'com.google.guava:guava:25.0-android'
 }
 ```
 
@@ -98,7 +98,7 @@ Linux. Some features, especially in `com.google.common.io`, may not work
 correctly in other environments. For the Android flavor, our unit tests run on
 API level 15 (Ice Cream Sandwich).
 
-[current release]: https://github.com/google/guava/releases/tag/v24.1
+[current release]: https://github.com/google/guava/releases/tag/v25.0
 [guava-snapshot-api-docs]: https://google.github.io/guava/releases/snapshot-jre/api/docs/
 [guava-snapshot-api-diffs]: https://google.github.io/guava/releases/snapshot-jre/api/diffs/
 [Guava Explained]: https://github.com/google/guava/wiki/Home

guava-gwt/test/com/google/common/html/testModule.gwt.xml

@@ -6,7 +6,6 @@
   <inherits name="com.google.common.escape.testing.Testing"/>
   <inherits name="com.google.common.html.Html"/>
   <inherits name="com.google.common.truth.Truth"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
   <entry-point class="com.google.common.html.TestModuleEntryPoint"/>
 
   <source path=""/>

guava/src/com/google/common/cache/CacheBuilder.java

@@ -640,7 +640,7 @@ Strength getValueStrength() {
    * @throws IllegalArgumentException if {@code duration} is negative
    * @throws IllegalStateException if the time to live or time to idle was already set
    * @throws ArithmeticException for durations greater than +/- approximately 292 years
-   * @since NEXT
+   * @since 25.0
    */
   @J2ObjCIncompatible
   @GwtIncompatible // java.time.Duration
@@ -705,7 +705,7 @@ long getExpireAfterWriteNanos() {
    * @throws IllegalArgumentException if {@code duration} is negative
    * @throws IllegalStateException if the time to idle or time to live was already set
    * @throws ArithmeticException for durations greater than +/- approximately 292 years
-   * @since NEXT
+   * @since 25.0
    */
   @J2ObjCIncompatible
   @GwtIncompatible // java.time.Duration
@@ -778,7 +778,7 @@ long getExpireAfterAccessNanos() {
    * @throws IllegalArgumentException if {@code duration} is negative
    * @throws IllegalStateException if the refresh interval was already set
    * @throws ArithmeticException for durations greater than +/- approximately 292 years
-   * @since NEXT
+   * @since 25.0
    */
   @J2ObjCIncompatible
   @GwtIncompatible // java.time.Duration