diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..7d975d8f8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +database/* +!database/.placeholder +logs/* +!logs/.placeholder +**/logs +.idea/ +*.iml +remote-sync \ 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 96% 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..644c5a647 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logs/.placeholder b/logs/.placeholder new file mode 100644 index 000000000..e69de29bb