From 63ee14f2eee5096a5d319243528678fde32f1d21 Mon Sep 17 00:00:00 2001
From: wuac <1193300164@qq.com>
Date: Thu, 25 Aug 2022 19:20:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BC=95=E7=94=A8=E6=9C=AC=E5=9C=B0jar?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 piflow-bundle/pom.xml                               | 13 +++++++++++++
 .../java/cn/piflow/conf/util/PluginClassLoader.java |  5 +----
 pom.xml                                             |  6 +++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/piflow-bundle/pom.xml b/piflow-bundle/pom.xml
index 8ced2eae..ac0280e1 100644
--- a/piflow-bundle/pom.xml
+++ b/piflow-bundle/pom.xml
@@ -220,6 +220,8 @@
             <groupId>com.memcached</groupId>
             <artifactId>java_memcached-release</artifactId>
             <version>2.6.6</version>
+            <scope>system</scope>
+			<systemPath>${project.basedir}/lib/java_memcached-release_2.6.6.jar</systemPath>
         </dependency>
 
 
@@ -285,6 +287,8 @@
             <groupId>ftpClient</groupId>
             <artifactId>edtftp</artifactId>
             <version>1.0.0</version>
+            <scope>system</scope>
+			<systemPath>${project.basedir}/lib/edtftpj.jar</systemPath>
         </dependency>
 
 
@@ -311,6 +315,8 @@
             <groupId>oracle</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.3</version>
+            <scope>system</scope>
+			<systemPath>${project.basedir}/lib/ojdbc6-11.2.0.3.jar</systemPath>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver -->
@@ -326,6 +332,13 @@
 			<artifactId>hetu-jdbc</artifactId>
 			<version>1.6.0</version>
 		</dependency>
+		<dependency>
+			<groupId>jdk.tools</groupId>
+			<artifactId>jdk.tools</artifactId>
+			<version>1.8</version>
+			<scope>system</scope>
+			<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
+		</dependency>
     </dependencies>
 
     <build>
diff --git a/piflow-configure/src/main/java/cn/piflow/conf/util/PluginClassLoader.java b/piflow-configure/src/main/java/cn/piflow/conf/util/PluginClassLoader.java
index 268c2c09..a3755148 100644
--- a/piflow-configure/src/main/java/cn/piflow/conf/util/PluginClassLoader.java
+++ b/piflow-configure/src/main/java/cn/piflow/conf/util/PluginClassLoader.java
@@ -40,10 +40,7 @@ public class PluginClassLoader extends URLClassLoader {
     }
 
     private static ClassLoader findParentClassLoader(){
-        ClassLoader parent = PluginManager.class.getClassLoader();
-        if(parent == null){
-            parent = PluginClassLoader.class.getClassLoader();
-        }
+        ClassLoader parent = PluginClassLoader.class.getClassLoader();
         if(parent == null){
             parent = ClassLoader.getSystemClassLoader();
         }
diff --git a/pom.xml b/pom.xml
index 09553434..3e376680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
     <build>
         <!--<sourceDirectory>src/main/scala</sourceDirectory>
         <testSourceDirectory>src/test/scala</testSourceDirectory>-->
-        <plugins>
+        <pluginManagement>
             <!--<plugin>
                 <groupId>org.scala-tools</groupId>
                 <artifactId>maven-scala-plugin</artifactId>
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.4.6</version>
                 <executions>
                     <execution>
                         <id>Scaladoc</id>
@@ -196,7 +196,7 @@
                     </execution>
                 </executions>
             </plugin>-->
-        </plugins>
+        </pluginManagement>
     </build>
     <modules>
         <module>piflow-core</module>
-- 
Gitee