Merge remote-tracking branch 'origin/leng_dev' into leng_dev

pigx-auth/pom.xml

@@ -94,7 +94,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioObject.java

@@ -40,7 +40,6 @@ public class MinioObject {
 	private Long length;
 	private String etag;
 	private String contentType;
-	private String matDesc;
 	private Map<String, List<String>> httpHeaders;
 
 	public MinioObject(ObjectStat os) {

pigx-config/pom.xml

@@ -60,7 +60,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-eureka/pom.xml

@@ -69,7 +69,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-gateway/pom.xml

@@ -90,7 +90,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-upms/pigx-upms-biz/pom.xml

@@ -108,7 +108,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-activiti/pom.xml

@@ -137,7 +137,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 		<resources>

pigx-visual/pigx-codegen/pom.xml

@@ -76,7 +76,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-daemon/pom.xml

@@ -97,7 +97,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-monitor/pom.xml

@@ -89,7 +89,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-zipkin/pom.xml

@@ -96,7 +96,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>