From 1be56e82d5629000770765d98b6a157670630521 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:01:36 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/cn/jiguang/common/ClientConfig.java | 5 + .../common/connection/IHttpClient.java | 26 ++-- .../common/connection/NativeHttpClient.java | 124 +++++++++++++++++- 4 files changed, 137 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index dd9e12d..8c78cd4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.7 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies diff --git a/src/main/java/cn/jiguang/common/ClientConfig.java b/src/main/java/cn/jiguang/common/ClientConfig.java index 29e3b53..8f58d8c 100644 --- a/src/main/java/cn/jiguang/common/ClientConfig.java +++ b/src/main/java/cn/jiguang/common/ClientConfig.java @@ -61,6 +61,9 @@ public class ClientConfig extends HashMap { public static final String GROUP_PUSH_PATH = "group.push.path"; public static final Object GROUP_PUSH_PATH_SCHEMA = String.class; + public static final String V3_FILES_PATH = "jpush.v3.files.path"; + public static final Object V3_FILES_PATH_SCHEMA = String.class; + public static final String SSL_VERSION = "ssl.version"; public static final Object SSL_VERSION_SCHEMA = String.class; public static final String DEFAULT_SSL_VERSION = "TLS"; @@ -144,6 +147,8 @@ private ClientConfig() { this.put(SCHEDULE_HOST_NAME, "https://api.jpush.cn"); this.put(SCHEDULE_PATH, "/v3/schedules"); + this.put(V3_FILES_PATH, "/v3/files"); + this.put(SSL_VERSION, DEFAULT_SSL_VERSION); this.put(MAX_RETRY_TIMES, DEFULT_MAX_RETRY_TIMES); this.put(READ_TIMEOUT, DEFAULT_READ_TIMEOUT); diff --git a/src/main/java/cn/jiguang/common/connection/IHttpClient.java b/src/main/java/cn/jiguang/common/connection/IHttpClient.java index 47c2498..73b1c78 100644 --- a/src/main/java/cn/jiguang/common/connection/IHttpClient.java +++ b/src/main/java/cn/jiguang/common/connection/IHttpClient.java @@ -13,21 +13,21 @@ public interface IHttpClient { public static final String CHARSET = "UTF-8"; public static final String CONTENT_TYPE_JSON = "application/json"; public static final String CONTENT_TYPE_FORM = "application/x-www-form-urlencoded"; - + public static final String RATE_LIMIT_QUOTA = "X-Rate-Limit-Limit"; public static final String RATE_LIMIT_Remaining = "X-Rate-Limit-Remaining"; public static final String RATE_LIMIT_Reset = "X-Rate-Limit-Reset"; public static final String JPUSH_USER_AGENT = "JPush-API-Java-Client"; - + public static final int RESPONSE_OK = 200; - + public enum RequestMethod { - GET, + GET, POST, PUT, DELETE } - + public static final String IO_ERROR_MESSAGE = "Connection IO error. \n" + "Can not connect to JPush Server. " + "Please ensure your internet connection is ok. \n" @@ -49,27 +49,27 @@ public enum RequestMethod { //设置连接超时时间 public static final int DEFAULT_CONNECTION_TIMEOUT = (5 * 1000); // milliseconds - + //设置读取超时时间 public static final int DEFAULT_READ_TIMEOUT = (30 * 1000); // milliseconds - + public static final int DEFAULT_MAX_RETRY_TIMES = 3; - public ResponseWrapper sendGet(String url) + public ResponseWrapper sendGet(String url) throws APIConnectionException, APIRequestException; public ResponseWrapper sendGet(String url, String content) throws APIConnectionException, APIRequestException; - - public ResponseWrapper sendDelete(String url) + + public ResponseWrapper sendDelete(String url) throws APIConnectionException, APIRequestException; public ResponseWrapper sendDelete(String url, String content) throws APIConnectionException, APIRequestException; - - public ResponseWrapper sendPost(String url, String content) + + public ResponseWrapper sendPost(String url, String content) throws APIConnectionException, APIRequestException; - + public ResponseWrapper sendPut(String url, String content) throws APIConnectionException, APIRequestException; diff --git a/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java b/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java index 2932d60..30b4dfe 100644 --- a/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java +++ b/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java @@ -8,15 +8,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.activation.MimetypesFileTypeMap; import javax.net.ssl.*; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; +import java.io.*; import java.net.*; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.text.MessageFormat; +import java.util.Iterator; +import java.util.Map; /** * The implementation has no connection pool mechanism, used origin java connection. @@ -283,7 +283,7 @@ private ResponseWrapper _doRequest(String url, String content, } protected void initSSL(String sslVer) { - TrustManager[] tmCerts = new javax.net.ssl.TrustManager[1]; + TrustManager[] tmCerts = new TrustManager[1]; tmCerts[0] = new SimpleTrustManager(); try { SSLContext sslContext = SSLContext.getInstance(sslVer); @@ -297,6 +297,118 @@ protected void initSSL(String sslVer) { } } + public String formUpload(String urlStr, Map textMap, + Map fileMap, String contentType) { + String res = ""; + HttpURLConnection conn = null; + // boundary就是request头和上传文件内容的分隔符 + String BOUNDARY = "---------------------------" + System.currentTimeMillis(); + try { + URL url = new URL(urlStr); + conn = (HttpURLConnection) url.openConnection(); + conn.setConnectTimeout(5000); + conn.setReadTimeout(30000); + conn.setDoOutput(true); + conn.setDoInput(true); + conn.setUseCaches(false); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Connection", "Keep-Alive"); + conn.setRequestProperty("Authorization", _authCode); + conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); + OutputStream out = new DataOutputStream(conn.getOutputStream()); + // text + if (textMap != null) { + StringBuffer strBuf = new StringBuffer(); + Iterator iter = textMap.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry entry = (Map.Entry) iter.next(); + String inputName = (String) entry.getKey(); + String inputValue = (String) entry.getValue(); + if (inputValue == null) { + continue; + } + strBuf.append("\r\n").append("--").append(BOUNDARY).append("\r\n"); + strBuf.append("Content-Disposition: form-data; name=\"" + inputName + "\"\r\n\r\n"); + strBuf.append(inputValue); + } + out.write(strBuf.toString().getBytes()); + } + // file + if (fileMap != null) { + Iterator iter = fileMap.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry entry = (Map.Entry) iter.next(); + String inputName = (String) entry.getKey(); + String inputValue = (String) entry.getValue(); + if (inputValue == null) { + continue; + } + File file = new File(inputValue); + String filename = file.getName(); + + //没有传入文件类型，同时根据文件获取不到类型，默认采用application/octet-stream + contentType = new MimetypesFileTypeMap().getContentType(file); + //contentType非空采用filename匹配默认的图片类型 + if (!"".equals(contentType)) { + if (filename.endsWith(".png")) { + contentType = "image/png"; + } else if (filename.endsWith(".jpg") || filename.endsWith(".jpeg") || filename.endsWith(".jpe")) { + contentType = "image/jpeg"; + } else if (filename.endsWith(".gif")) { + contentType = "image/gif"; + } else if (filename.endsWith(".ico")) { + contentType = "image/image/x-icon"; + } + } + if (contentType == null || "".equals(contentType)) { + contentType = "application/octet-stream"; + } + StringBuffer strBuf = new StringBuffer(); + strBuf.append("\r\n").append("--").append(BOUNDARY).append("\r\n"); + strBuf.append("Content-Disposition: form-data; name=\"" + inputName + "\"; filename=\"" + filename + "\"\r\n"); + strBuf.append("Content-Type:" + contentType + "\r\n\r\n"); + out.write(strBuf.toString().getBytes()); + DataInputStream in = new DataInputStream(new FileInputStream(file)); + int bytes = 0; + byte[] bufferOut = new byte[1024]; + while ((bytes = in.read(bufferOut)) != -1) { + out.write(bufferOut, 0, bytes); + } + in.close(); + } + } + byte[] endData = ("\r\n--" + BOUNDARY + "--\r\n").getBytes(); + out.write(endData); + out.flush(); + out.close(); + // 读取返回数据 + StringBuffer strBuf = new StringBuffer(); + + InputStream is = null; + int responseCode = conn.getResponseCode(); + BufferedReader reader; + if (responseCode == 200) { + reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); + } else { + reader = new BufferedReader(new InputStreamReader(conn.getErrorStream())); + } + String line = null; + while ((line = reader.readLine()) != null) { + strBuf.append(line).append("\n"); + } + res = strBuf.toString(); + reader.close(); + reader = null; + } catch (Exception e) { + LOG.error("formUpload error", e); + } finally { + if (conn != null) { + conn.disconnect(); + conn = null; + } + } + return res; + } private static class SimpleHostnameVerifier implements HostnameVerifier { @@ -323,7 +435,7 @@ public X509Certificate[] getAcceptedIssuers() { } } - public static class SimpleProxyAuthenticator extends java.net.Authenticator { + public static class SimpleProxyAuthenticator extends Authenticator { private String username; private String password; From cd105384ed638e24d6b8c7c0a713e6702d4f7c65 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:02:52 +0800 Subject: [PATCH 02/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8c78cd4..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies @@ -34,7 +34,7 @@ https://github.com/jpush/jiguang-java-client-common scm:git:git@github.com:jpush/jiguang-java-client-common.git scm:git:git@github.com:jpush/jiguang-java-client-common.git - jiguang-common-1.1.4 + jiguang-common-1.1.8 From 812d4d692c6903f0ae3bd0fcfcee11821ce4ead3 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:08:06 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 221a668eea280c2ae2a6106c616de6d8fd874a69 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:08:24 +0800 Subject: [PATCH 04/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From f69caf6f8556d6a90dfd1922dc0410df1a9a65f7 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:15:39 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..39c487b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.jpush.api - jiguang-common + jiguang-common-SNAPSHOT 1.1.8 jar https://github.com/jpush/jiguang-java-client-common From b3fe11598bf50dc62817467b422155a14153092a Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:16:08 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- release.properties | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 release.properties diff --git a/pom.xml b/pom.xml index 39c487b..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ 4.0.0 cn.jpush.api - jiguang-common-SNAPSHOT - 1.1.8 + jiguang-common + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies diff --git a/release.properties b/release.properties new file mode 100644 index 0000000..2309206 --- /dev/null +++ b/release.properties @@ -0,0 +1,12 @@ +#release configuration +#Thu Mar 26 17:16:02 CST 2020 +scm.tagNameFormat=@{project.artifactId}-@{project.version} +pushChanges=true +scm.url=scm\:git\:git@github.com\:jpush/jiguang-java-client-common.git +preparationGoals=clean verify +remoteTagging=true +projectVersionPolicyId=default +scm.commentPrefix=[maven-release-plugin] +exec.additionalArguments=-Dmaven.test.skip\=true -Psonatype-oss-release +exec.snapshotReleasePluginAllowed=false +completedPhase=check-poms From 7080ba32ab6abde4d71ccf58fbd4e074ff7788f4 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:16:40 +0800 Subject: [PATCH 07/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 792f023e473ba9ccc81a1fde591ff1cc03033ab3 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:20:25 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From d403619a13122c8d88d3fc010dc220a211fea139 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:20:44 +0800 Subject: [PATCH 09/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From c26b684e95fedafc5888d253c1cbf3a95a6b5dd8 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:25:49 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- pom.xml.releaseBackup | 205 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 pom.xml.releaseBackup diff --git a/pom.xml b/pom.xml index 65d3a49..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup new file mode 100644 index 0000000..a5c289e --- /dev/null +++ b/pom.xml.releaseBackup @@ -0,0 +1,205 @@ + + 4.0.0 + + cn.jpush.api + jiguang-common + 1.1.8-SNAPSHOT + jar + https://github.com/jpush/jiguang-java-client-common + Jiguang Client Common Dependencies + Jiguang common dependecies for jiguang java client. + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + github + UTF-8 + 1.7 + 1.7 + + + + org.sonatype.oss + oss-parent + 9 + + + + https://github.com/jpush/jiguang-java-client-common + scm:git:git@github.com:jpush/jiguang-java-client-common.git + scm:git:git@github.com:jpush/jiguang-java-client-common.git + jiguang-common-1.1.8 + + + + + org.apache.httpcomponents + httpclient + 4.5.3 + provided + + + io.netty + netty-all + 4.1.6.Final + provided + + + com.squareup.okhttp3 + okhttp + 3.3.1 + provided + + + + com.google.code.gson + gson + 2.3 + provided + + + + org.slf4j + slf4j-api + 1.7.7 + provided + + + + org.bouncycastle + bcprov-jdk15on + 1.60 + + + org.bouncycastle + bcpkix-jdk15on + 1.60 + + + + + + org.slf4j + slf4j-log4j12 + 1.7.7 + provided + + + log4j + log4j + 1.2.17 + provided + + + + junit + junit + 4.11 + provided + + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + + maven-compiler-plugin + 3.5.1 + + ${jdkVersion} + ${jdkVersion} + 1.5 + true + true + true + true + + -Xlint:unchecked + + + + + + com.github.github + site-maven-plugin + 0.12 + + Creating site for ${project.version} + github + + + + + site + + site + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + cn.jpush.api.FastTests + -Dfile.encoding=UTF-8 + + **/mock/*Test.java + + + + + org.apache.maven.surefire + surefire-junit47 + 2.17 + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.8.1 + + + + dependencies + license + scm + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + resources/javadoc-overview.html + + + + + + + From 6147e6b117d7805798314b6806426fe9ddf20c7c Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:26:16 +0800 Subject: [PATCH 11/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 58830af04ea983d0b21f82aeb9b792b0d49c8db5 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:29:32 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..a2b0184 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SHAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 1378465cb0c15e1832997a9d264b32a260573cee Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:30:02 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- pom.xml.releaseBackup | 205 ------------------------------------------ release.properties | 12 --- 3 files changed, 1 insertion(+), 218 deletions(-) delete mode 100644 pom.xml.releaseBackup delete mode 100644 release.properties diff --git a/pom.xml b/pom.xml index a2b0184..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SHAPSHOT + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index a5c289e..0000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,205 +0,0 @@ - - 4.0.0 - - cn.jpush.api - jiguang-common - 1.1.8-SNAPSHOT - jar - https://github.com/jpush/jiguang-java-client-common - Jiguang Client Common Dependencies - Jiguang common dependecies for jiguang java client. - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - github - UTF-8 - 1.7 - 1.7 - - - - org.sonatype.oss - oss-parent - 9 - - - - https://github.com/jpush/jiguang-java-client-common - scm:git:git@github.com:jpush/jiguang-java-client-common.git - scm:git:git@github.com:jpush/jiguang-java-client-common.git - jiguang-common-1.1.8 - - - - - org.apache.httpcomponents - httpclient - 4.5.3 - provided - - - io.netty - netty-all - 4.1.6.Final - provided - - - com.squareup.okhttp3 - okhttp - 3.3.1 - provided - - - - com.google.code.gson - gson - 2.3 - provided - - - - org.slf4j - slf4j-api - 1.7.7 - provided - - - - org.bouncycastle - bcprov-jdk15on - 1.60 - - - org.bouncycastle - bcpkix-jdk15on - 1.60 - - - - - - org.slf4j - slf4j-log4j12 - 1.7.7 - provided - - - log4j - log4j - 1.2.17 - provided - - - - junit - junit - 4.11 - provided - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - - - maven-compiler-plugin - 3.5.1 - - ${jdkVersion} - ${jdkVersion} - 1.5 - true - true - true - true - - -Xlint:unchecked - - - - - - com.github.github - site-maven-plugin - 0.12 - - Creating site for ${project.version} - github - - - - - site - - site - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - cn.jpush.api.FastTests - -Dfile.encoding=UTF-8 - - **/mock/*Test.java - - - - - org.apache.maven.surefire - surefire-junit47 - 2.17 - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.8.1 - - - - dependencies - license - scm - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - resources/javadoc-overview.html - - - - - - - diff --git a/release.properties b/release.properties deleted file mode 100644 index 2309206..0000000 --- a/release.properties +++ /dev/null @@ -1,12 +0,0 @@ -#release configuration -#Thu Mar 26 17:16:02 CST 2020 -scm.tagNameFormat=@{project.artifactId}-@{project.version} -pushChanges=true -scm.url=scm\:git\:git@github.com\:jpush/jiguang-java-client-common.git -preparationGoals=clean verify -remoteTagging=true -projectVersionPolicyId=default -scm.commentPrefix=[maven-release-plugin] -exec.additionalArguments=-Dmaven.test.skip\=true -Psonatype-oss-release -exec.snapshotReleasePluginAllowed=false -completedPhase=check-poms From c24046036da611d1d6fb26acfa10911936625a1c Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:30:27 +0800 Subject: [PATCH 14/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 47e44c99864f564da5a93af7c0f13241fd338390 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:33:01 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From dd9290ac9bb9410015687c22486fc9ecb7785028 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 17:33:26 +0800 Subject: [PATCH 16/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 396c5a1fd648a47ebd8094323ac236137f1797fe Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 18:42:15 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6API?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= 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 65d3a49..a5c289e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8 + 1.1.8-SNAPSHOT jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies From 45321c81df36f24668efb62e450c11ddf85120b6 Mon Sep 17 00:00:00 2001 From: xudx Date: Thu, 26 Mar 2020 18:42:39 +0800 Subject: [PATCH 18/18] [maven-release-plugin] prepare release jiguang-common-1.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5c289e..65d3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ cn.jpush.api jiguang-common - 1.1.8-SNAPSHOT + 1.1.8 jar https://github.com/jpush/jiguang-java-client-common Jiguang Client Common Dependencies