Author: manaRH
Date: 2013-09-20 13:05:59 -0400 (Fri, 20 Sep 2013)
New Revision: 15591
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
fixed duplicate definition of slf4j-api after rebase
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-09-20 16:54:29 UTC (rev
15590)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-09-20 17:05:59 UTC (rev
15591)
@@ -50,7 +50,7 @@
<version.infinispan>5.2.7.Final-redhat-1</version.infinispan>
<version.org.jgroups>3.2.10.Final-redhat-2</version.org.jgroups>
- <version.slf4j>1.7.2-redhat-1</version.slf4j>
+ <version.org.slf4j>1.7.2-redhat-1</version.org.slf4j>
<!-- Test frameworks -->
<version.junit>4.10</version.junit>
<version.org.testng>5.14.10</version.org.testng>
@@ -83,6 +83,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${version.org.slf4j}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>${version.org.jboss.spec.jboss.javaee.6.0}</version>
@@ -241,18 +247,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.2-redhat-1</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.2-redhat-1</version>
- </dependency>
<!-- managed hibernate-commons-annotations here to
overwrite usage of
other versions in transitive deps -->
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
