Merge remote-tracking branch 'origin/feature/admin1' into feature/admin1

source/deployment/deployment-peer/pom.xml

@@ -25,11 +25,11 @@
 			<artifactId>runtime-modular-booter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>ump-booter</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-composite</artifactId>

source/deployment/deployment-peer/src/main/resources/assembly.xml

@@ -53,18 +53,18 @@
             	<exclude>com.jd.blockchain:runtime-modular-booter</exclude>
             	<exclude>com.jd.blockchain:peer</exclude>
             	<exclude>com.jd.blockchain:deployment-peer</exclude>
-                <exclude>com.jd.blockchain:ump-booter</exclude>
+                <!--<exclude>com.jd.blockchain:ump-booter</exclude>-->
             </excludes>
         </dependencySet>
 
-        <dependencySet>
+        <!--<dependencySet>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
             <outputDirectory>ext</outputDirectory>
             <includes>
                 <include>com.jd.blockchain:ump-booter</include>
             </includes>
-        </dependencySet>
+        </dependencySet>-->
 
     </dependencySets>
 

source/manager/pom.xml

@@ -2,12 +2,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<modules>
+	<!--<modules>
 		<module>ump-booter</module>
 		<module>ump-web</module>
 		<module>ump-service</module>
 		<module>ump-model</module>
-	</modules>
+	</modules>-->
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>