From 0cf90eff024954ca9ca3dd2b49c067e7ac574fe9 Mon Sep 17 00:00:00 2001
From: fuzi1996 <imfuzi@163.com>
Date: Fri, 25 Mar 2022 21:59:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(dbapi-ui):=E7=BC=BA=E5=B0=91org.codehau?=
 =?UTF-8?q?s.mojo:exec-maven-plugin=E7=89=88=E6=9C=AC=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbapi-ui/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dbapi-ui/pom.xml b/dbapi-ui/pom.xml
index 8a08666..381ec04 100644
--- a/dbapi-ui/pom.xml
+++ b/dbapi-ui/pom.xml
@@ -23,6 +23,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>exec-npm-install</id>
-- 
Gitee


From f2d47e1a8fe972e9d8cf16fa1c496a137c5e49eb Mon Sep 17 00:00:00 2001
From: fuzi1996 <imfuzi@163.com>
Date: Fri, 25 Mar 2022 22:37:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore(dbapi):=E6=B7=BB=E5=8A=A0=E6=99=AE?=
 =?UTF-8?q?=E9=80=9Ajar=E5=8C=85=E4=B8=8E=E5=86=B2=E7=AA=81jar=E5=8C=85?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index eefde94..8383394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,27 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <docker.image.prefix>freakchicken</docker.image.prefix>
+        <!-- 普通jar包版本定义 -->
+        <com.fasterxml.jackson.core.jackson-databind.version>2.12.2</com.fasterxml.jackson.core.jackson-databind.version>
+        <!-- 冲突jar包版本定义 -->
+        <log4j.log4j.version>1.2.17</log4j.log4j.version>
+        <org.apache.avro.avro.version>1.7.5</org.apache.avro.avro.version>
+        <commons-codec.commons-codec.version>1.15</commons-codec.commons-codec.version>
+        <commons-collections.commons-collections.version>3.2.2</commons-collections.commons-collections.version>
+        <commons-configuration.commons-configuration.version>1.8</commons-configuration.commons-configuration.version>
+        <commons-io.commons-io.version>2.6</commons-io.commons-io.version>
+        <commons-lang.commons-lang.version>2.6</commons-lang.commons-lang.version>
+        <commons-logging.commons-logging.version>1.1.3</commons-logging.commons-logging.version>
+        <org.apache.curator.curator-client.version>2.7.1</org.apache.curator.curator-client.version>
+        <org.apache.hadoop.hadoop-annotations.version>2.7.5</org.apache.hadoop.hadoop-annotations.version>
+        <org.codehaus.jackson.jackson-core-asl.version>1.9.13</org.codehaus.jackson.jackson-core-asl.version>
+        <org.codehaus.jackson.jackson-jaxrs.version>1.8.3</org.codehaus.jackson.jackson-jaxrs.version>
+        <org.codehaus.jackson.jackson-mapper-asl.version>1.9.13</org.codehaus.jackson.jackson-mapper-asl.version>
+        <org.codehaus.jackson.jackson-xc.version>1.9.13</org.codehaus.jackson.jackson-xc.version>
+        <com.sun.jersey.jersey-client.version>1.19.1</com.sun.jersey.jersey-client.version>
+        <com.sun.jersey.jersey-core.version>1.19.1</com.sun.jersey.jersey-core.version>
+        <com.sun.jersey.jersey-json.version>1.9</com.sun.jersey.jersey-json.version>
+        <com.google.code.findbugs.jsr305.version>3.0.0</com.google.code.findbugs.jsr305.version>
     </properties>
 
     <profiles>
@@ -161,7 +182,13 @@
                 <artifactId>dbapi-controller</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- 普通jar包版本定义 -->
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${com.fasterxml.jackson.core.jackson-databind.version}</version>
+            </dependency>
+            <!-- 冲突jar包版本定义 -->
             <dependency>
                 <groupId>com.gitee.freakchicken.dbapi</groupId>
                 <artifactId>dbapi-standalone</artifactId>
@@ -182,7 +209,96 @@
                 <artifactId>dbapi-cluster-apiServer</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>${log4j.log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro</artifactId>
+                <version>${org.apache.avro.avro.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.commons-codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons-collections.commons-collections.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-configuration</groupId>
+                <artifactId>commons-configuration</artifactId>
+                <version>${commons-configuration.commons-configuration.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>${commons-lang.commons-lang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.commons-logging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+                <version>${org.apache.curator.curator-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-annotations</artifactId>
+                <version>${org.apache.hadoop.hadoop-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>${org.codehaus.jackson.jackson-core-asl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>${org.codehaus.jackson.jackson-jaxrs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>${org.codehaus.jackson.jackson-mapper-asl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-xc</artifactId>
+                <version>${org.codehaus.jackson.jackson-xc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${com.sun.jersey.jersey-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+                <version>${com.sun.jersey.jersey-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+                <version>${com.sun.jersey.jersey-json.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${com.google.code.findbugs.jsr305.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
Gitee