Skip to content

Commit

Permalink
Merge branch 'release/1.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sutra
sutra committed Dec 18, 2020
2 parents fa3d33b + 688aac4 commit 2c2ac96
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 16 deletions.
35 changes: 33 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -109,6 +109,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -299,4 +330,4 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
</project>
4 changes: 2 additions & 2 deletions weixin4j-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -83,4 +83,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
</project>
</project>
4 changes: 2 additions & 2 deletions weixin4j-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -106,4 +106,4 @@
<version>3.3.1</version>
</dependency>
</dependencies>
</project>
</project>
4 changes: 2 additions & 2 deletions weixin4j-mp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -37,4 +37,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
</project>
4 changes: 2 additions & 2 deletions weixin4j-pay/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -50,4 +50,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
</project>
2 changes: 1 addition & 1 deletion weixin4j-qy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions weixin4j-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -59,4 +59,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
</project>
3 changes: 1 addition & 2 deletions weixin4j-serverX/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion weixin4j-wxa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 2c2ac96

Please sign in to comment.