This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/grpc-armeria-migration in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 94869a762ba17b66d84a5980c81b885ba92306f6 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 02:59:20 2026 -0400 fix: remove grpc-server-spring-boot-starter and fix Armeria BOM resolution Remove net.devh:grpc-server-spring-boot-starter from agent-service and research-service since it was removed from parent dependency management during the Armeria migration. Replace @GrpcService annotations with @Component for Armeria-based gRPC service discovery. Remove redundant versionless armeria-spring-boot3-starter and armeria-grpc entries from parent dependencyManagement — the Armeria BOM import already manages these versions. --- airavata-api/agent-service/pom.xml | 14 -------------- .../service/handlers/AgentConnectionHandler.java | 4 ++-- .../agent/connection/service/handlers/FuseFSHandler.java | 4 ++-- airavata-api/research-service/pom.xml | 14 -------------- pom.xml | 9 --------- 5 files changed, 4 insertions(+), 41 deletions(-) diff --git a/airavata-api/agent-service/pom.xml b/airavata-api/agent-service/pom.xml index f2edd09dd0..3a4c4e0898 100644 --- a/airavata-api/agent-service/pom.xml +++ b/airavata-api/agent-service/pom.xml @@ -119,20 +119,6 @@ under the License. </exclusion> </exclusions> </dependency> - <dependency> - <groupId>net.devh</groupId> - <artifactId>grpc-server-spring-boot-starter</artifactId> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-api</artifactId> diff --git a/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java b/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java index e173cbc373..29899d8f7a 100644 --- a/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java +++ b/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java @@ -26,7 +26,7 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import net.devh.boot.grpc.server.service.GrpcService; +import org.springframework.stereotype.Component; import org.apache.airavata.agent.*; import org.apache.airavata.agent.AsyncCommand; import org.apache.airavata.agent.connection.service.config.AgentProperties; @@ -34,7 +34,7 @@ import org.apache.airavata.agent.connection.service.models.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@GrpcService +@Component public class AgentConnectionHandler extends AgentCommunicationServiceGrpc.AgentCommunicationServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(AgentConnectionHandler.class); diff --git a/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java b/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java index 409c99d76d..71daeda694 100644 --- a/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java +++ b/airavata-api/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java @@ -24,12 +24,12 @@ import com.google.protobuf.Timestamp; import io.grpc.stub.StreamObserver; import java.io.File; import java.nio.charset.Charset; -import net.devh.boot.grpc.server.service.GrpcService; +import org.springframework.stereotype.Component; import org.apache.airavata.fuse.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@GrpcService +@Component public class FuseFSHandler extends FuseServiceGrpc.FuseServiceImplBase { private static final Logger LOGGER = LoggerFactory.getLogger(FuseFSHandler.class); diff --git a/airavata-api/research-service/pom.xml b/airavata-api/research-service/pom.xml index 3c2f508b0f..973bc0ac01 100644 --- a/airavata-api/research-service/pom.xml +++ b/airavata-api/research-service/pom.xml @@ -123,20 +123,6 @@ under the License. </exclusion> </exclusions> </dependency> - <dependency> - <groupId>net.devh</groupId> - <artifactId>grpc-server-spring-boot-starter</artifactId> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-api</artifactId> diff --git a/pom.xml b/pom.xml index 5cf67d2b08..8d80441387 100644 --- a/pom.xml +++ b/pom.xml @@ -492,15 +492,6 @@ under the License. <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>com.linecorp.armeria</groupId> - <artifactId>armeria-spring-boot3-starter</artifactId> - </dependency> - <dependency> - <groupId>com.linecorp.armeria</groupId> - <artifactId>armeria-grpc</artifactId> - </dependency> - <!-- Google API Protos --> <dependency> <groupId>com.google.api.grpc</groupId>
