This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.1.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 6134ef23bfad89ac2054a1e12df75811ffa5237e Author: Jack Xu <[email protected]> AuthorDate: Sat May 7 14:16:36 2022 +0800 feat(cglib): optimized the cglib (#2016) 1. replace the cglib with spring's cglib in linkis-cs-highavailable module, 2. remove cglib dependency in linkis-module module, it's only used by linkis-storage module --- linkis-commons/linkis-module/pom.xml | 5 ----- linkis-commons/linkis-storage/pom.xml | 2 +- .../engineconn-plugins/hive/pom.xml | 4 ++++ .../cs/highavailable/DefaultContextHAManager.java | 6 +++--- .../highavailable/proxy/MethodInterceptorImpl.java | 7 ++++--- .../linkis-metadata-manager/service/hive/pom.xml | 4 ++++ pom.xml | 24 +++++++++++++++++----- tool/dependencies/known-dependencies.txt | 12 +++++------ 8 files changed, 40 insertions(+), 24 deletions(-) diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml index 75b8cb95e..41a969a8c 100644 --- a/linkis-commons/linkis-module/pom.xml +++ b/linkis-commons/linkis-module/pom.xml @@ -314,11 +314,6 @@ <artifactId>validation-api</artifactId> <version>2.0.1.Final</version> </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2.2</version> - </dependency> <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> diff --git a/linkis-commons/linkis-storage/pom.xml b/linkis-commons/linkis-storage/pom.xml index e61e287c2..4c095c2b8 100644 --- a/linkis-commons/linkis-storage/pom.xml +++ b/linkis-commons/linkis-storage/pom.xml @@ -73,8 +73,8 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2.2</version> </dependency> + <dependency> <groupId>com.github.pjfanning</groupId> <artifactId>excel-streaming-reader</artifactId> diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml index c1444e4a1..ca1adc8bd 100644 --- a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml +++ b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml @@ -74,6 +74,10 @@ <artifactId>hive-common</artifactId> <version>${hive.version}</version> <exclusions> + <exclusion> + <groupId>asm</groupId> + <artifactId>*</artifactId> + </exclusion> <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId> diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java index aab44195e..f6c056ce4 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java @@ -28,13 +28,13 @@ import org.apache.linkis.cs.highavailable.proxy.MethodInterceptorImpl; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cglib.proxy.Callback; +import org.springframework.cglib.proxy.Enhancer; import org.springframework.stereotype.Component; -import net.sf.cglib.proxy.Callback; +import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.cglib.proxy.Enhancer; -import com.google.gson.Gson; /** ContextService高可用管理器默认实现 采用CGLib动态代理，一般用于CS持久层存储转换，将HAContextID实例进行转换 */ @Component diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java index f3288ccda..a722666ea 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java @@ -25,11 +25,12 @@ import org.apache.linkis.cs.highavailable.exception.CSErrorCode; import org.apache.commons.lang.StringUtils; -import net.sf.cglib.proxy.MethodInterceptor; +import org.springframework.cglib.proxy.MethodInterceptor; +import org.springframework.cglib.proxy.MethodProxy; + +import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.cglib.proxy.MethodProxy; -import com.google.gson.Gson; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml index f46c3b6ed..1f4379cc0 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml @@ -97,6 +97,10 @@ <artifactId>hive-common</artifactId> <version>${hive.version}</version> <exclusions> + <exclusion> + <groupId>asm</groupId> + <artifactId>*</artifactId> + </exclusion> <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId> diff --git a/pom.xml b/pom.xml index 3762a9b9d..072ba0a20 100644 --- a/pom.xml +++ b/pom.xml @@ -136,16 +136,19 @@ <commons-beanutils.version>1.9.4</commons-beanutils.version> <druid.version>1.1.22</druid.version> <protobuf.version>3.15.8</protobuf.version> - <apache-rat-plugin.version>0.13</apache-rat-plugin.version> - <assembly.package.rootpath>${basedir}</assembly.package.rootpath> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <cglib.version>3.3.0</cglib.version> + <asm-bom.version>9.3</asm-bom.version> <log4j2.version>2.17.2</log4j2.version> <spotless.version>2.4.2</spotless.version> <junit5.version>5.7.2</junit5.version> <mockito.version>3.9.0</mockito.version> <assertj.version>3.17.2</assertj.version> <h2.version>1.4.200</h2.version> + + <apache-rat-plugin.version>0.13</apache-rat-plugin.version> + <assembly.package.rootpath>${basedir}</assembly.package.rootpath> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version> <jacoco.version>0.8.7</jacoco.version> <jacoco.skip>false</jacoco.skip> @@ -769,7 +772,18 @@ <type>pom</type> <scope>import</scope> </dependency> - + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>${cglib.version}</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-bom</artifactId> + <version>${asm-bom.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index bf7cfcf56..0499d09f0 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -22,12 +22,10 @@ apacheds-kerberos-codec-2.0.0-M15.jar api-asn1-api-1.0.0-M20.jar api-util-1.0.0-M20.jar archaius-core-0.7.7.jar -asm-3.3.1.jar -asm-analysis-9.0.jar -asm-commons-3.1.jar -asm-commons-9.0.jar -asm-tree-3.1.jar -asm-tree-9.0.jar +asm-9.3.jar +asm-analysis-9.3.jar +asm-commons-9.3.jar +asm-tree-9.3.jar aspectjweaver-1.9.6.jar audience-annotations-0.5.0.jar avatica-1.8.0.jar @@ -42,7 +40,7 @@ caffeine-2.8.8.jar calcite-core-1.10.0.jar calcite-druid-1.10.0.jar calcite-linq4j-1.10.0.jar -cglib-2.2.2.jar +cglib-3.3.0.jar checker-qual-3.4.0.jar checker-qual-3.5.0.jar checker-qual-3.8.0.jar --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
