dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use xolstice protobuf Maven plugin 

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
This commit is contained in:
Artur Ciocanu 2025-08-31 21:06:47 -07:00
parent 8803e0baa1
commit 315ed70771
4 changed files with 41 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/pom.xml
View File

@ -154,35 +154,21 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.os72</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>3.11.4</version> <version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>generate-sources</phase>
<goals> <goals>
<goal>run</goal> <goal>compile</goal>
<goal>compile-custom</goal>
</goals> </goals>
<configuration>
<protocVersion>${protobuf.version}</protocVersion>
<addProtoSources>inputs</addProtoSources>
<includeMavenTypes>direct</includeMavenTypes>
<includeStdTypes>true</includeStdTypes>
<inputDirectories>
<include>${protobuf.input.directory}</include>
</inputDirectories>
<outputTargets>
<outputTarget>
<type>java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

9
pom.xml
View File

@ -16,7 +16,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.69.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protocCommand>java-sdk-protoc</protocCommand>
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto</dapr.proto.baseurl> <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto</dapr.proto.baseurl>
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version> <dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
<dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version> <dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>
@ -376,6 +375,14 @@
</dependencyManagement> </dependencyManagement>
<build> <build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>

54
sdk-autogen/pom.xml
View File

@ -22,7 +22,6 @@
<protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory> <protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
<maven.deploy.skip>false</maven.deploy.skip> <maven.deploy.skip>false</maven.deploy.skip>
<grpc.version>1.69.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protocCommand>java-sdk-protoc</protocCommand>
<protobuf.version>3.25.5</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
</properties> </properties>
@ -110,55 +109,24 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>kr.motd.maven</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>os-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>1.7.0</version> <version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
</configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>detect</goal> <goal>compile</goal>
<goal>compile-custom</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<protocCommand>java-sdk-protoc</protocCommand>
<protocVersion>${protobuf.version}</protocVersion>
<protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
<addProtoSources>inputs</addProtoSources>
<includeMavenTypes>direct</includeMavenTypes>
<includeStdTypes>true</includeStdTypes>
<inputDirectories>
<include>${protobuf.input.directory}</include>
</inputDirectories>
<includeDirectories>
<include>${protobuf.input.directory}</include>
</includeDirectories>
<outputTargets>
<outputTarget>
<type>java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>

36
sdk-tests/pom.xml
View File

@ -267,35 +267,21 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.os72</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>3.11.4</version> <version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>${protobuf.input.directory}</protoSourceRoot>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>generate-sources</phase>
<goals> <goals>
<goal>run</goal> <goal>compile</goal>
<goal>compile-custom</goal>
</goals> </goals>
<configuration>
<protocVersion>${protobuf.version}</protocVersion>
<addProtoSources>inputs</addProtoSources>
<includeMavenTypes>direct</includeMavenTypes>
<includeStdTypes>true</includeStdTypes>
<inputDirectories>
<include>${protobuf.input.directory}</include>
</inputDirectories>
<outputTargets>
<outputTarget>
<type>java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<outputDirectory>${protobuf.output.directory}</outputDirectory>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>