diff --git a/.gitignore b/.gitignore index 3edffecd8..3426ba07a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,6 @@ buildNumber.properties database/* !database/.placeholder +logs/* .idea/ *.iml \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/pom.xml b/gemp-lotr/gemp-lotr-async/pom.xml index 81ae6ae61..3f2b06757 100644 --- a/gemp-lotr/gemp-lotr-async/pom.xml +++ b/gemp-lotr/gemp-lotr-async/pom.xml @@ -22,6 +22,11 @@ netty-all 4.1.49.Final + + log4j + log4j + 1.2.16 + diff --git a/gemp-lotr/gemp-lotr-cards/pom.xml b/gemp-lotr/gemp-lotr-cards/pom.xml index 3e446bebf..15f199cdd 100644 --- a/gemp-lotr/gemp-lotr-cards/pom.xml +++ b/gemp-lotr/gemp-lotr-cards/pom.xml @@ -22,5 +22,10 @@ gemp-lotr-logic ${project.version} + + log4j + log4j + 1.2.16 + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml similarity index 97% rename from gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml rename to gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml index 9cd6ca66d..4c5544080 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml @@ -1,43 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file