From 95d0398d253d8047d249ec05a548908809e22043 Mon Sep 17 00:00:00 2001
From: yangshuo08 <yangshuo08@inspur.com>
Date: Wed, 16 Aug 2023 09:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0pom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 18 +++++++++---------
 view-object-manager/pom.xml | 34 ++++++++++++++++++++++++----------
 view-object-model/pom.xml   |  8 ++++----
 view-object-webapi/pom.xml  |  2 +-
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b0c9ae..3b5401d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,22 +27,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.inspur.edp</groupId>
-    <artifactId>viewObject-model</artifactId>
+    <artifactId>viewObject-model1</artifactId>
     <packaging>pom</packaging>
     <version>0.1.1</version>
     <modules>
-<!--        <module>view-object-model</module>-->
+        <module>view-object-model</module>
         <module>view-object-manager</module>
         <module>view-object-webapi</module>
     </modules>
     <properties>
-        <cef.designtime.version>0.2.23</cef.designtime.version>
-        <das.commonmodel.designtime.version>0.1.16</das.commonmodel.designtime.version>
-        <bef.designtime.version>0.2.16</bef.designtime.version>
+        <cef.designtime.version>0.2.26</cef.designtime.version>
+        <das.commonmodel.designtime.version>0.1.18</das.commonmodel.designtime.version>
+        <bef.designtime.version>0.2.17</bef.designtime.version>
         <caf.cef.schema.version>0.1.5</caf.cef.schema.version>
-        <lcm.metadata.version>0.1.28</lcm.metadata.version>
-        <lcm.metadata.spi.version>0.1.28</lcm.metadata.spi.version>
-        <metadata.rtcustomization.version>0.1.24</metadata.rtcustomization.version>
+        <lcm.metadata.version>0.1.40</lcm.metadata.version>
+        <lcm.metadata.spi.version>0.1.40</lcm.metadata.spi.version>
+        <metadata.rtcustomization.version>0.1.36</metadata.rtcustomization.version>
         <metadata.deploy.version>0.1.15</metadata.deploy.version>
     </properties>
     <dependencyManagement>
@@ -110,7 +110,7 @@
             <dependency>
                 <groupId>com.inspur.edp</groupId>
                 <artifactId>metadata-rtcustomization-api</artifactId>
-                <version>0.1.28</version>
+                <version>0.1.36</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml
index d5e0271..a3d1be5 100644
--- a/view-object-manager/pom.xml
+++ b/view-object-manager/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>com.inspur.edp</groupId>
-        <artifactId>viewObject-model</artifactId>
+        <artifactId>viewObject-model1</artifactId>
         <version>0.1.1</version>
     </parent>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>metadata-rtcustomization-api</artifactId>
-            <version>0.1.28</version>
+            <version>0.1.36</version>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>bef-component</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.iec.edp</groupId>
@@ -77,6 +77,11 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>common-component-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.inspur.edp</groupId>
+                    <artifactId>formserver-viewmodel</artifactId>
+                </exclusion></exclusions>
             <version>0.1.40</version>
         </dependency>
         <dependency>
@@ -93,6 +98,12 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>cef-variable-dtgenerator</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.inspur.edp</groupId>
+                    <artifactId>formserver-viewmodel</artifactId>
+                </exclusion>
+            </exclusions>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -115,7 +126,12 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>bff-engine-core</artifactId>
-            <version>0.1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.inspur.edp</groupId>
+                    <artifactId>formserver-viewmodel</artifactId>
+                </exclusion></exclusions>
+            <version>0.1.5</version>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
@@ -124,7 +140,7 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>task-api</artifactId>
-            <version>0.3.27</version>
+            <version>0.3.34</version>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
@@ -138,11 +154,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.inspur.edp.cef.designtime.core</groupId>
-            <artifactId>com.inspur.edp.cef.designtime.core</artifactId>
-            <version>0.1.1</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/../ref/com.inspur.edp.cef.designtime.core.jar</systemPath>
+            <groupId>com.inspur.edp</groupId>
+            <artifactId>cef-designtime-core</artifactId>
+            <version>${cef.designtime.version}</version>
         </dependency>
     </dependencies>
     
diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml
index 0df5f1d..ec16581 100644
--- a/view-object-model/pom.xml
+++ b/view-object-model/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>com.inspur.edp</groupId>
-        <artifactId>viewObject-model</artifactId>
+        <artifactId>viewObject-model1</artifactId>
         <version>0.1.1</version>
     </parent>
 
@@ -82,12 +82,12 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>lcm-metadata-api</artifactId>
-            <version>0.1.19</version>
+            <version>0.1.40</version>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>metadata-rtcustomization-api</artifactId>
-            <version>0.1.28</version>
+            <version>0.1.36</version>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>bef-component</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml
index d4250d8..dc44ad0 100644
--- a/view-object-webapi/pom.xml
+++ b/view-object-webapi/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>com.inspur.edp</groupId>
-        <artifactId>viewObject-model</artifactId>
+        <artifactId>viewObject-model1</artifactId>
         <version>0.1.1</version>
     </parent>
 
-- 
Gitee