This is an automated email from the ASF dual-hosted git repository.
yasith 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 454f0533a8 Airavata Services Issue Fix (#519)
454f0533a8 is described below
commit 454f0533a80b96c7e03df27467ecf7cef3341b18
Author: Lahiru Jayathilake <[email protected]>
AuthorDate: Wed Jun 18 12:08:51 2025 -0400
Airavata Services Issue Fix (#519)
* included the angus-mail implementation for jakarta mail api and airavata
api client dependency
* included the jakarta activation jar in email monitoring distribution
* fixed grpc incompatible versions issue
* fixed AgentService class not found exception
* updates the grpc and protobuf libraries in research service
---
modules/agent-framework/agent-service/pom.xml | 21 ++++++----
.../src/main/resources/application.yml | 1 -
.../resources/distribution/conf/application.yml | 5 +++
.../main/assembly/email-monitor-bin-assembly.xml | 4 +-
modules/job-monitor/email-monitor/pom.xml | 5 ++-
modules/job-monitor/pom.xml | 7 +++-
.../research-framework/research-service/pom.xml | 45 +++++++++++++++-------
.../src/main/resources/application.yml | 13 +++----
.../resources/distribution/conf/application.yml | 10 ++---
pom.xml | 2 +-
10 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/modules/agent-framework/agent-service/pom.xml
b/modules/agent-framework/agent-service/pom.xml
index 4e90385a45..157aebc711 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -52,6 +52,13 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -100,12 +107,10 @@ under the License.
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -115,7 +120,7 @@ under the License.
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -127,6 +132,11 @@ under the License.
<artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -145,7 +155,7 @@ under the License.
<version>${maven.assembly.plugin}</version>
<executions>
<execution>
- <id>mft-controller-distribution-package</id>
+ <id>agent-service-distribution-package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -193,9 +203,6 @@ under the License.
<version>${maven.compiler.plugin.version}</version>
<configuration>
<release>17</release>
- <includes>
-
<include>${project.build.directory}/generated-sources/**/*.java</include>
- </includes>
</configuration>
</plugin>
<plugin>
diff --git
a/modules/agent-framework/agent-service/src/main/resources/application.yml
b/modules/agent-framework/agent-service/src/main/resources/application.yml
index b2c142bf75..5a971cc7bc 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -53,7 +53,6 @@ airavata:
applicationInterfaceId:
expanse: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
jetstream: UPDATE
-
tunnel:
serverHost: tunnel-server
serverPort: 17000
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
index 9f35d9f5f8..1ec3caaf72 100644
---
a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
+++
b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
@@ -51,3 +51,8 @@ airavata:
applicationInterfaceId:
expanse: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
jetstream: AiravataAgent_f4313e4d-20c2-4bf6-bff1-xcver3343
+ tunnel:
+ serverHost: tunnel-server
+ serverPort: 17000
+ serverToken: servertoken
+ serverApiUrl: http://tunnel-server:8000
\ No newline at end of file
diff --git
a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index 5d81da6f05..a11a12b4ad 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -93,8 +93,8 @@
<include>org.apache.thrift:libthrift:jar</include>
<include>jakarta.mail:jakarta.mail-api:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
- <include>javax.activation:activation:jar</include>
+ <include>org.eclipse.angus:angus-mail:jar</include>
+
<include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.yaml:snakeyaml:jar</include>
<!-- kafka specific jars -->
diff --git a/modules/job-monitor/email-monitor/pom.xml
b/modules/job-monitor/email-monitor/pom.xml
index 12c7083921..6f8f93d0f4 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -40,7 +40,10 @@ under the License.
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index be38222365..fc36991ca5 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -43,7 +43,12 @@ under the License.
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/research-framework/research-service/pom.xml
b/modules/research-framework/research-service/pom.xml
index cdb8c2d7bb..c7c215a58b 100644
--- a/modules/research-framework/research-service/pom.xml
+++ b/modules/research-framework/research-service/pom.xml
@@ -37,9 +37,9 @@ under the License.
<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>
- <grpc.version>1.63.0</grpc.version>
+ <protoc.version>4.30.1</protoc.version>
+ <protobuf-plugin.version>2.12.1</protobuf-plugin.version>
+ <grpc.version>1.71.0</grpc.version>
<research.service.dist.name>research-service-0.01</research.service.dist.name>
</properties>
@@ -52,6 +52,13 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -105,17 +112,20 @@ under the License.
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protoc.version}</version>
</dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
@@ -172,28 +182,35 @@ under the License.
</executions>
</plugin>
<plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
+ <groupId>io.github.ascopes</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>
+ <protocVersion>${protoc.version}</protocVersion>
+ <sourceDirectories>
+
<sourceDirectory>${project.basedir}/src/main/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>compile</goal>
- <goal>compile-custom</goal>
+ <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>
</configuration>
diff --git
a/modules/research-framework/research-service/src/main/resources/application.yml
b/modules/research-framework/research-service/src/main/resources/application.yml
index e59360f7ce..dd0804f754 100644
---
a/modules/research-framework/research-service/src/main/resources/application.yml
+++
b/modules/research-framework/research-service/src/main/resources/application.yml
@@ -19,25 +19,22 @@ grpc:
port: 19908
server:
- port: 18999
+ port: 18889
address: 0.0.0.0
airavata:
research-hub:
- url: https://hub.cybershuttle.org
+ url: https://hub.dev.cybershuttle.org
dev-user: "[email protected]"
adminApiKey: "JUPYTER_ADMIN_API_KEY"
limit: 10
-
research-portal:
- url: http://localhost:5173
-
+ url: https://catalog.dev.cybershuttle.org
openid:
- url:
"https://auth.cybershuttle.org/realms/default/.well-known/openid-configuration";
-
+ url:
"https://auth.dev.cybershuttle.org/realms/default/.well-known/openid-configuration";
user-profile:
server:
- url: api.cybershuttle.org
+ url: api.dev.cybershuttle.org
port: 8962
spring:
diff --git
a/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
b/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
index 6b873d63c2..7722780e0e 100644
---
a/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
+++
b/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
@@ -26,12 +26,12 @@ airavata:
research-hub:
url: https://hub.dev.cybershuttle.org
dev-user: "[email protected]"
+ adminApiKey: "JUPYTER_ADMIN_API_KEY"
+ limit: 10
research-portal:
- url: http://dev.cybershuttle.org
-
+ url: https://catalog.dev.cybershuttle.org
openid:
url:
"https://auth.dev.cybershuttle.org/realms/default/.well-known/openid-configuration";
-
user-profile:
server:
url: api.dev.cybershuttle.org
@@ -52,7 +52,7 @@ spring:
leak-detection-threshold: 20000
jpa:
hibernate:
- ddl-auto: update
+ ddl-auto: none
open-in-view: false
springdoc:
@@ -67,5 +67,3 @@ springdoc:
use-pkce-with-authorization-code-grant: true
client-id: data-catalog-portal
-
-
diff --git a/pom.xml b/pom.xml
index 91c6001904..1f1f91552e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@ under the License.
<xsul5.version>1.2.7</xsul5.version>
<atomixmiser.version>0.9.4</atomixmiser.version>
<fasterxml.jackson.version>2.18.1</fasterxml.jackson.version>
- <jakarta.activation.api.version>2.1.2</jakarta.activation.api.version>
+ <jakarta.activation.api.version>2.1.3</jakarta.activation.api.version>
<jersey.version>1.13</jersey.version>
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.1.3</oa4mp.version>
