Commit 1f03a845 authored by Liang Ding's avatar Liang Ding

Merge remote-tracking branch 'origin/2.9.5-dev' into 2.9.5-dev

parents ede792ea bbaa2b95
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.18.3.20, Sep 16, 2018 Version: 3.18.3.21, Sep 23, 2018
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
Author: <a href="http://vanessa.b3log.org">Vanessa</a> Author: <a href="http://vanessa.b3log.org">Vanessa</a>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<jsoup.version>1.9.1</jsoup.version> <jsoup.version>1.9.1</jsoup.version>
<flexmark.version>0.34.30</flexmark.version> <flexmark.version>0.34.30</flexmark.version>
<qiniu.version>7.2.11</qiniu.version> <qiniu.version>7.2.11</qiniu.version>
<jetty.version>9.2.9.v20150224</jetty.version> <jetty.version>9.4.12.v20180830</jetty.version>
<commons-cli.version>1.3.1</commons-cli.version> <commons-cli.version>1.3.1</commons-cli.version>
<commons-codec.version>1.10</commons-codec.version> <commons-codec.version>1.10</commons-codec.version>
<emoji-java.version>3.2.0</emoji-java.version> <emoji-java.version>3.2.0</emoji-java.version>
......
...@@ -39,7 +39,7 @@ import java.net.URI; ...@@ -39,7 +39,7 @@ import java.net.URI;
* </ul> * </ul>
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.13, Sep 16, 2018 * @version 1.1.0.14, Sep 23, 2018
* @since 1.2.0 * @since 1.2.0
*/ */
public final class Starter { public final class Starter {
...@@ -155,7 +155,6 @@ public final class Starter { ...@@ -155,7 +155,6 @@ public final class Starter {
} }
final int port = Integer.valueOf(portArg); final int port = Integer.valueOf(portArg);
final Server server = new Server(port); final Server server = new Server(port);
final WebAppContext root = new WebAppContext(); final WebAppContext root = new WebAppContext();
root.setParentLoaderPriority(true); // Use parent class loader root.setParentLoaderPriority(true); // Use parent class loader
...@@ -163,7 +162,6 @@ public final class Starter { ...@@ -163,7 +162,6 @@ public final class Starter {
root.setDescriptor(webappDirLocation + "/WEB-INF/web.xml"); root.setDescriptor(webappDirLocation + "/WEB-INF/web.xml");
root.setResourceBase(webappDirLocation); root.setResourceBase(webappDirLocation);
server.setHandler(root); server.setHandler(root);
try { try {
server.start(); server.start();
} catch (final Exception e) { } catch (final Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment