You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2022/03/16 22:04:38 UTC

[airavata-mft] branch master updated: Optimizing dependency management in services

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git


The following commit(s) were added to refs/heads/master by this push:
     new a0c5e62  Optimizing dependency management in services
a0c5e62 is described below

commit a0c5e62f4f5f16b3f549dbbca30e76eab386ab3f
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Wed Mar 16 18:04:30 2022 -0400

    Optimizing dependency management in services
---
 command-line/pom.xml                     | 10 ++++++----
 services/pom.xml                         | 25 -------------------------
 services/resource-service/server/pom.xml | 25 +++++++++++++++++++++++++
 services/secret-service/server/pom.xml   | 25 +++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/command-line/pom.xml b/command-line/pom.xml
index f26e1cf..520d5ec 100644
--- a/command-line/pom.xml
+++ b/command-line/pom.xml
@@ -42,6 +42,12 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>mft-api-client</artifactId>
             <version>0.01-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
@@ -63,10 +69,6 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <!--mainClass>MinIoS3SimpleExample</mainClass-->
-                            <!--mainClass>MinIOMultipartUpload</mainClass-->
-                            <!--mainClass>MinIOMultipartAdvanced</mainClass-->
-                            <!--mainClass>S3DownloadMultipartExample</mainClass-->
                             <mainClass>org.apache.airavata.mft.command.line.MainRunner</mainClass>
                         </manifest>
                     </archive>
diff --git a/services/pom.xml b/services/pom.xml
index ca3541b..35075a6 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -44,11 +44,6 @@
             <version>${protobuf.java}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.custos</groupId>
-            <artifactId>custos-java-sdk</artifactId>
-            <version>${custos.clients.version}</version>
-        </dependency>
-        <dependency>
             <groupId>io.github.lognet</groupId>
             <artifactId>grpc-spring-boot-starter</artifactId>
             <version>${grpc.spring.boot}</version>
@@ -59,26 +54,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${spring.boot.data.jpa}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-to-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.dozer</groupId>
-            <artifactId>dozer</artifactId>
-            <version>${dozer}</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/services/resource-service/server/pom.xml b/services/resource-service/server/pom.xml
index 3b8712e..c983e77 100644
--- a/services/resource-service/server/pom.xml
+++ b/services/resource-service/server/pom.xml
@@ -69,6 +69,31 @@
             <artifactId>drms-stubs</artifactId>
             <version>0.01-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.custos</groupId>
+            <artifactId>custos-java-sdk</artifactId>
+            <version>${custos.clients.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${spring.boot.data.jpa}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.dozer</groupId>
+            <artifactId>dozer</artifactId>
+            <version>${dozer}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/services/secret-service/server/pom.xml b/services/secret-service/server/pom.xml
index 6870fc3..be48bfd 100644
--- a/services/secret-service/server/pom.xml
+++ b/services/secret-service/server/pom.xml
@@ -83,6 +83,31 @@
             <artifactId>drms-stubs</artifactId>
             <version>0.01-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.custos</groupId>
+            <artifactId>custos-java-sdk</artifactId>
+            <version>${custos.clients.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${spring.boot.data.jpa}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.dozer</groupId>
+            <artifactId>dozer</artifactId>
+            <version>${dozer}</version>
+        </dependency>
     </dependencies>
 
     <build>