Merge remote-tracking branch 'origin/1.0-SNAPSHOT' into 1.0-SNAPSHOT

# Conflicts:
#	pom.xml

pom.xml

@@ -6,8 +6,9 @@
 
     <groupId>com.yanzuoguang</groupId>
     <artifactId>yzg-util</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
     <packaging>pom</packaging>
-    <version>1.1-SNAPSHOT</version>
 
     <modules>
         <module>yzg-util-base</module>
@@ -15,7 +16,7 @@
         <module>yzg-util-cloud</module>
         <module>yzg-util-mq</module>
         <module>yzg-util-image</module>
-        <!--        <module>yzg-util-image-extend</module>-->
+<!--        <module>yzg-util-image-extend</module>-->
         <module>yzg-util-print</module>
         <module>yzg-util-chinese</module>
         <module>yzg-util-file</module>
@@ -35,13 +36,23 @@
         <fastjson.version>1.2.62</fastjson.version>
         <mysql.version>6.0.6</mysql.version>
         <poi.version>3.9</poi.version>
-        <yzg.version>1.1-SNAPSHOT</yzg.version>
+        <yzg.version>1.0-SNAPSHOT</yzg.version>
         <swagger.version>2.9.2</swagger.version>
         <guava.version>20.0</guava.version>
-        <!--<jetcache.version>2.6.1</jetcache.version>-->
+        <!--<jetcache.version>2.6.0</jetcache.version>-->
         <jetcache.version>2.6.0.M1</jetcache.version>
     </properties>
 
+    <scm>
+        <connection>scm:git:http://git.tbd.yanzuoguang.com/yzg/yzg-util.git</connection>
+        <developerConnection>scm:git:http://git.tbd.yanzuoguang.com/yzg/yzg-util.git</developerConnection>
+        <url>http://git.tbd.yanzuoguang.com/yzg/yzg-util/tree/master</url>
+    </scm>
+    <issueManagement>
+        <system>Github</system>
+        <url>http://git.tbd.yanzuoguang.com/yzg/yzg-util</url>
+    </issueManagement>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -231,17 +242,19 @@
                 <directory>src/main/resources</directory>
             </testResource>
         </testResources>
+
+        <finalName>${project.artifactId}</finalName>
+        <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
+                    <artifactId>maven-scm-plugin</artifactId>
+                    <version>1.11.2</version>
+                    <configuration>
+                        <goals>install</goals>
+                    </configuration>
                 </plugin>
-        </plugins>
-
-        <finalName>${project.artifactId}</finalName>
 
-        <pluginManagement>
-            <plugins>
                 <!-- springboot打包忽略Test单元测试 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +273,6 @@
                         <overwrite>true</overwrite>
                     </configuration>
                 </plugin>
-
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
@@ -270,23 +282,6 @@
                         <compilerArgument>-parameters</compilerArgument>
                     </configuration>
                 </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
-                    <configuration>
-                        <attach>true</attach>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <!-- ===========可运行Jar包=========== -->
                 <plugin>
                     <groupId>org.springframework.boot</groupId>