Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove conflict warning by using logback's slf4j version
And bump logback version while we're at it
  • Loading branch information
jcrossley3 committed Jul 30, 2015
1 parent 419d339 commit 626b39b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
5 changes: 0 additions & 5 deletions modules/core/pom.xml
Expand Up @@ -17,11 +17,6 @@

<dependencies>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
9 changes: 1 addition & 8 deletions pom.xml
Expand Up @@ -42,8 +42,7 @@
</modules>

<properties>
<version.slf4j>1.7.5</version.slf4j>
<version.logback>1.1.2</version.logback>
<version.logback>1.1.3</version.logback>
<version.jboss-logging>3.1.4.GA</version.jboss-logging>
<version.junit>4.11</version.junit>
<version.clojure>1.7.0</version.clojure>
Expand Down Expand Up @@ -98,12 +97,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down

0 comments on commit 626b39b

Please sign in to comment.