Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
1f03a845
Unverified
Commit
1f03a845
authored
Sep 23, 2018
by
Liang Ding
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/2.9.5-dev' into 2.9.5-dev
parents
ede792ea
bbaa2b95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
pom.xml
pom.xml
+2
-2
src/main/java/org/b3log/solo/Starter.java
src/main/java/org/b3log/solo/Starter.java
+1
-3
No files found.
pom.xml
View file @
1f03a845
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 3.18.3.2
0, Sep 16
, 2018
Version: 3.18.3.2
1, Sep 23
, 2018
Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a>
Author: <a href="http://vanessa.b3log.org">Vanessa</a>
...
...
@@ -83,7 +83,7 @@
<jsoup.version>
1.9.1
</jsoup.version>
<flexmark.version>
0.34.30
</flexmark.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-codec.version>
1.10
</commons-codec.version>
<emoji-java.version>
3.2.0
</emoji-java.version>
...
...
src/main/java/org/b3log/solo/Starter.java
View file @
1f03a845
...
...
@@ -39,7 +39,7 @@ import java.net.URI;
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.1
3, Sep 16
, 2018
* @version 1.1.0.1
4, Sep 23
, 2018
* @since 1.2.0
*/
public
final
class
Starter
{
...
...
@@ -155,7 +155,6 @@ public final class Starter {
}
final
int
port
=
Integer
.
valueOf
(
portArg
);
final
Server
server
=
new
Server
(
port
);
final
WebAppContext
root
=
new
WebAppContext
();
root
.
setParentLoaderPriority
(
true
);
// Use parent class loader
...
...
@@ -163,7 +162,6 @@ public final class Starter {
root
.
setDescriptor
(
webappDirLocation
+
"/WEB-INF/web.xml"
);
root
.
setResourceBase
(
webappDirLocation
);
server
.
setHandler
(
root
);
try
{
server
.
start
();
}
catch
(
final
Exception
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment