Merge branch 'master' into docker_package
This commit is contained in:
commit
21c2228e87
|
@ -233,9 +233,9 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>sw.vc3term</groupId>
|
<groupId>sw.vc3term</groupId>
|
||||||
<artifactId>contingencyplan</artifactId>
|
<artifactId>contingencyplan</artifactId>
|
||||||
<version>1.1.0</version>
|
|
||||||
<scope>system</scope>
|
<scope>system</scope>
|
||||||
<systemPath>${project.basedir}/lib/contingencyplan-1.1.0.jar</systemPath>
|
<systemPath>${project.basedir}/lib/contingencyplan-1.1.0.jar</systemPath>
|
||||||
|
<version>1.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- en ke video -->
|
<!-- en ke video -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -362,6 +362,7 @@
|
||||||
</manifest>
|
</manifest>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Class-Path>. lib/yawei-pso-2.0.2.jar</Class-Path>
|
<Class-Path>. lib/yawei-pso-2.0.2.jar</Class-Path>
|
||||||
|
<Class-Path>. lib/contingencyplan-1.1.0.jar</Class-Path>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
Loading…
Reference in New Issue