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 77ec8e6449f80c16fda0c46e3bcb2ddcfda40232 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 02:33:42 2026 -0400 feat: update module POMs for Armeria + gRPC stub generation --- airavata-api/pom.xml | 11 +++++++++-- airavata-server/grpc/pom.xml | 33 ++++++++++++++++++++------------- airavata-server/pom.xml | 6 ------ airavata-server/rest/pom.xml | 23 +++-------------------- 4 files changed, 32 insertions(+), 41 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index d2cd8e3ddc..4e5df4028b 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -41,8 +41,8 @@ under the License. <artifactId>protobuf-java</artifactId> </dependency> <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> + <groupId>com.google.api.grpc</groupId> + <artifactId>proto-google-common-protos</artifactId> </dependency> <dependency> <groupId>org.apache.curator</groupId> @@ -353,6 +353,13 @@ under the License. <sourceDirectories> <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory> </sourceDirectories> + <binaryMavenPlugins> + <binaryMavenPlugin> + <groupId>io.grpc</groupId> + <artifactId>protoc-gen-grpc-java</artifactId> + <version>1.73.0</version> + </binaryMavenPlugin> + </binaryMavenPlugins> </configuration> </execution> </executions> diff --git a/airavata-server/grpc/pom.xml b/airavata-server/grpc/pom.xml index 4dac3bbf12..2f6899c80e 100644 --- a/airavata-server/grpc/pom.xml +++ b/airavata-server/grpc/pom.xml @@ -63,20 +63,20 @@ under the License. <version>${project.version}</version> </dependency> - <!-- gRPC --> + <!-- Armeria gRPC --> <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> + <groupId>com.linecorp.armeria</groupId> + <artifactId>armeria-spring-boot3-starter</artifactId> + </dependency> + <dependency> + <groupId>com.linecorp.armeria</groupId> + <artifactId>armeria-grpc</artifactId> + </dependency> + + <!-- Mapping --> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> </dependency> </dependencies> @@ -88,6 +88,13 @@ under the License. <artifactId>maven-compiler-plugin</artifactId> <configuration> <release>17</release> + <annotationProcessorPaths> + <path> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>1.6.3</version> + </path> + </annotationProcessorPaths> </configuration> </plugin> </plugins> diff --git a/airavata-server/pom.xml b/airavata-server/pom.xml index bbc20a42b5..66f9a10f6c 100644 --- a/airavata-server/pom.xml +++ b/airavata-server/pom.xml @@ -44,12 +44,6 @@ under the License. <artifactId>airavata-server-grpc</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-thrift</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/airavata-server/rest/pom.xml b/airavata-server/rest/pom.xml index 5774e4183d..84414c0aa1 100644 --- a/airavata-server/rest/pom.xml +++ b/airavata-server/rest/pom.xml @@ -68,27 +68,10 @@ under the License. <version>${project.version}</version> </dependency> - <!-- Spring Boot --> + <!-- Armeria --> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- OpenAPI --> - <dependency> - <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> - </dependency> - - <!-- Kafka --> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka-clients</artifactId> + <groupId>com.linecorp.armeria</groupId> + <artifactId>armeria-spring-boot3-starter</artifactId> </dependency> </dependencies>
