You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/01 17:24:53 UTC
svn commit: r1164111 - in /incubator/jena: Jena2/ARQ/trunk/pom.xml
Jena2/Fuseki/trunk/pom.xml Scratch/AFS/trunk/pom.xml
Author: andy
Date: Thu Sep 1 15:24:53 2011
New Revision: 1164111
URL: http://svn.apache.org/viewvc?rev=1164111&view=rev
Log:
Use slf4j-jcl connector and exclude common-logging itself.
Modified:
incubator/jena/Jena2/ARQ/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/pom.xml
incubator/jena/Scratch/AFS/trunk/pom.xml
Modified: incubator/jena/Jena2/ARQ/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom.xml?rev=1164111&r1=1164110&r2=1164111&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom.xml Thu Sep 1 15:24:53 2011
@@ -98,6 +98,13 @@
<artifactId>httpclient</artifactId>
<version>${ver.http-client}</version>
<scope>compile</scope>
+ <exclusions>
+ <!-- Replace with slf4j adapter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1164111&r1=1164110&r2=1164111&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Thu Sep 1 15:24:53 2011
@@ -37,8 +37,8 @@
<!-- These two go together -->
<ver.jetty>7.2.1.v20101111</ver.jetty>
<ver.servlet-jsp>2.1.v20100127</ver.servlet-jsp>
- <ver.httpclient>4.0.3</ver.httpclient>
- <ver.httpfileupload>1.2.2</ver.httpfileupload>
+ <ver.http-client>4.1.2</ver.http-client>
+ <ver.commons-fileupload>1.2.2</ver.commons-fileupload>
<ver.junit>4.8.2</ver.junit>
<ver.commonscodec>1.5</ver.commonscodec>
<ver.slf4j>1.6.1</ver.slf4j>
@@ -99,13 +99,20 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${ver.httpclient}</version>
+ <version>${ver.http-client}</version>
+ <exclusions>
+ <!-- Replace with slf4j adapter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${ver.httpfileupload}</version>
+ <version>${ver.commons-fileupload}</version>
</dependency>
<dependency>
Modified: incubator/jena/Scratch/AFS/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/pom.xml?rev=1164111&r1=1164110&r2=1164111&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/pom.xml (original)
+++ incubator/jena/Scratch/AFS/trunk/pom.xml Thu Sep 1 15:24:53 2011
@@ -112,6 +112,13 @@
<artifactId>httpclient</artifactId>
<version>${ver.http-client}</version>
<scope>compile</scope>
+ <exclusions>
+ <!-- Replace with slf4j adapter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -143,6 +150,13 @@
<version>${ver.slf4j}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${ver.slf4j}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- Choose your logging provider
But note ARQ confgures log4j (and java.util.logging)
in its logging support utilities so needs it to