Skip to content

Commit c457ef0

Browse files
8825088250
committed
🔖 Release 2.2.0
1 parent 3b9837b commit c457ef0

File tree

5 files changed

+24
-10
lines changed

5 files changed

+24
-10
lines changed

‎CHANGE_LOGS.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@
2626
</style>
2727
</head>
2828
<body>
29+
<h2>Release 2.2.0 - Jul 10, 2017</h2>
30+
<ul>
31+
<li><a href="https://github.com/b3log/solo/issues/12293">12293 支持 Hexo/Jekyll 数据导入</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
32+
<li><a href="https://github.com/b3log/solo/issues/12317">12317 引入新的 Markdown 引擎（NodeJS marked）</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
33+
<li><a href="https://github.com/b3log/solo/issues/12299">12299 加密文章表单自适应</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
34+
<li><a href="https://github.com/b3log/solo/issues/12304">12304 替换 MD 处理引擎</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
35+
<li><a href="https://github.com/b3log/solo/issues/12307">12307 无效日志缩减</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
36+
<li><a href="https://github.com/b3log/solo/issues/12308">12308 配置 MetaWeblog API 报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
37+
</ul>
2938
<h2>Release 2.1.0 - May 25, 2017</h2>
3039
<ul>
3140
<li><a href="https://github.com/b3log/solo/issues/12284">12284 H2 SQL 文件导出</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
Description: Solo POM.
4-
Version: 3.17.1.42, Jul 8, 2017
4+
Version: 3.17.1.43, Jul 10, 2017
55
Author: <a href="http://88250.b3log.org">Liang Ding</a>
66
Author: <a href="http://www.annpeter.cn">Ann Peter</a>
77
Author: <a href="http://vanessa.b3log.org">Vanessa</a>
@@ -14,7 +14,7 @@
1414
<artifactId>solo</artifactId>
1515
<packaging>war</packaging>
1616
<name>Solo</name>
17-
<version>2.1.0</version>
17+
<version>2.2.0</version>
1818
<description>
1919
A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧！
2020
</description>

‎src/main/java/org/b3log/solo/SoloServletListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
* Solo Servlet listener.
6161
*
6262
* @author <a href="http://88250.b3log.org">Liang Ding</a>
63-
* @version 1.9.3.22, Jun 25, 2017
63+
* @version 1.9.3.23, Jul 10, 2017
6464
* @since 0.3.1
6565
*/
6666
public final class SoloServletListener extends AbstractServletListener {
6767

6868
/**
6969
* Solo version.
7070
*/
71-
public static final String VERSION = "2.1.0";
71+
public static final String VERSION = "2.2.0";
7272

7373
/**
7474
* JSONO print indent factor.

‎src/main/java/org/b3log/solo/service/UpgradeService.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
*
5252
* @author <a href="http://88250.b3log.org">Liang Ding</a>
5353
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
54-
* @version 1.2.0.13, May 25, 2017
54+
* @version 1.2.0.14, Jul 10, 2017
5555
* @since 1.2.0
5656
*/
5757
@Service
@@ -75,7 +75,7 @@ public class UpgradeService {
7575
/**
7676
* Old version.
7777
*/
78-
private static final String FROM_VER = "2.0.0";
78+
private static final String FROM_VER = "2.1.0";
7979

8080
/**
8181
* New version.
@@ -175,10 +175,6 @@ private void perform() throws Exception {
175175
versionOpt.put(Option.OPTION_VALUE, TO_VER);
176176
optionRepository.update(Option.ID_C_VERSION, versionOpt);
177177

178-
final JSONObject editorTypeOpt = optionRepository.get(Option.ID_C_EDITOR_TYPE);
179-
editorTypeOpt.put(Option.OPTION_VALUE, Option.DefaultPreference.DEFAULT_EDITOR_TYPE);
180-
optionRepository.update(Option.ID_C_EDITOR_TYPE, editorTypeOpt);
181-
182178
transaction.commit();
183179

184180
LOGGER.log(Level.INFO, "Updated preference");

‎src/main/webapp/CHANGE_LOGS.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@
2626
</style>
2727
</head>
2828
<body>
29+
<h2>Release 2.2.0 - Jul 10, 2017</h2>
30+
<ul>
31+
<li><a href="https://github.com/b3log/solo/issues/12293">12293 支持 Hexo/Jekyll 数据导入</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
32+
<li><a href="https://github.com/b3log/solo/issues/12317">12317 引入新的 Markdown 引擎（NodeJS marked）</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
33+
<li><a href="https://github.com/b3log/solo/issues/12299">12299 加密文章表单自适应</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
34+
<li><a href="https://github.com/b3log/solo/issues/12304">12304 替换 MD 处理引擎</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
35+
<li><a href="https://github.com/b3log/solo/issues/12307">12307 无效日志缩减</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
36+
<li><a href="https://github.com/b3log/solo/issues/12308">12308 配置 MetaWeblog API 报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
37+
</ul>
2938
<h2>Release 2.1.0 - May 25, 2017</h2>
3039
<ul>
3140
<li><a href="https://github.com/b3log/solo/issues/12284">12284 H2 SQL 文件导出</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

0 commit comments

Comments
 (0)