From 649be797426c0e1eddd91ee8b8e08d966b367867 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 17 Dec 2020 20:50:09 +0800 Subject: [PATCH 1/4] Add gitflow-maven-plugin. --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index b43202f8..fec7dd87 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,10 @@ + + com.amashchenko.maven.plugin + gitflow-maven-plugin + @@ -203,6 +207,11 @@ + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.15.0 + From aaaefca14a7e1e830fb6f5a86e5a6ed4522ef2db Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 17 Dec 2020 20:50:43 +0800 Subject: [PATCH 2/4] Update versions for release --- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- weixin4j-example/pom.xml | 2 +- weixin4j-mp/pom.xml | 2 +- weixin4j-pay/pom.xml | 2 +- weixin4j-qy/pom.xml | 2 +- weixin4j-server/pom.xml | 2 +- weixin4j-serverX/pom.xml | 2 +- weixin4j-wxa/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index fec7dd87..215b2df2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 46ef56fd..80772495 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-base weixin4j-base diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index d2375fe9..b5e6eea3 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 war weixin4j-example diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index c7e9bea1..8c4bb3fb 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-mp weixin4j-mp diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 2d92fc7b..99f35307 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -5,7 +5,7 @@ weixin4j com.foxinmy - 1.9.0-SNAPSHOT + 1.9.0 4.0.0 weixin4j-pay diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index f22a034d..5dd69798 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-qy weixin4j-qy diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index c3fc73c1..c3f5db36 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-server weixin4j-server diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index 58dab73b..5a46f14f 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-serverX 0.0.1 diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index 0ccfa0fa..ddbefdbd 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0-SNAPSHOT + 1.9.0 weixin4j-wxa weixin4j-wxa From 2e5eb6c24d2c47c3a7f64016e059cd8cdc279b97 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 17 Dec 2020 20:56:19 +0800 Subject: [PATCH 3/4] Add newline at end of file. --- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- weixin4j-example/pom.xml | 2 +- weixin4j-mp/pom.xml | 2 +- weixin4j-pay/pom.xml | 2 +- weixin4j-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 215b2df2..705ce474 100644 --- a/pom.xml +++ b/pom.xml @@ -308,4 +308,4 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - \ No newline at end of file + diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 80772495..7896570a 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -83,4 +83,4 @@ provided - \ No newline at end of file + diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index b5e6eea3..2d99f744 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -106,4 +106,4 @@ 3.3.1 - \ No newline at end of file + diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index 8c4bb3fb..7efb0316 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -37,4 +37,4 @@ junit - \ No newline at end of file + diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 99f35307..94f9b840 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -50,4 +50,4 @@ junit - \ No newline at end of file + diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index c3f5db36..e8c8cca9 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -59,4 +59,4 @@ - \ No newline at end of file + From 688aac49b031048a0bc584ffa697ac2891f2c2c8 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Fri, 18 Dec 2020 00:53:01 +0800 Subject: [PATCH 4/4] Update deploy setting. --- pom.xml | 22 ++++++++++++++++++++++ weixin4j-serverX/pom.xml | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 705ce474..30a2a960 100644 --- a/pom.xml +++ b/pom.xml @@ -274,12 +274,34 @@ org.apache.maven.plugins maven-javadoc-plugin + + -Xdoclint:none + org.apache.maven.plugins maven-gpg-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + + diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index 5a46f14f..892d1adf 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -9,7 +9,6 @@ 1.9.0 weixin4j-serverX - 0.0.1 weixin4j-serverX https://github.com/foxinmy/weixin4j/tree/master/weixin4j-serverX 微信消息接入服务(spring mvc实现)