From 1afc61295f093834035e41c9eab9dd415cd2c956 Mon Sep 17 00:00:00 2001 From: weixiao Date: Wed, 22 Nov 2023 00:51:09 -0600 Subject: [PATCH] Optimize HBase engine dependencies and move java exception class from scala package to java package. (#4976) Co-authored-by: Longping Jie --- .../hbase/hbase-core/pom.xml | 192 ++++++++++++++++++ .../exception/ExecutorInitException.java | 0 .../hbase/hbase-shims-1.2.0/pom.xml | 36 +--- .../hbase/hbase-shims-1.4.3/pom.xml | 44 +--- .../hbase/hbase-shims-2.2.6/pom.xml | 55 ++--- .../hbase/hbase-shims-2.5.3/pom.xml | 40 +--- 6 files changed, 221 insertions(+), 146 deletions(-) rename linkis-engineconn-plugins/hbase/hbase-core/src/main/{scala => java}/org/apache/linkis/manager/engineplugin/hbase/exception/ExecutorInitException.java (100%) diff --git a/linkis-engineconn-plugins/hbase/hbase-core/pom.xml b/linkis-engineconn-plugins/hbase/hbase-core/pom.xml index cabc4cde1e..28e79f0a79 100644 --- a/linkis-engineconn-plugins/hbase/hbase-core/pom.xml +++ b/linkis-engineconn-plugins/hbase/hbase-core/pom.xml @@ -31,6 +31,198 @@ org.apache.linkis hbase-shims-${hbase.version} ${project.version} + + + com.google.inject + guice + + + + commons-codec + commons-codec + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + commons-lang + commons-lang + + + commons-cli + commons-cli + + + commons-collections + commons-collections + + + commons-httpclient + commons-httpclient + + + org.apache.commons + commons-math + + + commons-logging + commons-logging + + + commons-lang + commons-lang + + + commons-beanutils + commons-beanutils-core + + + commons-configuration + commons-configuration + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-compress + + + org.apache.commons + commons-crypto + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-auth + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + javax.ws.rs + jsr311-api + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + javax.servlet + javax.servlet-api + + + org.glassfish.web + javax.servlet.jsp + + + javax.servlet.jsp + javax.servlet.jsp-api + + + + org.jruby.jcodings + jcodings + + + org.jruby.joni + joni + + + org.mortbay.jetty + jsp-api-2.1 + + + org.mortbay.jetty + servlet-api-2.5 + + + xml-apis + xml-apis + + + xml-apis + xml-apis-ext + + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + org.glassfish.jersey.containers + jersey-container-servlet-core + + + + org.mortbay.jetty + jsp-2.1 + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.core + jackson-annotations + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + + log4j + log4j + + + org.slf4j + slf4j-api + + diff --git a/linkis-engineconn-plugins/hbase/hbase-core/src/main/scala/org/apache/linkis/manager/engineplugin/hbase/exception/ExecutorInitException.java b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/exception/ExecutorInitException.java similarity index 100% rename from linkis-engineconn-plugins/hbase/hbase-core/src/main/scala/org/apache/linkis/manager/engineplugin/hbase/exception/ExecutorInitException.java rename to linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/exception/ExecutorInitException.java diff --git a/linkis-engineconn-plugins/hbase/hbase-shims-1.2.0/pom.xml b/linkis-engineconn-plugins/hbase/hbase-shims-1.2.0/pom.xml index e05665786f..46bcdd279f 100644 --- a/linkis-engineconn-plugins/hbase/hbase-shims-1.2.0/pom.xml +++ b/linkis-engineconn-plugins/hbase/hbase-shims-1.2.0/pom.xml @@ -43,22 +43,6 @@ hbase-server ${hbase.version} - - commons-codec - commons-codec - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-math3 - org.apache.hadoop hadoop-common @@ -72,29 +56,13 @@ hadoop-mapreduce-client-core - javax.ws.rs - jsr311-api + log4j + log4j org.mortbay.jetty jetty - - org.mortbay.jetty - jetty-util - - - javax.servlet - javax.servlet-api - - - org.glassfish.web - javax.servlet.jsp - - - javax.servlet.jsp - javax.servlet.jsp-api - org.jruby.jcodings jcodings diff --git a/linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/pom.xml b/linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/pom.xml index a687caeecd..218b77d813 100644 --- a/linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/pom.xml +++ b/linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/pom.xml @@ -43,22 +43,6 @@ hbase-server ${hbase.version} - - commons-codec - commons-codec - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-math3 - org.apache.hadoop hadoop-common @@ -71,30 +55,6 @@ org.apache.hadoop hadoop-mapreduce-client-core - - javax.ws.rs - jsr311-api - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - javax.servlet - javax.servlet-api - - - org.glassfish.web - javax.servlet.jsp - - - javax.servlet.jsp - javax.servlet.jsp-api - org.jruby.jcodings jcodings @@ -103,6 +63,10 @@ org.jruby.joni joni + + org.mortbay.jetty + jetty + diff --git a/linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/pom.xml b/linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/pom.xml index 8e14b438d6..c2a3cf6a7b 100644 --- a/linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/pom.xml +++ b/linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/pom.xml @@ -43,22 +43,6 @@ hbase-server ${hbase.version} - - commons-codec - commons-codec - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-math3 - org.apache.hadoop hadoop-common @@ -72,40 +56,39 @@ hadoop-mapreduce-client-core - javax.ws.rs - jsr311-api + org.apache.zookeeper + zookeeper - org.mortbay.jetty - jetty + org.jruby.jcodings + jcodings - org.mortbay.jetty - jetty-util + org.jruby.joni + joni - javax.servlet - javax.servlet-api + org.glassfish + javax.el org.glassfish.web javax.servlet.jsp - - javax.servlet.jsp - javax.servlet.jsp-api - - - org.jruby.jcodings - jcodings - - - org.jruby.joni - joni - + + org.apache.zookeeper + zookeeper + + + + org.apache.zookeeper + zookeeper-jute + ${zookeeper.version} + + org.apache.hbase hbase-testing-util diff --git a/linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/pom.xml b/linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/pom.xml index e1509b16b5..48c8356084 100644 --- a/linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/pom.xml +++ b/linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/pom.xml @@ -42,22 +42,6 @@ org.apache.hbase hbase-server - - commons-codec - commons-codec - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-math3 - org.apache.hadoop hadoop-common @@ -71,33 +55,17 @@ hadoop-mapreduce-client-core - javax.ws.rs - jsr311-api - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util + org.apache.zookeeper + zookeeper - javax.servlet - javax.servlet-api + org.glassfish + javax.el org.glassfish.web javax.servlet.jsp - - javax.servlet.jsp - javax.servlet.jsp-api - - - org.apache.zookeeper - zookeeper - org.jruby.jcodings jcodings