From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/platformProject/vci-platform-web/pom.xml | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/pom.xml b/Source/platformProject/vci-platform-web/pom.xml
index 11b3900..2923196 100644
--- a/Source/platformProject/vci-platform-web/pom.xml
+++ b/Source/platformProject/vci-platform-web/pom.xml
@@ -11,7 +11,7 @@
<artifactId>vci-platform-web</artifactId>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-starter-parent</artifactId>
@@ -21,9 +21,7 @@
<dependency>
<groupId>com.vci.corba</groupId>
<artifactId>plt-slice</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/plt-slice.jar</systemPath>
+ <version>1.0.RELEASE</version>
</dependency>
<dependency>
@@ -154,24 +152,18 @@
<dependency>
<groupId>com.vci.client</groupId>
<artifactId>plt-clientbase</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/client/plt-clientbase.jar</systemPath>
+ <version>1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>com.zeroc</groupId>
- <artifactId>icegridgui.jar</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/icegridgui.jar</systemPath>
+ <artifactId>icegridgui</artifactId>
+ <version>1.0.RELEASE</version>
</dependency>
- <dependency>
- <groupId>com.vci.common</groupId>
- <artifactId>plt-common.jar</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/plt-common.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>com.vci.common</groupId>
+ <artifactId>plt-common</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-platform-starter</artifactId>
@@ -250,4 +242,5 @@
</plugins>
</build>
+
</project>
\ No newline at end of file
--
Gitblit v1.10.0