This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 3e97c3aeb7 Agent service - fixed source generation issues
3e97c3aeb7 is described below
commit 3e97c3aeb7babdb81eb0941d6a4993248abe154e
Author: Lahiru Jayathilake <[email protected]>
AuthorDate: Thu Jun 12 15:54:53 2025 -0400
Agent service - fixed source generation issues
---
modules/agent-framework/agent-service/pom.xml | 65 +++++++++++++++------------
modules/agent-framework/pom.xml | 3 --
pom.xml | 1 +
3 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/modules/agent-framework/agent-service/pom.xml
b/modules/agent-framework/agent-service/pom.xml
index 762529efe5..383495f1ac 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,41 @@
</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.parent.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>
+ <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/pom.xml b/modules/agent-framework/pom.xml
index 849e628b1e..e90e23bc56 100644
--- a/modules/agent-framework/pom.xml
+++ b/modules/agent-framework/pom.xml
@@ -31,9 +31,6 @@
<artifactId>agent-framework</artifactId>
<packaging>pom</packaging>
- <modules>
- <module>agent-service</module>
- </modules>
<properties>
<maven.compiler.source>17</maven.compiler.source>
diff --git a/pom.xml b/pom.xml
index 09892cc976..5a4d82a3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@ under the License.
<module>modules/computer-resource-monitoring-service</module>
<module>modules/airavata-metascheduler/metadata-analyzer</module>
<module>modules/agent-framework</module>
+ <module>modules/agent-framework/agent-service</module>
<module>modules/research-framework</module>
<module>tools</module>
<module>modules/ide-integration</module>
