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

byronhsu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 556ec0e  SUBMARINE-871. Upgrade cglib for Ubuntu 20.04
556ec0e is described below

commit 556ec0e648f5eea99997c47ce3f7f82ba95850b8
Author: KUAN-HSUN-LI <[email protected]>
AuthorDate: Tue Jun 29 10:49:04 2021 +0800

    SUBMARINE-871. Upgrade cglib for Ubuntu 20.04
    
    ### What is this PR for?
    Running userSexDictAnnotationTest will add the DICT_SUFFIX in 
DictAnnotation class.
    Using key with "" will fail in cglib 3.2, but passing in cglib 3.3.
    However, cglib is using asm 7.1, submarine-cluster and submarine-rpc are 
using asm 5.1. We should exclude the asm in both dependencies.
    
    ### What type of PR is it?
    [Test]
    
    ### Todos
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-871
    
    ### How should this be tested?
    run the userSexDictAnnotationTest.
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Do the license files need updating? No
    * Are there breaking changes for older versions? No
    * Does this need new documentation? No
    
    Author: KUAN-HSUN-LI <[email protected]>
    
    Signed-off-by: byronhsu <[email protected]>
    
    Closes #617 from KUAN-HSUN-LI/SUBMARINE-871 and squashes the following 
commits:
    
    43f3eaa1 [KUAN-HSUN-LI] SUBMARINE-871. Upgrade cglib for Ubuntu 20.04
---
 pom.xml                              |  2 +-
 submarine-server/server-core/pom.xml | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec42c8f..dfe33d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <commons-configuration.version>1.10</commons-configuration.version>
     <commons-httpclient.version>3.1</commons-httpclient.version>
 
-    <cglib.version>3.2.2</cglib.version>
+    <cglib.version>3.3.0</cglib.version>
     <mybatis.version>3.2.8</mybatis.version>
     <mysql-connector-java.version>5.1.41</mysql-connector-java.version>
     <grpc.version>1.25.0</grpc.version>
diff --git a/submarine-server/server-core/pom.xml 
b/submarine-server/server-core/pom.xml
index dda5c63..4bade8a 100644
--- a/submarine-server/server-core/pom.xml
+++ b/submarine-server/server-core/pom.xml
@@ -36,6 +36,12 @@
       <groupId>org.apache.submarine</groupId>
       <artifactId>submarine-commons-cluster</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -43,7 +49,7 @@
       <artifactId>submarine-server-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-jaxrs2</artifactId>
       <version>${io.swagger.version}</version>
@@ -240,6 +246,10 @@
           <groupId>javax.servlet</groupId>
           <artifactId>servlet-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to