Fix download of Google Java Format tool

See google/google-java-format#538 Fixes #223
sormuras · Apr 1, 2021 · 298fc10 · 298fc10
1 parent 0f6908d
commit 298fc10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ This project adheres to [JEP 223: New Version-String Scheme](https://openjdk.jav
 
 _In progress..._
 
+### Fixed
+
+- Download of Google Java Formatter tool fixed by upgrading it to version `1.10.0`. [#223]
+
 ## Version [17-ea-2] released 2021-03-31
 
 Bug fixes and minor features.

diff --git a/com.github.sormuras.bach/main/java/com/github/sormuras/bach/tool/GoogleJavaFormat.java b/com.github.sormuras.bach/main/java/com/github/sormuras/bach/tool/GoogleJavaFormat.java
@@ -9,16 +9,14 @@ public record GoogleJavaFormat(Path jar, List<String> arguments)
     implements ExecutableJar<GoogleJavaFormat> {
 
   public static GoogleJavaFormat install(Bach bach) {
-    return install(bach, "1.10-SNAPSHOT");
+    return install(bach, "1.10.0");
   }
 
   public static GoogleJavaFormat install(Bach bach, String version) {
-    var uri =
-        version.equals("1.10-SNAPSHOT")
-            ? "https://oss.sonatype.org/content/repositories/snapshots/com/google/googlejavaformat/google-java-format/1.10-SNAPSHOT/google-java-format-1.10-20210217.055657-9-all-deps.jar"
-            : Maven.central(
-                "com.google.googlejavaformat", "google-java-format", version, "all-deps");
-    var jar = ExecutableJar.load(bach, "google-java-format", version, uri);
+    var group = "com.google.googlejavaformat";
+    var artifact = "google-java-format";
+    var uri = Maven.central(group, artifact, version, "all-deps");
+    var jar = ExecutableJar.load(bach, artifact, version, uri);
     return new GoogleJavaFormat(jar, List.of());
   }
 
@@ -36,9 +34,7 @@ public String name() {
   public Java java() {
     return new Java()
         .add("--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED")
-        .add("--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED")
         .add("--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED")
-        .add("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED")
         .add("--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED")
         .add("--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED")
         .add("--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");