Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1239 from metamx/log4j2forRealz 

Exclude log4j from curator dependencies in favor of log4j-1.2-api
This commit is contained in:
Xavier Léauté 2015-03-26 13:21:13 -07:00
parent 85174364ae 9cd6c08e96
commit 2c58e355fd
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/pom.xml
View File

@ -132,6 +132,10 @@
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId> <artifactId>log4j-jul</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>

5
docs/content/Production-Cluster-Configuration.md
View File

@ -92,6 +92,7 @@ JVM Configuration:
-XX:+PrintGCTimeStamps -XX:+PrintGCTimeStamps
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Djava.io.tmpdir=/mnt/tmp -Djava.io.tmpdir=/mnt/tmp
``` ```
@ -147,6 +148,7 @@ JVM Configuration:
-XX:+PrintGCTimeStamps -XX:+PrintGCTimeStamps
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Djava.io.tmpdir=/mnt/tmp -Djava.io.tmpdir=/mnt/tmp
``` ```
@ -210,6 +212,7 @@ JVM Configuration:
-XX:+PrintGCTimeStamps -XX:+PrintGCTimeStamps
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Djava.io.tmpdir=/mnt/tmp -Djava.io.tmpdir=/mnt/tmp
``` ```
@ -249,6 +252,7 @@ JVM Configuration:
-XX:+PrintGCTimeStamps -XX:+PrintGCTimeStamps
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Djava.io.tmpdir=/mnt/tmp -Djava.io.tmpdir=/mnt/tmp
``` ```
@ -301,6 +305,7 @@ JVM Configuration:
-XX:+PrintGCTimeStamps -XX:+PrintGCTimeStamps
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Djava.io.tmpdir=/mnt/tmp -Djava.io.tmpdir=/mnt/tmp
-Dcom.sun.management.jmxremote.port=17071 -Dcom.sun.management.jmxremote.port=17071

4
docs/content/Simple-Cluster-Configuration.md
View File

@ -32,6 +32,7 @@ Configuration:
-Xmx256m -Xmx256m
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Ddruid.indexer.queue.startDelay=PT0M -Ddruid.indexer.queue.startDelay=PT0M
-Ddruid.indexer.runner.javaOpts="-server -Xmx1g" -Ddruid.indexer.runner.javaOpts="-server -Xmx1g"
@ -56,6 +57,7 @@ Configuration:
-Xmx256m -Xmx256m
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
druid.coordinator.startDelay=PT70s druid.coordinator.startDelay=PT70s
``` ```
@ -77,6 +79,7 @@ Configuration:
-Xmx256m -Xmx256m
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
druid.server.maxSize=10000000000 druid.server.maxSize=10000000000
@ -103,6 +106,7 @@ Configuration:
-Xmx256m -Xmx256m
-Duser.timezone=UTC -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Dfile.encoding=UTF-8
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
druid.processing.buffer.sizeBytes=100000000 druid.processing.buffer.sizeBytes=100000000
druid.processing.numThreads=1 druid.processing.numThreads=1

4
pom.xml
View File

@ -70,7 +70,7 @@
<jetty.version>9.2.5.v20141112</jetty.version> <jetty.version>9.2.5.v20141112</jetty.version>
<druid.api.version>0.3.5</druid.api.version> <druid.api.version>0.3.5</druid.api.version>
<jackson.version>2.4.4</jackson.version> <jackson.version>2.4.4</jackson.version>
<log4j.version>2.1</log4j.version> <log4j.version>2.2</log4j.version>
<slf4j.version>1.7.10</slf4j.version> <slf4j.version>1.7.10</slf4j.version>
</properties> </properties>
@ -611,7 +611,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<!-- locale settings must be set on the command line before startup --> <!-- locale settings must be set on the command line before startup -->
<argLine>-Duser.language=en -Duser.country=US</argLine> <argLine>-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</argLine>
<!-- our tests are very verbose, let's keep the volume down --> <!-- our tests are very verbose, let's keep the volume down -->
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>

7
server/pom.xml
View File

@ -67,6 +67,13 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>
<!-- We use log4j2 and log4j-1.2-api as a bridge -->
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>