wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-24 15:13:09 +08:00
parent fcb9390bc7 6ba7839344
commit edc669f15a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
renren-admin/pom.xml
View File

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