Update javac version

See #169

MOE_MIGRATED_REVID=165753177

Author: cushon

core/pom.xml

@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
-      <artifactId>javac</artifactId>
+      <artifactId>javac-shaded</artifactId>
     </dependency>
 
     <!-- Compile-time dependencies -->

core/src/main/java/com/google/googlejavaformat/FormattingError.java

@@ -20,8 +20,8 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import javax.tools.Diagnostic;
-import javax.tools.JavaFileObject;
+import org.openjdk.javax.tools.Diagnostic;
+import org.openjdk.javax.tools.JavaFileObject;
 
 /** An unchecked formatting error. */
 public class FormattingError extends Error {

core/src/main/java/com/google/googlejavaformat/java/Formatter.java

@@ -40,12 +40,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticCollector;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardLocation;
+import org.openjdk.javax.tools.Diagnostic;
+import org.openjdk.javax.tools.DiagnosticCollector;
+import org.openjdk.javax.tools.DiagnosticListener;
+import org.openjdk.javax.tools.JavaFileObject;
+import org.openjdk.javax.tools.SimpleJavaFileObject;
+import org.openjdk.javax.tools.StandardLocation;
 import org.openjdk.tools.javac.file.JavacFileManager;
 import org.openjdk.tools.javac.parser.JavacParser;
 import org.openjdk.tools.javac.parser.ParserFactory;

core/src/main/java/com/google/googlejavaformat/java/JavaInput.java

@@ -39,12 +39,12 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticCollector;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
+import org.openjdk.javax.tools.Diagnostic;
+import org.openjdk.javax.tools.DiagnosticCollector;
+import org.openjdk.javax.tools.DiagnosticListener;
+import org.openjdk.javax.tools.JavaFileObject;
+import org.openjdk.javax.tools.JavaFileObject.Kind;
+import org.openjdk.javax.tools.SimpleJavaFileObject;
 import org.openjdk.tools.javac.file.JavacFileManager;
 import org.openjdk.tools.javac.parser.Tokens.TokenKind;
 import org.openjdk.tools.javac.tree.JCTree.JCCompilationUnit;

core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

@@ -74,7 +74,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import javax.lang.model.element.Name;
+import org.openjdk.javax.lang.model.element.Name;
 import org.openjdk.source.tree.AnnotatedTypeTree;
 import org.openjdk.source.tree.AnnotationTree;
 import org.openjdk.source.tree.ArrayAccessTree;

core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.lang.model.element.Modifier;
+import org.openjdk.javax.lang.model.element.Modifier;
 import org.openjdk.tools.javac.parser.Tokens.TokenKind;
 
 /** Fixes sequences of modifiers to be in JLS order. */

core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java

@@ -36,12 +36,12 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticCollector;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardLocation;
+import org.openjdk.javax.tools.Diagnostic;
+import org.openjdk.javax.tools.DiagnosticCollector;
+import org.openjdk.javax.tools.DiagnosticListener;
+import org.openjdk.javax.tools.JavaFileObject;
+import org.openjdk.javax.tools.SimpleJavaFileObject;
+import org.openjdk.javax.tools.StandardLocation;
 import org.openjdk.source.doctree.DocCommentTree;
 import org.openjdk.source.doctree.ReferenceTree;
 import org.openjdk.source.tree.IdentifierTree;

core/src/main/java/com/google/googlejavaformat/java/Trees.java

@@ -16,7 +16,7 @@
 
 import java.io.IOError;
 import java.io.IOException;
-import javax.lang.model.element.Name;
+import org.openjdk.javax.lang.model.element.Name;
 import org.openjdk.source.tree.ClassTree;
 import org.openjdk.source.tree.CompoundAssignmentTree;
 import org.openjdk.source.tree.ExpressionTree;

pom.xml

@@ -32,8 +32,8 @@
 
   <modules>
     <module>core</module>
-    <module>eclipse_plugin</module>
     <!-- google-java-format#24
+    <module>eclipse_plugin</module>
     <module>idea_plugin</module>
     -->
   </modules>
@@ -96,7 +96,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
     <guava.version>19.0</guava.version>
-    <javac.version>9-dev-r3297-1-shaded</javac.version>
+    <javac.version>9-dev-r4023-3</javac.version>
   </properties>
 
   <dependencyManagement>
@@ -109,7 +109,7 @@
       </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
-        <artifactId>javac</artifactId>
+        <artifactId>javac-shaded</artifactId>
         <version>${javac.version}</version>
       </dependency>