[airavata-data-lake] branch master updated: Excluding conflicting dependencies

[di...@apache.org]

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-data-lake.git


The following commit(s) were added to refs/heads/master by this push:
     new 87ead7f  Excluding conflicting dependencies
87ead7f is described below

commit 87ead7f7f93de2461da8ae3d072026a5af02ac6d
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Sep 7 04:03:09 2021 -0400

    Excluding conflicting dependencies
---
 data-resource-management-service/drms-api/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data-resource-management-service/drms-api/pom.xml b/data-resource-management-service/drms-api/pom.xml
index be1b2d3..832de3e 100644
--- a/data-resource-management-service/drms-api/pom.xml
+++ b/data-resource-management-service/drms-api/pom.xml
@@ -47,6 +47,10 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-tcnative-boringssl-static</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -55,7 +59,7 @@
             <version>${spring.boot.data.jpa}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
+                      <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-to-slf4j</artifactId>
                 </exclusion>
             </exclusions>