Merge branch 'release/1.9.0'

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.foxinmy</groupId>
 	<artifactId>weixin4j</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.9.0</version>
 	<packaging>pom</packaging>
 	<name>weixin4j</name>
 	<url>https://github.com/foxinmy/weixin4j</url>
@@ -109,6 +109,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.amashchenko.maven.plugin</groupId>
+				<artifactId>gitflow-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -203,6 +207,11 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>com.amashchenko.maven.plugin</groupId>
+					<artifactId>gitflow-maven-plugin</artifactId>
+					<version>1.15.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<resources>
@@ -265,12 +274,34 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
 				</plugins>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.sonatype.plugins</groupId>
+							<artifactId>nexus-staging-maven-plugin</artifactId>
+							<version>1.6.8</version>
+						</plugin>
+					</plugins>
+				</pluginManagement>
 			</build>
 		</profile>
 	</profiles>
@@ -299,4 +330,4 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>

weixin4j-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-base</artifactId>
 	<name>weixin4j-base</name>
@@ -83,4 +83,4 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>

weixin4j-example/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<packaging>war</packaging>
 	<artifactId>weixin4j-example</artifactId>
@@ -106,4 +106,4 @@
 			<version>3.3.1</version>
 		</dependency>
 	</dependencies>
-</project>
+</project>

weixin4j-mp/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-mp</artifactId>
 	<name>weixin4j-mp</name>
@@ -37,4 +37,4 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 	</dependencies>
-</project>
+</project>

weixin4j-pay/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weixin4j</artifactId>
         <groupId>com.foxinmy</groupId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>weixin4j-pay</name>
@@ -50,4 +50,4 @@
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

weixin4j-qy/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-qy</artifactId>
 	<name>weixin4j-qy</name>

weixin4j-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-server</artifactId>
 	<name>weixin4j-server</name>
@@ -59,4 +59,4 @@
 			</exclusions>
 		</dependency>
 	</dependencies>
-</project>
+</project>

weixin4j-serverX/pom.xml

@@ -6,10 +6,9 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-serverX</artifactId>
-	<version>0.0.1</version>
 	<name>weixin4j-serverX</name>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-serverX</url>
 	<description>微信消息接入服务(spring mvc实现)</description>

weixin4j-wxa/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.9.0-SNAPSHOT</version>
+		<version>1.9.0</version>
 	</parent>
 	<artifactId>weixin4j-wxa</artifactId>
 	<name>weixin4j-wxa</name>