Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

65587: ACE-969 Revert upgrade of slf4j - blocked by a removed method in the newer version: see ACE-1229


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 21:45:54 +00:00
parent 8b3f641803
commit 3ed182f472

View File

@@ -290,12 +290,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.6</version>
<version>1.5.11</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.6</version>
<version>1.5.11</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -306,7 +306,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.6</version>
<version>1.5.11</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>