From 044bbe618eb3853a1902e9b704d723658c99366e Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 29 Oct 2026 07:04:12 -0700 Subject: [PATCH] Bundle commonmark in the Eclipse plugin. Markdown Javadoc formatting made `google-java-format` depend on `commonmark` and `commonmark-ext-gfm-tables`, but the Eclipse plugin only bundles the jars it lists explicitly, and those weren't added. Since 1.36.0, formatting in Eclipse has failed with `NoClassDefFoundError: org/commonmark/parser/Parser`. This also updates the plugin's stale version from 1.31.0 to 1.37.0. Regular CI builds the plugin against the `google-java-format` release matching that version, and 1.31.0 predates the commonmark dependency, so its jars weren't available to bundle. Release builds already set the version to the one being released. Fixes https://github.com/google/google-java-format/issues/1428 PiperOrigin-RevId: 1009660207 --- eclipse_plugin/META-INF/MANIFEST.MF | 6 ++++-- eclipse_plugin/build.properties | 4 +++- eclipse_plugin/pom.xml | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/eclipse_plugin/META-INF/MANIFEST.MF b/eclipse_plugin/META-INF/MANIFEST.MF index 684852c45..11e9f758f 100644 --- a/eclipse_plugin/META-INF/MANIFEST.MF +++ b/eclipse_plugin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: google-java-format Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true Bundle-Vendor: Google -Bundle-Version: 1.31.0 +Bundle-Version: 1.37.0 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.jface, @@ -12,4 +12,6 @@ Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.equinox.common Bundle-ClassPath: ., lib/guava.jar, - lib/google-java-format.jar + lib/google-java-format.jar, + lib/commonmark.jar, + lib/commonmark-ext-gfm-tables.jar diff --git a/eclipse_plugin/build.properties b/eclipse_plugin/build.properties index dd1d835c5..6b733ff5e 100644 --- a/eclipse_plugin/build.properties +++ b/eclipse_plugin/build.properties @@ -4,4 +4,6 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ lib/guava.jar,\ - lib/google-java-format.jar + lib/google-java-format.jar,\ + lib/commonmark.jar,\ + lib/commonmark-ext-gfm-tables.jar diff --git a/eclipse_plugin/pom.xml b/eclipse_plugin/pom.xml index 68e09e160..ee03e80af 100644 --- a/eclipse_plugin/pom.xml +++ b/eclipse_plugin/pom.xml @@ -22,7 +22,7 @@ com.google.googlejavaformat google-java-format-eclipse-plugin eclipse-plugin - 1.31.0 + 1.37.0 Google Java Format Plugin for Eclipse 4.5+ @@ -72,7 +72,7 @@ true true true - guava,google-java-format + guava,google-java-format,commonmark,commonmark-ext-gfm-tables