Merge branch 'master' into dev

🔖 Release version 1.15.8
Merge pull request #96 from xkcoding/dev
2025-12-25 00:54:28 +08:00 · 2020-10-25 11:04:55 +08:00 · 2020-10-25 11:04:49 +08:00 · 2020-10-25 10:35:40 +08:00 · 2020-10-25 10:02:18 +08:00 · 2020-10-23 11:23:09 +08:00
6 changed files with 17 additions and 12 deletions
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,3 +1,10 @@
+## 1.15.8
+
+### 2020/10/25
+
+- Release version 1.15.8
+- Merge the pr. [#95](https://github.com/justauth/JustAuth/pull/95) [#96](https://github.com/justauth/JustAuth/pull/96)
+
 ## 1.15.7

 ### 2020/09/11
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven%20Central-1.15.7-blue" ></img>
+		<img src="https://img.shields.io/badge/Maven%20Central-1.15.8-blue" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api%20Docs-1.15.7-orange" ></img>
+		<img src="https://img.shields.io/badge/Api%20Docs-1.15.8-orange" ></img>
 	</a>
 	<a target="_blank" href="https://justauth.wiki" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -97,7 +97,7 @@ These artifacts are available from Maven Central:
 <dependency>
    <groupId>me.zhyd.oauth</groupId>
    <artifactId>JustAuth</artifactId>
-    <version>1.15.7-beta.2</version>
+    <version>1.15.8-beta.2</version>
 </dependency>
 ```
 - Using JustAuth
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven%20Central-1.15.7-blue" ></img>
+		<img src="https://img.shields.io/badge/Maven%20Central-1.15.8-blue" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api%20Docs-1.15.7-orange" ></img>
+		<img src="https://img.shields.io/badge/Api%20Docs-1.15.8-orange" ></img>
 	</a>
 	<a target="_blank" href="https://justauth.wiki" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -107,7 +107,7 @@ JustAuth 集成了诸如：Github、Gitee、支付宝、新浪微博、微信、
 <dependency>
    <groupId>me.zhyd.oauth</groupId>
    <artifactId>JustAuth</artifactId>
-    <version>1.15.7</version>
+    <version>1.15.8</version>
 </dependency>
 ```
 - 调用api
--- a/bin/repVersion.sh
+++ b/bin/repVersion.sh
@@ -25,8 +25,6 @@ fi
 # 替换README.md等文件中的版本
 sed -i "s/${old_version}/${new_version}/g" $pwd/README.md
 sed -i "s/${old_version}/${new_version}/g" $pwd/README.en-US.md
-sed -i "s/${old_version}/${new_version}/g" $pwd/docs/README.md
-sed -i "s/${old_version}/${new_version}/g" $pwd/docs/_coverpage.md

 # 替换pom.xml中的版本
 sed -i "s/${old_version}/${new_version}/g" $pwd/pom.xml
--- a/bin/version.txt
+++ b/bin/version.txt
@@ -1 +1 @@
-1.15.7
+1.15.8
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

  <groupId>me.zhyd.oauth</groupId>
  <artifactId>JustAuth</artifactId>
-  <version>1.15.7</version>
+  <version>1.15.8</version>

  <name>JustAuth</name>
  <url>https://gitee.com/yadong.zhang/JustAuth</url>
@@ -57,9 +57,9 @@
    <maven-surefire-version>2.20</maven-surefire-version>
    <maven-gpg-version>1.6</maven-gpg-version>
    <maven.test.skip>false</maven.test.skip>
-    <simple-http.version>1.0.2</simple-http.version>
+    <simple-http.version>1.0.3</simple-http.version>
    <lombok-version>1.18.10</lombok-version>
-    <junit-version>4.11</junit-version>
+    <junit-version>4.13.1</junit-version>
    <fastjson-version>1.2.73</fastjson-version>
    <alipay-sdk-version>4.8.10.ALL</alipay-sdk-version>
    <jacoco-version>0.8.2</jacoco-version>
Author	SHA1	Message	Date
yadong.zhang	fb90fbdcb8	Merge branch 'master' into dev	2020-10-25 11:04:55 +08:00
yadong.zhang	5f6cb2954f	🔖 Release version 1.15.8	2020-10-25 11:04:49 +08:00
yadong.zhang	906ae659a2	Merge pull request #96 from xkcoding/dev ⬆️ 升级 simple-http 版本 1.0.2->1.0.3，修复 jdk11 超时问题	2020-10-25 10:35:40 +08:00
Yangkai.Shen	cebfd99703	⬆️ 升级 simple-http 版本 1.0.2->1.0.3，修复 jdk11 超时问题	2020-10-25 10:02:18 +08:00
yadong.zhang	71b6080156	Merge pull request #95 from justauth/dependabot/maven/junit-junit-4.13.1 ⬆️ Bump junit from 4.11 to 4.13.1	2020-10-23 11:23:09 +08:00
dependabot[bot]	492ffdbbf8	⬆️ Bump junit from 4.11 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-13 12:29:21 +00:00
@@ -1 +1 @@
 .15.7
 .15.8