This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch agent-framework-refactoring in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d5d876a8ffe98aa78d97694096a5c522f5d4e189 Author: lahiruj <[email protected]> AuthorDate: Thu Jun 12 11:45:35 2025 -0400 symlinked the proto directory and updated the proto-java build plugin to generate sources correctly --- modules/agent-framework/agent-service/pom.xml | 66 ++++++++++++---------- .../agent-framework/agent-service/src/main/proto | 1 + 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index 762529efe5..08ffa236ff 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -110,9 +110,9 @@ <version>${grpc.version}</version> </dependency> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>${protoc.version}</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protoc.version}</version> </dependency> <dependency> <groupId>net.devh</groupId> @@ -164,34 +164,42 @@ </executions> </plugin> <plugin> - <groupId>io.github.ascopes</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-plugin.version}</version> - <configuration> - <protocVersion>${protoc.version}</protocVersion> - <sourceDirectories> - <sourceDirectory>${project.basedir}/../proto</sourceDirectory> - </sourceDirectories> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> + <groupId>io.github.ascopes</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>${protobuf-plugin.version}</version> + <configuration> + <protocVersion>${protoc.version}</protocVersion> + <sourceDirectories> + <sourceDirectory>${project.basedir}/../proto</sourceDirectory> + </sourceDirectories> + <binaryMavenPlugins> + <binaryMavenPlugin> + <groupId>io.grpc</groupId> + <artifactId>protoc-gen-grpc-java</artifactId> + <version>${grpc.version}</version> + </binaryMavenPlugin> + </binaryMavenPlugins> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <phase>generate-sources</phase> + </execution> + </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven.compiler.plugin.version}</version> - <configuration> - <release>17</release> - <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory> - <includes> - <include>${project.build.directory}/generated-sources/**/*.java</include> - </includes> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compiler.plugin.version}</version> + <configuration> + <release>17</release> + <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory> + <includes> + <include>${project.build.directory}/generated-sources/**/*.java</include> + </includes> + </configuration> </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/proto new file mode 120000 index 0000000000..adcd77d7b0 --- /dev/null +++ b/modules/agent-framework/agent-service/src/main/proto @@ -0,0 +1 @@ +../../../proto \ No newline at end of file
