This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 54f9d1d9513394078d409ba48494d178be7618b0 Author: yasith <[email protected]> AuthorDate: Mon Mar 17 07:07:37 2025 +0000 change protobuf plugin to a maintained one --- modules/agent-framework/agent-service/pom.xml | 33 ++++++++++------------ .../agent-service/src/main/{proto => protobuf} | 0 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index 29f3cf4c88..bcf7f8de4e 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -20,8 +20,8 @@ <javax.version>2.0.1.Final</javax.version> <apache.commons.lang3.version>3.14.0</apache.commons.lang3.version> <mysql.connector.java>8.0.31</mysql.connector.java> - <protobuf.version>3.23.4</protobuf.version> - <protobuf-plugin.version>0.6.1</protobuf-plugin.version> + <protoc.version>30.1</protoc.version> + <protobuf-plugin.version>2.12.1</protobuf-plugin.version> <grpc.version>1.63.0</grpc.version> <agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name> </properties> @@ -145,22 +145,19 @@ </executions> </plugin> <plugin> - <groupId>org.xolstice.maven.plugins</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-plugin.version}</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> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>compile-custom</goal> - </goals> - </execution> - </executions> + <groupId>io.github.ascopes</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>${protobuf-plugin.version}</version> + <configuration> + <protocVersion>${protoc.version}</protocVersion> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/modules/agent-framework/agent-service/src/main/proto b/modules/agent-framework/agent-service/src/main/protobuf similarity index 100% rename from modules/agent-framework/agent-service/src/main/proto rename to modules/agent-framework/agent-service/src/main/protobuf
