From f1eecfa1c8ff13a0ade2d0adf4613f83fee6b35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 14:34:39 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/jpush/api/push/model/Message.java | 54 ++++++++++++++++- .../java/cn/jpush/api/push/model/Options.java | 53 ++++++++++++++++- .../notification/AndroidNotification.java | 10 ++-- .../model/notification/IosNotification.java | 10 ++-- .../notification/PlatformNotification.java | 59 +++++++++++++++++-- .../notification/WinphoneNotification.java | 11 ++-- 6 files changed, 175 insertions(+), 22 deletions(-) diff --git a/src/main/java/cn/jpush/api/push/model/Message.java b/src/main/java/cn/jpush/api/push/model/Message.java index 65e6c63d..73ff2422 100644 --- a/src/main/java/cn/jpush/api/push/model/Message.java +++ b/src/main/java/cn/jpush/api/push/model/Message.java @@ -1,6 +1,7 @@ package cn.jpush.api.push.model; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import com.google.gson.JsonElement; @@ -23,12 +24,14 @@ public class Message implements PushModel { private final Map numberExtras; private final Map booleanExtras; private final Map jsonExtras; - + private final Map customData; + private Message(String title, String msgContent, String contentType, Map extras, Map numberExtras, Map booleanExtras, - Map jsonExtras) { + Map jsonExtras, + Map customData) { this.title = title; this.msgContent = msgContent; this.contentType = contentType; @@ -36,6 +39,7 @@ private Message(String title, String msgContent, String contentType, this.numberExtras = numberExtras; this.booleanExtras = booleanExtras; this.jsonExtras = jsonExtras; + this.customData = customData; } public static Builder newBuilder() { @@ -92,6 +96,12 @@ public JsonElement toJSON() { if (null != extras || null != numberExtras || null != booleanExtras) { json.add(EXTRAS, extrasObject); } + + if (null != customData) { + for (Map.Entry entry : customData.entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + } return json; } @@ -104,6 +114,7 @@ public static class Builder { private Map numberExtrasBuilder; private Map booleanExtrasBuilder; protected Map jsonExtrasBuilder; + private Map customData; public Builder setTitle(String title) { this.title = title; @@ -166,12 +177,49 @@ public Builder addExtra(String key, JsonObject value) { jsonExtrasBuilder.put(key, value); return this; } + + public Builder addCustom(Map extras) { + if (customData == null) { + customData = new LinkedHashMap<>(); + } + for (Map.Entry entry : extras.entrySet()) { + customData.put(entry.getKey(), new JsonPrimitive(entry.getValue())); + } + return this; + } + + public Builder addCustom(String key, Number value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } + + public Builder addCustom(String key, String value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } + + public Builder addCustom(String key, Boolean value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } public Message build() { Preconditions.checkArgument(! (null == msgContent), "msgContent should be set"); return new Message(title, msgContent, contentType, - extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder,jsonExtrasBuilder); + extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder,jsonExtrasBuilder, customData); } } } diff --git a/src/main/java/cn/jpush/api/push/model/Options.java b/src/main/java/cn/jpush/api/push/model/Options.java index a3a57db9..6f4b6a1b 100644 --- a/src/main/java/cn/jpush/api/push/model/Options.java +++ b/src/main/java/cn/jpush/api/push/model/Options.java @@ -6,6 +6,7 @@ import cn.jiguang.common.ServiceHelper; import cn.jiguang.common.utils.Preconditions; +import java.util.LinkedHashMap; import java.util.Map; public class Options implements PushModel { @@ -27,6 +28,8 @@ public class Options implements PushModel { // minutes private int bigPushDuration; private String apnsCollapseId; + private final Map customData; + /** * example @@ -59,7 +62,8 @@ private Options(int sendno, boolean apnsProduction, int bigPushDuration, String apnsCollapseId, - Map> thirdPartyChannel) { + Map> thirdPartyChannel, + Map customData) { this.sendno = sendno; this.overrideMsgId = overrideMsgId; this.timeToLive = timeToLive; @@ -67,6 +71,7 @@ private Options(int sendno, this.bigPushDuration = bigPushDuration; this.apnsCollapseId = apnsCollapseId; this.thirdPartyChannel = thirdPartyChannel; + this.customData = customData; } public static Builder newBuilder() { @@ -132,6 +137,12 @@ public JsonElement toJSON() { json.add(THIRD_PARTH_CHANNEl, partyChannel); } + if (null != customData) { + for (Map.Entry entry : customData.entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + } + return json; } @@ -144,6 +155,7 @@ public static class Builder { private int bigPushDuration = 0; private String apnsCollapseId; private Map> thirdPartyChannel; + private Map customData; public Builder setSendno(int sendno) { this.sendno = sendno; @@ -184,6 +196,43 @@ public Builder setThirdPartyChannel(Map> thirdPartyC return this; } + public Builder addCustom(Map extras) { + if (customData == null) { + customData = new LinkedHashMap<>(); + } + for (Map.Entry entry : extras.entrySet()) { + customData.put(entry.getKey(), new JsonPrimitive(entry.getValue())); + } + return this; + } + + public Builder addCustom(String key, Number value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } + + public Builder addCustom(String key, String value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } + + public Builder addCustom(String key, Boolean value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + if (customData == null) { + customData = new LinkedHashMap<>(); + } + customData.put(key, new JsonPrimitive(value)); + return this; + } + public Options build() { Preconditions.checkArgument(sendno >= 0, "sendno should be greater than 0."); Preconditions.checkArgument(overrideMsgId >= 0, "override_msg_id should be greater than 0."); @@ -194,7 +243,7 @@ public Options build() { sendno = ServiceHelper.generateSendno(); } - return new Options(sendno, overrideMsgId, timeToLive, apnsProduction, bigPushDuration, apnsCollapseId, thirdPartyChannel); + return new Options(sendno, overrideMsgId, timeToLive, apnsProduction, bigPushDuration, apnsCollapseId, thirdPartyChannel, customData); } } diff --git a/src/main/java/cn/jpush/api/push/model/notification/AndroidNotification.java b/src/main/java/cn/jpush/api/push/model/notification/AndroidNotification.java index a0f6afe3..dcc0d197 100644 --- a/src/main/java/cn/jpush/api/push/model/notification/AndroidNotification.java +++ b/src/main/java/cn/jpush/api/push/model/notification/AndroidNotification.java @@ -6,6 +6,7 @@ import lombok.*; import lombok.experimental.Accessors; +import java.util.LinkedHashMap; import java.util.Map; public class AndroidNotification extends PlatformNotification { @@ -55,8 +56,9 @@ private AndroidNotification(Object alert, Map extras, Map numberExtras, Map booleanExtras, - Map jsonExtras) { - super(alert, extras, numberExtras, booleanExtras, jsonExtras); + Map jsonExtras, + Map customData) { + super(alert, extras, numberExtras, booleanExtras, jsonExtras, customData); this.title = title; this.builderId = builderId; @@ -80,7 +82,6 @@ public static AndroidNotification alert(String alert) { return newBuilder().setAlert(alert).build(); } - @Override public String getPlatform() { return NOTIFICATION_ANDROID; @@ -268,7 +269,8 @@ public AndroidNotification build() { extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder, - jsonExtrasBuilder + jsonExtrasBuilder, + super.customData ); } } diff --git a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java index c00c3b3e..4e7cf7ca 100644 --- a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java +++ b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java @@ -55,15 +55,15 @@ public class IosNotification extends PlatformNotification { private final boolean mutableContent; private final String threadId; - private IosNotification(Object alert, Object sound, String badge, boolean contentAvailable, boolean soundDisabled, boolean badgeDisabled, String category, boolean mutableContent,String threadId, Map extras, Map numberExtras, Map booleanExtras, - Map jsonExtras) { - super(alert, extras, numberExtras, booleanExtras, jsonExtras); + Map jsonExtras, + Map customData) { + super(alert, extras, numberExtras, booleanExtras, jsonExtras, customData); this.sound = sound; this.badge = badge; @@ -139,6 +139,7 @@ public static class Builder extends PlatformNotification.Builder numberExtras; private final Map booleanExtras; private final Map jsonExtras; - + private final Map customData; + public PlatformNotification(Object alert, Map extras, Map numberExtras, Map booleanExtras, @@ -34,8 +36,22 @@ public PlatformNotification(Object alert, Map extras, this.numberExtras = numberExtras; this.booleanExtras = booleanExtras; this.jsonExtras = jsonExtras; + customData = new LinkedHashMap<>(); } - + + public PlatformNotification(Object alert, Map extras, + Map numberExtras, + Map booleanExtras, + Map jsonExtras, + Map customData) { + this.alert = alert; + this.extras = extras; + this.numberExtras = numberExtras; + this.booleanExtras = booleanExtras; + this.jsonExtras = jsonExtras; + this.customData = customData; + } + @Override public JsonElement toJSON() { JsonObject json = new JsonObject(); @@ -95,6 +111,12 @@ public JsonElement toJSON() { if (null != extras || null != numberExtras || null != booleanExtras || null != jsonExtras) { json.add(EXTRAS, extrasObject); } + + if (null != customData) { + for (Map.Entry entry : customData.entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + } return json; } @@ -117,11 +139,13 @@ protected abstract static class Builder numberExtrasBuilder; protected Map booleanExtrasBuilder; protected Map jsonExtrasBuilder; - + protected Map customData; + public Builder () { + customData = new LinkedHashMap<>(); theBuilder = getThis(); } - + protected abstract B getThis(); public abstract B setAlert(Object alert); @@ -192,7 +216,32 @@ public B addExtra(String key, JsonObject value) { jsonExtrasBuilder.put(key, value); return theBuilder; } - + + public B addCustom(Map extras) { + for (Map.Entry entry : extras.entrySet()) { + customData.put(entry.getKey(), new JsonPrimitive(entry.getValue())); + } + return theBuilder; + } + + public B addCustom(String key, Number value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + customData.put(key, new JsonPrimitive(value)); + return theBuilder; + } + + public B addCustom(String key, String value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + customData.put(key, new JsonPrimitive(value)); + return theBuilder; + } + + public B addCustom(String key, Boolean value) { + Preconditions.checkArgument(! (null == key), "Key should not be null."); + customData.put(key, new JsonPrimitive(value)); + return theBuilder; + } + public abstract T build(); } diff --git a/src/main/java/cn/jpush/api/push/model/notification/WinphoneNotification.java b/src/main/java/cn/jpush/api/push/model/notification/WinphoneNotification.java index 9ceecf52..33003797 100644 --- a/src/main/java/cn/jpush/api/push/model/notification/WinphoneNotification.java +++ b/src/main/java/cn/jpush/api/push/model/notification/WinphoneNotification.java @@ -14,13 +14,14 @@ public class WinphoneNotification extends PlatformNotification { private final String title; private final String openPage; - + private WinphoneNotification(Object alert, String title, String openPage, Map extras, Map numberExtras, Map booleanExtras, - Map jsonExtras) { - super(alert, extras, numberExtras, booleanExtras, jsonExtras); + Map jsonExtras, + Map customData) { + super(alert, extras, numberExtras, booleanExtras, jsonExtras, customData); this.title = title; this.openPage = openPage; @@ -59,6 +60,7 @@ public static class Builder extends PlatformNotification.Builder Date: Tue, 24 Sep 2019 16:00:04 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jpush/api/examples/PushExample.java | 52 +++++++++++++++++-- pom.xml | 4 +- .../notification/AndroidNotificationTest.java | 21 ++++++++ .../notification/IosNotificationTest.java | 3 ++ 4 files changed, 74 insertions(+), 6 deletions(-) diff --git a/example/main/java/cn/jpush/api/examples/PushExample.java b/example/main/java/cn/jpush/api/examples/PushExample.java index a15d15d5..f452ccd9 100644 --- a/example/main/java/cn/jpush/api/examples/PushExample.java +++ b/example/main/java/cn/jpush/api/examples/PushExample.java @@ -31,8 +31,8 @@ public class PushExample { protected static final Logger LOG = LoggerFactory.getLogger(PushExample.class); // demo App defined in resources/jpush-api.conf - protected static final String APP_KEY = "7b4b94cca0d185d611e53cca"; - protected static final String MASTER_SECRET = "860803cf613ed54aa3b941a8"; + protected static final String APP_KEY = "e4ceeaf7a53ad745dd4728f2"; + protected static final String MASTER_SECRET = "1582b986adeaf48ceec1e354"; protected static final String GROUP_PUSH_KEY = "2c88a01e073a0fe4fc7b167c"; protected static final String GROUP_MASTER_SECRET = "b11314807507e2bcfdeebe2e"; @@ -46,8 +46,9 @@ public class PushExample { public static void main(String[] args) { - testBatchSend(); -// testSendPushWithCustomConfig(); + testSendPushWithCustomField(); +// testBatchSend(); + testSendPushWithCustomConfig(); // testSendIosAlert(); // testSendPush(); // testGetCidList(); @@ -586,5 +587,48 @@ public static void testBatchSend() { } } + /** + * 自定义发送参数名称, 华为客户可参考该方法 + */ + public static void testSendPushWithCustomField() { + + ClientConfig config = ClientConfig.getInstance(); + // Setup the custom hostname + config.setPushHostName("https://api.jpush.cn"); + + JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, config); + + Notification notification = Notification.newBuilder() + .addPlatformNotification(AndroidNotification.newBuilder() + .setAlert(ALERT) + .setTitle("Alert test") + .setLargeIcon("http://www.jiguang.cn/largeIcon.jpg") + .addCustom("uri_activity", "uri_activity") + .addCustom("uri_flag", "uri_flag") + .addCustom("uri_action", "uri_action") + .build()) + .build(); + + PushPayload.Builder payloadBuilder = new PushPayload.Builder() + .setPlatform(Platform.all()) + .setAudience(Audience.all()) + .setNotification(notification); + + try { + PushResult result = jpushClient.sendPush(payloadBuilder.build()); + LOG.info("Got result - " + result); + + } catch (APIConnectionException e) { + LOG.error("Connection error. Should retry later. ", e); + + } catch (APIRequestException e) { + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Code: " + e.getErrorCode()); + LOG.info("Error Message: " + e.getErrorMessage()); + LOG.info("Msg ID: " + e.getMsgId()); + } + } + } diff --git a/pom.xml b/pom.xml index da3a8071..66735e50 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.3.12-SNAPSHOT + 3.3.13 jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.3.5 + v3.3.12 diff --git a/src/test/java/cn/jpush/api/push/model/notification/AndroidNotificationTest.java b/src/test/java/cn/jpush/api/push/model/notification/AndroidNotificationTest.java index bc8963ec..460c2cb2 100644 --- a/src/test/java/cn/jpush/api/push/model/notification/AndroidNotificationTest.java +++ b/src/test/java/cn/jpush/api/push/model/notification/AndroidNotificationTest.java @@ -9,6 +9,10 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + @Category(FastTests.class) public class AndroidNotificationTest { @@ -60,6 +64,23 @@ public void testExtra_nullvalue() { json.add("extras", extra); Assert.assertEquals("", json, an.toJSON()); } + + @Test + public void testCustomParam() { + + Map customParams = new HashMap<>(); + customParams.put("custom_field1", "field1"); + customParams.put("custom_field2", "field2"); + customParams.put("custom_field3", "field3"); + + AndroidNotification an = AndroidNotification.newBuilder() + .addCustom("custom_field_num", 1) + .addCustom("custom_field_string", "string") + .addCustom("custom_field_boolean", true) + .addCustom(customParams) + .build(); + Assert.assertEquals("{\"custom_field_num\":1,\"custom_field_string\":\"string\",\"custom_field_boolean\":true,\"custom_field1\":\"field1\",\"custom_field3\":\"field3\",\"custom_field2\":\"field2\"}", an.toJSON().toString()); + } } diff --git a/src/test/java/cn/jpush/api/push/model/notification/IosNotificationTest.java b/src/test/java/cn/jpush/api/push/model/notification/IosNotificationTest.java index 7a1d037c..d8b87cdf 100644 --- a/src/test/java/cn/jpush/api/push/model/notification/IosNotificationTest.java +++ b/src/test/java/cn/jpush/api/push/model/notification/IosNotificationTest.java @@ -8,6 +8,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import java.util.HashMap; +import java.util.Map; + import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; From 209d1d5004b4d935d89acba01955668de7a10f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 18:00:26 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66735e50..b7cf1577 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.3.13 + 3.4.0-SNAPSHOT jar https://github.com/jpush/jpush-api-java-client JPush API Java Client From 3ef335f518240d1ab7596a9231d6566c962ca22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 18:02:19 +0800 Subject: [PATCH 4/9] [maven-release-plugin] prepare release v3.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b7cf1577..a2a0987f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.0-SNAPSHOT + 3.4.0 jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.3.12 + v3.4.0 From 4fbcb688a8cda01448b9863e5d0a8c1667c3c2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 18:02:19 +0800 Subject: [PATCH 5/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2a0987f..f1e2ea11 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.0 + 3.4.1-SNAPSHOT jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.4.0 + v3.3.12 From e5e72e9484090425d7e3e06bbdaf7adf781eb64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 18:15:11 +0800 Subject: [PATCH 6/9] [maven-release-plugin] prepare release v3.4.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f1e2ea11..be01eaa7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.1-SNAPSHOT + 3.4.1 jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.3.12 + v3.4.1 From d058fd264340ca11eb78ad413be8966800e3a337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 18:15:11 +0800 Subject: [PATCH 7/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index be01eaa7..0b8fa0ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.1 + 3.4.2-SNAPSHOT jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.4.1 + v3.3.12 From a15d18e703e35cad518cc4ca3b222991d97fe480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 19:13:55 +0800 Subject: [PATCH 8/9] [maven-release-plugin] prepare release v3.4.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0b8fa0ab..ba62ea7b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.2-SNAPSHOT + 3.4.2 jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.3.12 + v3.4.2 From fb013bb24423d0bd30f23a81dbd1d9396b939971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B8=B9=E4=BE=A0?= Date: Tue, 24 Sep 2019 19:13:55 +0800 Subject: [PATCH 9/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ba62ea7b..ff26a476 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jpush-client - 3.4.2 + 3.4.3-SNAPSHOT jar https://github.com/jpush/jpush-api-java-client JPush API Java Client @@ -35,7 +35,7 @@ https://github.com/jpush/jpush-api-java-client scm:git:git@github.com:jpush/jpush-api-java-client.git scm:git:git@github.com:jpush/jpush-api-java-client.git - v3.4.2 + v3.3.12