From 11307b25b3898578cd5867751c1dbfaa7300f148 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 15:19:07 +0800
Subject: [PATCH] 解决冲突恢复代码
---
pipIrr-platform/pipIrr-mw/pom.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml
index 57010d3..2d08fea 100644
--- a/pipIrr-platform/pipIrr-mw/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pom.xml
@@ -15,8 +15,9 @@
<description>姝ゆā鍧椾负鍏朵粬涓棿浠舵ā鍧楃殑鐖剁骇妯″潡锛屽彧瀹氫箟渚濊禆</description>
<modules>
- <module>pipIrr-mw-accept</module>
+ <module>pipIrr-mw-rtu</module>
<module>pipIrr-mwTest-server</module>
+ <module>pipIrr-mwTest-client</module>
</modules>
<dependencies>
@@ -24,7 +25,11 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-common</artifactId>
<version>1.0.0</version>
- <scope>provided</scope>
+ <!--
+ scope涓嶈兘鐢╬rovided锛屽惁鍒橲erver.java鐨勮繍琛屼笉璧锋潵
+ scope涓嶈兘鐢╮untime锛屽惁鍒欎笉鑳界紪杈�
+ -->
+ <scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -38,7 +43,7 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-global</artifactId>
<version>1.0.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -75,9 +80,8 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<exclusions>
<exclusion>
- <!-- 鎺掗櫎鎺変緷璧� -->
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
--
Gitblit v1.8.0