Author: fmeschbe
Date: Thu Jun 12 07:41:30 2008
New Revision: 667110
URL: http://svn.apache.org/viewvc?rev=667110&view=rev
Log:
SLING-471 Apply patch by Niklas Gustavsson (slightly modified)
Modified:
incubator/sling/trunk/commons/log/pom.xml
incubator/sling/trunk/commons/testing/pom.xml
incubator/sling/trunk/jcr/classloader/pom.xml
incubator/sling/trunk/launchpad/webapp/pom.xml
incubator/sling/trunk/parent/pom.xml
Modified: incubator/sling/trunk/commons/log/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/pom.xml?rev=667110&r1=667109&r2=667110&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/pom.xml (original)
+++ incubator/sling/trunk/commons/log/pom.xml Thu Jun 12 07:41:30 2008
@@ -57,9 +57,9 @@
org.apache.sling.commons.log.Activator
</Bundle-Activator>
<Export-Package>
- org.apache.commons.logging;version=1.0.4,
+ org.apache.commons.logging;version=1.1.1,
org.apache.log4j;version=1.2.15,
- org.slf4j;version=1.4.3,
+ org.slf4j;version=1.5.2,
org.osgi.service.cm, org.osgi.service.log
</Export-Package>
<Private-Package>
@@ -94,7 +94,7 @@
<!-- Redirection of commons logging and log4j to SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/commons/testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/pom.xml?rev=667110&r1=667109&r2=667110&view=diff
==============================================================================
--- incubator/sling/trunk/commons/testing/pom.xml (original)
+++ incubator/sling/trunk/commons/testing/pom.xml Thu Jun 12 07:41:30 2008
@@ -74,7 +74,7 @@
<!--
Same problem as JCR-683: commons-httpclient depends on
commons-logging. Since
this webapp uses log4j (see the slf4j-log4j12 dependency
below), we need to
- override this dependency with jcl104-over-sflf4j, found
below
+ override this dependency with jcl-over-sflf4j, found below
-->
<exclusion>
<groupId>commons-logging</groupId>
Modified: incubator/sling/trunk/jcr/classloader/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/pom.xml?rev=667110&r1=667109&r2=667110&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/pom.xml (original)
+++ incubator/sling/trunk/jcr/classloader/pom.xml Thu Jun 12 07:41:30 2008
@@ -113,7 +113,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=667110&r1=667109&r2=667110&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Thu Jun 12 07:41:30 2008
@@ -498,7 +498,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/sling/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=667110&r1=667109&r2=667110&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Thu Jun 12 07:41:30 2008
@@ -518,7 +518,7 @@
<!--
Same problem as JCR-683: commons-httpclient depends
on commons-logging. Since
this webapp uses log4j (see the slf4j-log4j12
dependency below), we need to
- override this dependency with jcl104-over-sflf4j,
found below
+ override this dependency with jcl-over-sflf4j,
found below
-->
<exclusion>
<groupId>commons-logging</groupId>
@@ -616,31 +616,31 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.0</version>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
