This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit c9012d40077676b9ca6ebd4669077c6af463b41f Author: lahiruj <[email protected]> AuthorDate: Fri Mar 28 11:29:47 2025 -0400 initial research framework --- modules/research-framework/pom.xml | 4 +- .../proto/research-service.proto | 11 +++++ .../research-framework/research-service/pom.xml | 55 +++++++--------------- .../research/ResearchServiceApplication.java | 13 +++++ 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/modules/research-framework/pom.xml b/modules/research-framework/pom.xml index e6fe929a36..e4d7ffa322 100644 --- a/modules/research-framework/pom.xml +++ b/modules/research-framework/pom.xml @@ -17,8 +17,8 @@ </modules> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> </project> \ No newline at end of file diff --git a/modules/research-framework/proto/research-service.proto b/modules/research-framework/proto/research-service.proto new file mode 100644 index 0000000000..688ad4a9bc --- /dev/null +++ b/modules/research-framework/proto/research-service.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package org.apache.airavata.agent; + +option java_multiple_files = true; +option java_package = "org.apache.airavata.research"; +option java_outer_classname = "ResearchServiceProto"; +option go_package = "protos/"; + +service ResearchService { +} \ No newline at end of file diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml index 0cea8263b8..434f69278b 100644 --- a/modules/research-framework/research-service/pom.xml +++ b/modules/research-framework/research-service/pom.xml @@ -11,21 +11,6 @@ <artifactId>research-service</artifactId> - <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jul-to-slf4j.version>1.7.0</jul-to-slf4j.version> - <json.version>20240303</json.version> - <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> - <research.service.dist.name>research-service-0.01</research.service.dist.name> - </properties> - <dependencyManagement> <dependencies> <dependency> @@ -42,7 +27,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>1.5.7</version> + <version>${mariadb-java-client.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -100,16 +85,6 @@ <artifactId>grpc-server-spring-boot-starter</artifactId> <version>3.0.0.RELEASE</version> </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>${javax.version}</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.2</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-api-stubs</artifactId> @@ -127,7 +102,7 @@ <extension> <groupId>kr.motd.maven</groupId> <artifactId>os-maven-plugin</artifactId> - <version>1.7.0</version> + <version>${os-maven-plugin.version}</version> </extension> </extensions> @@ -145,7 +120,7 @@ </goals> <configuration> <tarLongFileMode>posix</tarLongFileMode> - <finalName>${research.service.dist.name}</finalName> + <finalName>research-service-0.01</finalName> <descriptors> <descriptor>src/main/assembly/research-service-bin-assembly.xml</descriptor> </descriptors> @@ -155,21 +130,19 @@ </executions> </plugin> <plugin> - <groupId>org.xolstice.maven.plugins</groupId> + <groupId>io.github.ascopes</groupId> <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-plugin.version}</version> + <version>${protobuf-maven-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>${protobuf-java.version}</protocVersion> + <sourceDirectories> + <sourceDirectory>${project.basedir}/../proto</sourceDirectory> + </sourceDirectories> </configuration> <executions> <execution> <goals> - <goal>compile</goal> - <goal>compile-custom</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -177,9 +150,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compiler.plugin.version}</version> <configuration> - <source>15</source> - <target>15</target> + <release>17</release> + <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory> + <includes> + <include>${project.build.directory}/generated-sources/**/*.java</include> + </includes> </configuration> </plugin> <plugin> diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/ResearchServiceApplication.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/ResearchServiceApplication.java new file mode 100644 index 0000000000..0e416e8445 --- /dev/null +++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/ResearchServiceApplication.java @@ -0,0 +1,13 @@ +package org.apache.airavata.research; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication +@EnableJpaRepositories() +public class ResearchServiceApplication { + public static void main(String[] args) { + SpringApplication.run(ResearchServiceApplication.class, args); + } +}
