Skip to content

Commit a46a650

Browse files
committed
Migrate doc to use io.github.ascopes and update configurations across modules
Signed-off-by: Daniel Fiala <danfiala23@gmail.com>
1 parent 4013131 commit a46a650

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,14 @@
257257
<pluginParameter>@generated=omit</pluginParameter>
258258
</configuration>
259259
</plugin>
260+
<plugin>
261+
<groupId>io.github.ascopes</groupId>
262+
<artifactId>protobuf-maven-plugin</artifactId>
263+
<version>3.8.2</version>
264+
<configuration>
265+
<protocVersion>${protobuf.version}</protocVersion>
266+
</configuration>
267+
</plugin>
260268
</plugins>
261269
</pluginManagement>
262270
<plugins>
@@ -274,4 +282,4 @@
274282
</plugins>
275283
</build>
276284

277-
</project>
285+
</project>

vertx-grpc-docs/pom.xml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,27 @@
8181
</executions>
8282
</plugin>
8383
<plugin>
84-
<groupId>org.xolstice.maven.plugins</groupId>
84+
<groupId>io.github.ascopes</groupId>
8585
<artifactId>protobuf-maven-plugin</artifactId>
86+
<configuration>
87+
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
88+
<cleanOutputDirectories>false</cleanOutputDirectories>
89+
<jvmMavenPlugins>
90+
<jvmMavenPlugin>
91+
<groupId>io.vertx</groupId>
92+
<artifactId>vertx-grpc-protoc-plugin2</artifactId>
93+
<version>${project.version}</version>
94+
<mainClass>io.vertx.grpc.plugin.VertxGrpcGenerator</mainClass>
95+
<options>grpc-client=true,grpc-service=true,grpc-io=true</options>
96+
</jvmMavenPlugin>
97+
</jvmMavenPlugins>
98+
</configuration>
8699
<executions>
87100
<execution>
88101
<id>compile</id>
89102
<goals>
90-
<goal>compile</goal>
91-
<goal>compile-custom</goal>
103+
<goal>generate</goal>
92104
</goals>
93-
<configuration>
94-
<protocPlugins>
95-
<protocPlugin>
96-
<id>vertx-grpc-protoc-plugin</id>
97-
<groupId>io.vertx</groupId>
98-
<artifactId>vertx-grpc-protoc-plugin2</artifactId>
99-
<version>${project.version}</version>
100-
<mainClass>io.vertx.grpc.plugin.VertxGrpcGenerator</mainClass>
101-
<args>
102-
<arg>--grpc-client</arg>
103-
<arg>--grpc-service</arg>
104-
<arg>--grpc-io</arg>
105-
</args>
106-
</protocPlugin>
107-
</protocPlugins>
108-
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
109-
<clearOutputDirectory>false</clearOutputDirectory>
110-
</configuration>
111105
</execution>
112106
</executions>
113107
</plugin>

vertx-grpc-it/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@
111111
<plugin>
112112
<groupId>io.github.ascopes</groupId>
113113
<artifactId>protobuf-maven-plugin</artifactId>
114-
<version>3.8.2</version>
115114
<configuration>
116-
<protocVersion>${protoc.version}</protocVersion>
117115
<binaryMavenPlugins>
118116
<binaryMavenPlugin>
119117
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)