From 6ba783934409f49eb568ef5b0ac3cd67f04a61ff Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 24 Oct 2022 15:12:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/pom.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/renren-admin/pom.xml b/renren-admin/pom.xml
index f0f5b50a..9d4418de 100644
--- a/renren-admin/pom.xml
+++ b/renren-admin/pom.xml
@@ -41,6 +41,8 @@
         <okhttp.version>3.14.9</okhttp.version>
         <flyway-core.version>8.5.12</flyway-core.version>
         <cas-client-autoconfig-support.version>2.0.0-GA</cas-client-autoconfig-support.version>
+        <contingencyplan.version>1.1.0</contingencyplan.version>
+        <org.json.json.verison>20180130</org.json.json.verison>
         <java.version>1.8</java.version>
     </properties>
 
@@ -226,7 +228,7 @@
             <groupId>com.yawei.oav2</groupId>
             <artifactId>yawei-pso</artifactId>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/yawei-pso-2.0.2.jar</systemPath>
+            <systemPath>${project.basedir}/lib/yawei-pso-${yawei-pso.version}.jar</systemPath>
             <version>${yawei-pso.version}</version>
         </dependency>
         <!-- en ke video -->
@@ -234,14 +236,14 @@
             <groupId>sw.vc3term</groupId>
             <artifactId>contingencyplan</artifactId>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/contingencyplan-1.1.0.jar</systemPath>
-            <version>1.1.0</version>
+            <systemPath>${project.basedir}/lib/contingencyplan-${contingencyplan.version}.jar</systemPath>
+            <version>${contingencyplan.version}</version>
         </dependency>
         <!-- en ke video -->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20180130</version>
+            <version>${org.json.json.verison}</version>
         </dependency>
         <dependency>
             <groupId>com.belerweb</groupId>
@@ -361,8 +363,8 @@
                             <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
                         <manifestEntries>
-                            <Class-Path>. lib/yawei-pso-2.0.2.jar</Class-Path>
-                            <Class-Path>. lib/contingencyplan-1.1.0.jar</Class-Path>
+                            <Class-Path>. lib/yawei-pso-${yawei-pso.version}.jar</Class-Path>
+                            <Class-Path>. lib/contingencyplan-${contingencyplan.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>

From 2104fa597b59fc5190ffae9074b002863fcf37eb Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 24 Oct 2022 17:27:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/renren-admin/pom.xml b/renren-admin/pom.xml
index 9d4418de..16977644 100644
--- a/renren-admin/pom.xml
+++ b/renren-admin/pom.xml
@@ -363,8 +363,7 @@
                             <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
                         <manifestEntries>
-                            <Class-Path>. lib/yawei-pso-${yawei-pso.version}.jar</Class-Path>
-                            <Class-Path>. lib/contingencyplan-${contingencyplan.version}.jar</Class-Path>
+                            <Class-Path>. lib/yawei-pso-${yawei-pso.version}.jar lib/contingencyplan-${contingencyplan.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>