Skip to content

Commit

Permalink
Merge pull request #41 from finn-no/bugfix/provided-logging-frameworks
Browse files Browse the repository at this point in the history
Projects that use brave are not necessarily using log4j
  • Loading branch information
kristofa committed Oct 14, 2014
2 parents 5f5546e + adef60f commit cc27f0d
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>com.github.kristofa</groupId>
Expand Down Expand Up @@ -43,7 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.2.RELEASE</spring.version>
</properties>

<modules>
<module>brave-interfaces</module>
<module>brave-impl</module>
Expand All @@ -58,7 +58,7 @@
<module>flume-zipkin-metrics-sink</module>
<module>brave-apache-http-interceptors</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -102,12 +102,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>provided</scope>
</dependency>
<!-- Slf4j is tricky to get right so put our dependencies here. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -118,9 +120,10 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -151,10 +154,10 @@
</testResource>
<testResource>
<filtering>false</filtering>
<directory>src/test/resources</directory>
<directory>src/test/resources</directory>
</testResource>
</testResources>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -228,8 +231,8 @@
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
Expand Down

0 comments on commit cc27f0d

Please sign in to comment.