Update to javac9-r3297

MOE_MIGRATED_REVID=141396618
google · Dec 15, 2016 · 567a2f4 · 567a2f4
1 parent 6ebd438
commit 567a2f4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/check_api/pom.xml b/check_api/pom.xml
@@ -62,7 +62,7 @@
       <!-- GPLv2 with Classpath Exception -->
       <groupId>com.google.errorprone</groupId>
       <artifactId>javac</artifactId>
-      <version>1.9.0-dev-r2973-2</version>
+      <version>${javac.version}</version>
     </dependency>
     <dependency>
       <!-- Apache 2.0 -->

diff --git a/core/pom.xml b/core/pom.xml
@@ -111,7 +111,7 @@
       <!-- GPLv2 with Classpath Exception -->
       <groupId>com.google.errorprone</groupId>
       <artifactId>javac</artifactId>
-      <version>1.9.0-dev-r2973-2</version>
+      <version>${javac.version}</version>
     </dependency>
     <dependency>
       <!-- Apache 2.0 -->
@@ -307,7 +307,7 @@
         <configuration>
           <!-- set heap size to work around http://github.com/travis-ci/travis-ci/issues/3396 -->
           <!-- put javac.jar on bootclasspath when executing tests -->
-          <argLine>-Xmx1024m -Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/1.9.0-dev-r2973-2/javac-1.9.0-dev-r2973-2.jar</argLine>
+          <argLine>-Xmx1024m -Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</argLine>
         </configuration>
       </plugin>
     </plugins>

diff --git a/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java b/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java
@@ -46,6 +46,8 @@
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
 import java.io.ByteArrayOutputStream;
+import java.io.IOError;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -451,7 +453,11 @@ private CompilationResult doCompile(
             null,
             fileManager.forResources(getClass(), fileNames.toArray(new String[0])));
 
-    fileManager.close();
+    try {
+      fileManager.close();
+    } catch (IOException e) {
+      throw new IOError(e);
+    }
     return new CompilationResult(task.call(), diagnosticHelper);
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -34,6 +34,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <guava.version>20.0</guava.version>
     <truth.version>0.30</truth.version>
+    <javac.version>9-dev-r3297-1</javac.version>
   </properties>
 
   <modules>

diff --git a/test_helpers/pom.xml b/test_helpers/pom.xml
@@ -68,7 +68,7 @@
       <!-- GPLv2 with Classpath Exception -->
       <groupId>com.google.errorprone</groupId>
       <artifactId>javac</artifactId>
-      <version>1.9.0-dev-r2973-2</version>
+      <version>${javac.version}</version>
     </dependency>
     <dependency>
       <!-- Apache 2.0 -->
@@ -145,7 +145,7 @@
         <configuration>
           <!-- set heap size to work around http://github.com/travis-ci/travis-ci/issues/3396 -->
           <!-- put javac.jar on bootclasspath when executing tests -->
-          <argLine>-Xmx1024m -Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/1.9.0-dev-r2973-2/javac-1.9.0-dev-r2973-2.jar</argLine>
+          <argLine>-Xmx1024m -Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</argLine>
         </configuration>
       </plugin>
     </plugins>