Author: ate
Date: Wed Mar 28 20:48:43 2012
New Revision: 1306590
URL: http://svn.apache.org/viewvc?rev=1306590&view=rev
Log:
RAVE-529: Bump back to slf4j-1.6.1 by excluding shindig-server war packaged
slf4j-* (1.5.x)
See: https://issues.apache.org/jira/browse/RAVE-529
Modified:
rave/trunk/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1306590&r1=1306589&r2=1306590&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Wed Mar 28 20:48:43 2012
@@ -51,7 +51,7 @@
<javax.servlet.version>2.5</javax.servlet.version>
<jsp-api.version>2.1</jsp-api.version>
<el-api.version>1.0</el-api.version>
- <org.slf4j.version>1.5.11</org.slf4j.version>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
<commons-lang.version>2.6</commons-lang.version>
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml?rev=1306590&r1=1306589&r2=1306590&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
Wed Mar 28 20:48:43 2012
@@ -63,6 +63,19 @@
<artifactId>shindig-server</artifactId>
<type>war</type>
</dependency>
+
+ <!-- log4j logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -89,6 +102,10 @@
<overlay>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
+ <excludes>
+ <exclude>WEB-INF/lib/commons-logging-*.jar</exclude>
+ <exclude>WEB-INF/lib/slf4j-*.jar</exclude>
+ </excludes>
</overlay>
</overlays>
</configuration>
