From df77c4fc11911992e59e786c621c857da7289c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 25 Aug 2023 01:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90form=5Ffiel?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mdp-form-bootstrap/pom.xml                          | 13 ++++++-------
 .../src/main/webapp/META-INF/MANIFEST.MF            |  3 ---
 mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml  | 12 ------------
 mdp-form/pom.xml                                    |  7 +------
 mdp-form/src/main/webapp/META-INF/MANIFEST.MF       |  3 ---
 mdp-form/src/main/webapp/WEB-INF/web.xml            | 12 ------------
 pom.xml                                             |  2 +-
 7 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF
 delete mode 100644 mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 mdp-form/src/main/webapp/META-INF/MANIFEST.MF
 delete mode 100644 mdp-form/src/main/webapp/WEB-INF/web.xml

diff --git a/mdp-form-bootstrap/pom.xml b/mdp-form-bootstrap/pom.xml
index f06a4fe..71026f8 100644
--- a/mdp-form-bootstrap/pom.xml
+++ b/mdp-form-bootstrap/pom.xml
@@ -8,10 +8,15 @@
   <parent>
     <groupId>com.mdp</groupId>
     <artifactId>mdp-form-backend</artifactId>
-    <version>M.1.0.0-RELEASE</version>
+    <version>2.0.0-RELEASE</version>
   </parent>
    
   <dependencies>
+      <dependency>
+          <groupId>com.mdp</groupId>
+          <artifactId>mdp-oauth2-client-cloud</artifactId>
+          <version>${mdp.version}</version>
+      </dependency>
       <dependency>
           <groupId>com.mdp</groupId>
           <artifactId>mdp-cloud-starter</artifactId>
@@ -21,12 +26,6 @@
           <groupId>com.mdp</groupId>
           <artifactId>mdp-form</artifactId>
         </dependency>
-
-      <dependency>
-          <groupId>com.mdp</groupId>
-          <artifactId>mdp-oauth2-client-cloud</artifactId>
-          <version>${mdp.version}</version>
-      </dependency>
   </dependencies>
          
   <build>
diff --git a/mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF b/mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml b/mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8557997..0000000
--- a/mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
-  <display-name>mdp-wxpub-web</display-name>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/mdp-form/pom.xml b/mdp-form/pom.xml
index 2c368fe..59cfeb4 100644
--- a/mdp-form/pom.xml
+++ b/mdp-form/pom.xml
@@ -10,13 +10,8 @@
   <parent>
     <groupId>com.mdp</groupId>
     <artifactId>mdp-form-backend</artifactId>
-    <version>M.1.0.0-RELEASE</version>
+    <version>2.0.0-RELEASE</version>
   </parent>
   <dependencies>
-    <dependency>
-      <groupId>com.mdp</groupId>
-      <artifactId>mdp-oauth2-client</artifactId>
-      <version>${mdp.version}</version>
-    </dependency>
   </dependencies> 
 </project>
\ No newline at end of file
diff --git a/mdp-form/src/main/webapp/META-INF/MANIFEST.MF b/mdp-form/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/mdp-form/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/mdp-form/src/main/webapp/WEB-INF/web.xml b/mdp-form/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8557997..0000000
--- a/mdp-form/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
-  <display-name>mdp-wxpub-web</display-name>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ff9027f..8249d68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.mdp</groupId>
     <artifactId>mdp-products</artifactId>
-    <version>M.1.0.0-RELEASE</version>
+    <version>2.0.0-RELEASE</version>
   </parent>
 
 	<modules>