Replace commons-logging by slf4j

git-svn-id: https://svn.argeo.org/slc/trunk@2707 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 9f062156d7893a8751fc5c6a5248d741014761bf..69db135908f6ec3f399a80d3bfcacabd7cfe5a6d 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -112,16 +112,6 @@
                        <artifactId>com.springsource.javax.xml.bind</artifactId>
                </dependency>
 
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-               </dependency>
-
                <!-- DB Drivers -->
                <dependency>
                        <groupId>org.hsqldb</groupId>

diff --git a/pom.xml b/pom.xml
index 67cb7dfd2346054c4d1ffd789a52df76986f864c..571d5d3090e9445c4e93bd419628f5e739b96692 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -386,26 +386,24 @@ limitations under the License.
                                </artifactId>
                                <version>1.2.15</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.apache.commons</groupId>
-                               <artifactId>
-                                       com.springsource.org.apache.commons.logging
-                               </artifactId>
-                               <version>1.1.1</version>
-                       </dependency>
+                       <!--
+                               <dependency> <groupId>org.apache.commons</groupId> <artifactId>
+                               com.springsource.org.apache.commons.logging </artifactId>
+                               <version>1.1.1</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                               <artifactId>com.springsource.slf4j.api</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.jcl</artifactId>
+                               <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
+                               <artifactId>com.springsource.slf4j.log4j</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
 
@@ -414,16 +412,34 @@ limitations under the License.
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.core</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.beans</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.context</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -431,77 +447,168 @@ limitations under the License.
                                        org.springframework.context.support
                                </artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.orm</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.jdbc</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.transaction</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.web</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.web.servlet</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.aop</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.jms</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.ws</groupId>
                                <artifactId>org.springframework.oxm</artifactId>
                                <version>${version.spring-ws}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
+                       <!--  Spring DM (OSGi) -->
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.extender</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.core</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.web.extender</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.web</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.test</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                                <version>1.0.0.argeo4</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <!-- Security -->
@@ -514,6 +621,10 @@ limitations under the License.
                                                <groupId>org.springframework</groupId>
                                                <artifactId>org.springframework.web</artifactId>
                                        </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
                                </exclusions>
                        </dependency>
                        <dependency>
@@ -576,6 +687,12 @@ limitations under the License.
                                <groupId>org.apache.bsf</groupId>
                                <artifactId>com.springsource.org.apache.bsf</artifactId>
                                <version>2.4.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.beanshell</groupId>
@@ -632,6 +749,12 @@ limitations under the License.
                                <groupId>com.mysql.jdbc</groupId>
                                <artifactId>com.springsource.com.mysql.jdbc</artifactId>
                                <version>5.1.6</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <!-- XML -->
@@ -639,6 +762,12 @@ limitations under the License.
                                <groupId>org.codehaus.castor</groupId>
                                <artifactId>com.springsource.org.castor</artifactId>
                                <version>1.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.xerces</groupId>
@@ -772,6 +901,12 @@ limitations under the License.
                                <artifactId>com.springsource.org.hibernate</artifactId>
                                <version>3.2.6.ga</version>
                                <!-- <version>3.3.1.GA</version> TODO: fix issues with logging -->
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>net.sourceforge.jexcelapi</groupId>
@@ -782,6 +917,12 @@ limitations under the License.
                                <groupId>net.sourceforge.ehcache</groupId>
                                <artifactId>com.springsource.net.sf.ehcache</artifactId>
                                <version>1.4.1</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>edu.emory.mathcs.backport</groupId>
@@ -823,6 +964,10 @@ limitations under the License.
                                                <groupId>org.apache.activemq</groupId>
                                                <artifactId>com.springsource.org.apache.activemq</artifactId>
                                        </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
                                </exclusions>
                        </dependency>
                        <!--
@@ -864,6 +1009,64 @@ limitations under the License.
                                <groupId>com.opensymphony.quartz</groupId>
                                <artifactId>com.springsource.org.quartz</artifactId>
                                <version>1.6.2</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <!-- Merged (temp title) -->
+                       <dependency>
+                               <groupId>org.argeo.dep.jemmy</groupId>
+                               <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+                               <version>0.2.2</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.jacob</groupId>
+                               <artifactId>org.argeo.dep.jacob</artifactId>
+                               <version>1.14.3.argeo4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.jacob</groupId>
+                               <artifactId>org.argeo.dep.jacob.win32.x86</artifactId>
+                               <version>1.14.3.argeo4</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>org.springframework.jdbc</artifactId>
+                               <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.custommonkey.xmlunit</groupId>
+                               <artifactId>com.springsource.org.custommonkey.xmlunit</artifactId>
+                               <version>1.2.0</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.beanshell</groupId>
+                               <artifactId>com.springsource.bsh</artifactId>
+                               <version>2.0.0.b4</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+                               <version>1.7.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                </dependencies>
        </dependencyManagement>

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 8c7ee9abc3cecc185e48c8458336b7ba7735a418..9ef19776dc210f05f633726fac80d7ede75c350b 100644 (file)
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -80,14 +80,26 @@
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
+
+               <!--
+                       <dependency> <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                       </dependency> <dependency> <groupId>org.apache.log4j</groupId>
+                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+                       </dependency>
+               -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.apache.log4j</groupId>
                        <artifactId>com.springsource.org.apache.log4j</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.log4j</artifactId>
+               </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -98,7 +110,7 @@
                        <groupId>net.sourceforge.cglib</groupId>
                        <artifactId>com.springsource.net.sf.cglib</artifactId>
                </dependency>
-               
+
                <!-- Test -->
                <dependency>
                        <groupId>org.junit</groupId>
@@ -106,4 +118,4 @@
                        <scope>test</scope>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml
index 6ac8b90cd0754d93c1391413bd33bc775f6bb427..62cbdbba3929c2d384ef8e3bba709c83ee8c6757 100644 (file)
--- a/runtime/org.argeo.slc.detached/pom.xml
+++ b/runtime/org.argeo.slc.detached/pom.xml
@@ -100,9 +100,11 @@
                        <artifactId>com.springsource.junit</artifactId>
                        <scope>test</scope>
                </dependency>
+
                <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 7bfa7c24e91c115a505996ce988d9c3490136f53..55112d87c0db5d779174db34e17a91acf6e1e5d3 100644 (file)
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -59,21 +60,21 @@
                <!--
                        <dependency> <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId> </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
+                       <dependency> <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId>
-                       <version>2.0.4.argeo.1-SNAPSHOT</version>
-               </dependency>
+                       <version>2.0.4.argeo.1-SNAPSHOT</version> </dependency>
                -->
 
                <dependency>
                        <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
                </dependency>
+
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
+
                <!--
                        <dependency> <groupId>org.apache.maven</groupId>
                        <artifactId>maven-embedder</artifactId> <version>2.0.4</version>