Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64 from P0nk/log4j-upgrade

Browse Source 
Bump log4j to 2.15.0
This commit is contained in:
Ponk
2021-12-11 18:03:59 +01:00
committed by GitHub
parent b24945eaba 451d86b5b4
commit 2e827542cf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -17,7 +17,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<mainClass>net.server.Server</mainClass> <mainClass>net.server.Server</mainClass>
<log4j.version>2.14.1</log4j.version> <log4j.version>2.15.0</log4j.version>
<graalvm.version>21.1.0</graalvm.version> <graalvm.version>21.1.0</graalvm.version>
<netty.version>4.1.67.Final</netty.version> <netty.version>4.1.67.Final</netty.version>
<junit.version>5.7.2</junit.version> <junit.version>5.7.2</junit.version>

1
src/main/java/net/server/Server.java
View File

@@ -844,6 +844,7 @@ public class Server {
futures.add(initExecutor.submit(() -> Quest.loadAllQuests())); futures.add(initExecutor.submit(() -> Quest.loadAllQuests()));
futures.add(initExecutor.submit(() -> SkillbookInformationProvider.loadAllSkillbookInformation())); futures.add(initExecutor.submit(() -> SkillbookInformationProvider.loadAllSkillbookInformation()));
futures.add(initExecutor.submit(() -> PlayerNPCFactory.loadFactoryMetadata())); futures.add(initExecutor.submit(() -> PlayerNPCFactory.loadFactoryMetadata()));
initExecutor.shutdown();
TimeZone.setDefault(TimeZone.getTimeZone(YamlConfig.config.server.TIMEZONE)); TimeZone.setDefault(TimeZone.getTimeZone(YamlConfig.config.server.TIMEZONE));