Skip to content

Commit 044bbe6

Browse files
cushongoogle-java-format Team
authored andcommitted
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 #1428 PiperOrigin-RevId: 1009660207
1 parent 722d074 commit 044bbe6

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎eclipse_plugin/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: google-java-format
44
Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true
55
Bundle-Vendor: Google
6-
Bundle-Version: 1.31.0
6+
Bundle-Version: 1.37.0
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0",
99
org.eclipse.jface,
@@ -12,4 +12,6 @@ Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0",
1212
org.eclipse.equinox.common
1313
Bundle-ClassPath: .,
1414
lib/guava.jar,
15-
lib/google-java-format.jar
15+
lib/google-java-format.jar,
16+
lib/commonmark.jar,
17+
lib/commonmark-ext-gfm-tables.jar

‎eclipse_plugin/build.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ bin.includes = META-INF/,\
44
.,\
55
plugin.xml,\
66
lib/guava.jar,\
7-
lib/google-java-format.jar
7+
lib/google-java-format.jar,\
8+
lib/commonmark.jar,\
9+
lib/commonmark-ext-gfm-tables.jar

‎eclipse_plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<groupId>com.google.googlejavaformat</groupId>
2323
<artifactId>google-java-format-eclipse-plugin</artifactId>
2424
<packaging>eclipse-plugin</packaging>
25-
<version>1.31.0</version>
25+
<version>1.37.0</version>
2626

2727
<name>Google Java Format Plugin for Eclipse 4.5+</name>
2828

@@ -72,7 +72,7 @@
7272
<stripVersion>true</stripVersion>
7373
<overWriteReleases>true</overWriteReleases>
7474
<overWriteSnapshots>true</overWriteSnapshots>
75-
<includeArtifactIds>guava,google-java-format</includeArtifactIds>
75+
<includeArtifactIds>guava,google-java-format,commonmark,commonmark-ext-gfm-tables</includeArtifactIds>
7676
</configuration>
7777
</plugin>
7878

0 commit comments

Comments
 (0)