Skip to content

Commit e05a744

Browse files
artur-ciocanuartur-ciocanu
authored
Use xolstice protobuf Maven plugin (#1536)
1 parent 9fc16c2 commit e05a744

File tree

4 files changed

+41
-94
lines changed

4 files changed

+41
-94
lines changed

‎examples/pom.xml‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -154,35 +154,21 @@
154154
<build>
155155
<plugins>
156156
<plugin>
157-
<groupId>com.github.os72</groupId>
158-
<artifactId>protoc-jar-maven-plugin</artifactId>
159-
<version>3.11.4</version>
157+
<groupId>org.xolstice.maven.plugins</groupId>
158+
<artifactId>protobuf-maven-plugin</artifactId>
159+
<version>0.6.1</version>
160+
<configuration>
161+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
162+
<pluginId>grpc-java</pluginId>
163+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
164+
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
165+
</configuration>
160166
<executions>
161167
<execution>
162-
<phase>generate-sources</phase>
163168
<goals>
164-
<goal>run</goal>
169+
<goal>compile</goal>
170+
<goal>compile-custom</goal>
165171
</goals>
166-
<configuration>
167-
<protocVersion>${protobuf.version}</protocVersion>
168-
<addProtoSources>inputs</addProtoSources>
169-
<includeMavenTypes>direct</includeMavenTypes>
170-
<includeStdTypes>true</includeStdTypes>
171-
<inputDirectories>
172-
<include>${protobuf.input.directory}</include>
173-
</inputDirectories>
174-
<outputTargets>
175-
<outputTarget>
176-
<type>java</type>
177-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
178-
</outputTarget>
179-
<outputTarget>
180-
<type>grpc-java</type>
181-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
182-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
183-
</outputTarget>
184-
</outputTargets>
185-
</configuration>
186172
</execution>
187173
</executions>
188174
</plugin>

‎pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.69.0</grpc.version>
1818
<protobuf.version>3.25.5</protobuf.version>
19-
<protocCommand>java-sdk-protoc</protocCommand>
2019
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto</dapr.proto.baseurl>
2120
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
2221
<dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>
@@ -376,6 +375,14 @@
376375
</dependencyManagement>
377376

378377
<build>
378+
<extensions>
379+
<extension>
380+
<groupId>kr.motd.maven</groupId>
381+
<artifactId>os-maven-plugin</artifactId>
382+
<version>1.7.1</version>
383+
</extension>
384+
</extensions>
385+
379386
<pluginManagement>
380387
<plugins>
381388
<plugin>

‎sdk-autogen/pom.xml‎

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
2323
<maven.deploy.skip>false</maven.deploy.skip>
2424
<grpc.version>1.69.0</grpc.version>
25-
<protocCommand>java-sdk-protoc</protocCommand>
2625
<protobuf.version>3.25.5</protobuf.version>
2726
</properties>
2827

@@ -110,52 +109,21 @@
110109
</executions>
111110
</plugin>
112111
<plugin>
113-
<groupId>kr.motd.maven</groupId>
114-
<artifactId>os-maven-plugin</artifactId>
115-
<version>1.7.0</version>
116-
<executions>
117-
<execution>
118-
<goals>
119-
<goal>detect</goal>
120-
</goals>
121-
</execution>
122-
</executions>
123-
</plugin>
124-
<plugin>
125-
<groupId>com.github.os72</groupId>
126-
<artifactId>protoc-jar-maven-plugin</artifactId>
127-
<version>3.11.4</version>
112+
<groupId>org.xolstice.maven.plugins</groupId>
113+
<artifactId>protobuf-maven-plugin</artifactId>
114+
<version>0.6.1</version>
115+
<configuration>
116+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
117+
<pluginId>grpc-java</pluginId>
118+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
119+
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
120+
</configuration>
128121
<executions>
129122
<execution>
130-
<phase>generate-sources</phase>
131123
<goals>
132-
<goal>run</goal>
124+
<goal>compile</goal>
125+
<goal>compile-custom</goal>
133126
</goals>
134-
<configuration>
135-
<protocCommand>java-sdk-protoc</protocCommand>
136-
<protocVersion>${protobuf.version}</protocVersion>
137-
<protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
138-
<addProtoSources>inputs</addProtoSources>
139-
<includeMavenTypes>direct</includeMavenTypes>
140-
<includeStdTypes>true</includeStdTypes>
141-
<inputDirectories>
142-
<include>${protobuf.input.directory}</include>
143-
</inputDirectories>
144-
<includeDirectories>
145-
<include>${protobuf.input.directory}</include>
146-
</includeDirectories>
147-
<outputTargets>
148-
<outputTarget>
149-
<type>java</type>
150-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
151-
</outputTarget>
152-
<outputTarget>
153-
<type>grpc-java</type>
154-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
155-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
156-
</outputTarget>
157-
</outputTargets>
158-
</configuration>
159127
</execution>
160128
</executions>
161129
</plugin>

‎sdk-tests/pom.xml‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -267,35 +267,21 @@
267267
</executions>
268268
</plugin>
269269
<plugin>
270-
<groupId>com.github.os72</groupId>
271-
<artifactId>protoc-jar-maven-plugin</artifactId>
272-
<version>3.11.4</version>
270+
<groupId>org.xolstice.maven.plugins</groupId>
271+
<artifactId>protobuf-maven-plugin</artifactId>
272+
<version>0.6.1</version>
273+
<configuration>
274+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
275+
<pluginId>grpc-java</pluginId>
276+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
277+
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
278+
</configuration>
273279
<executions>
274280
<execution>
275-
<phase>generate-sources</phase>
276281
<goals>
277-
<goal>run</goal>
282+
<goal>compile</goal>
283+
<goal>compile-custom</goal>
278284
</goals>
279-
<configuration>
280-
<protocVersion>${protobuf.version}</protocVersion>
281-
<addProtoSources>inputs</addProtoSources>
282-
<includeMavenTypes>direct</includeMavenTypes>
283-
<includeStdTypes>true</includeStdTypes>
284-
<inputDirectories>
285-
<include>${protobuf.input.directory}</include>
286-
</inputDirectories>
287-
<outputTargets>
288-
<outputTarget>
289-
<type>java</type>
290-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
291-
</outputTarget>
292-
<outputTarget>
293-
<type>grpc-java</type>
294-
<outputDirectory>${protobuf.output.directory}</outputDirectory>
295-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
296-
</outputTarget>
297-
</outputTargets>
298-
</configuration>
299285
</execution>
300286
</executions>
301287
</plugin>

0 commit comments

Comments
 (0)