Skip to content

Commit bc5d7a3

Browse files
committed
Merge pull request #1838 from dsyer
* pr/1838: Upgrade Protobuf Maven Plugin to 3.4.2 Closes gh-1838
2 parents 347d9f7 + fd4c0e2 commit bc5d7a3

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
class GrpcMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
3131

32-
private static final String PROTOBUF_PLUGIN_VERSION = "3.3.1";
32+
private static final String PROTOBUF_PLUGIN_VERSION = "3.4.2";
3333

3434
private final String protobufJavaVersion;
3535

@@ -58,7 +58,6 @@ private void addProtobufPlugin(MavenPluginContainer plugins, VersionProperty pro
5858
plugins.add("io.github.ascopes", "protobuf-maven-plugin", (plugin) -> {
5959
plugin.version(PROTOBUF_PLUGIN_VERSION);
6060
plugin.configuration((configuration) -> {
61-
configuration.add("sourceDirectories", (builder) -> builder.add("sourceDirectory", "src/main/proto"));
6261
configuration.add("protocVersion", "${%s}".formatted(protobufJava.toStandardFormat()));
6362
configuration.add("binaryMavenPlugins", (builder) -> {
6463
builder.add("binaryMavenPlugin", (binary) -> {
@@ -69,10 +68,7 @@ private void addProtobufPlugin(MavenPluginContainer plugins, VersionProperty pro
6968
});
7069
});
7170
});
72-
plugin.execution("generate", (execution) -> {
73-
execution.m2e("execute onConfiguration,onIncremental");
74-
execution.goal("generate");
75-
});
71+
plugin.execution("generate", (execution) -> execution.goal("generate"));
7672
});
7773
}
7874

start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,8 @@ void shouldAddProtobufPluginForMaven() {
123123
<plugin>
124124
<groupId>io.github.ascopes</groupId>
125125
<artifactId>protobuf-maven-plugin</artifactId>
126-
<version>3.3.1</version>
126+
<version>3.4.2</version>
127127
<configuration>
128-
<sourceDirectories>
129-
<sourceDirectory>src/main/proto</sourceDirectory>
130-
</sourceDirectories>
131128
<protocVersion>${protobuf-java.version}</protocVersion>
132129
<binaryMavenPlugins>
133130
<binaryMavenPlugin>
@@ -140,7 +137,6 @@ void shouldAddProtobufPluginForMaven() {
140137
</configuration>
141138
<executions>
142139
<execution>
143-
<?m2e execute onConfiguration,onIncremental?>
144140
<id>generate</id>
145141
<goals>
146142
<goal>generate</goal>

0 commit comments

Comments
 (0)