Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D5E310E63 for ; Mon, 12 Aug 2013 20:54:15 +0000 (UTC) Received: (qmail 6789 invoked by uid 500); 12 Aug 2013 20:54:15 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6756 invoked by uid 500); 12 Aug 2013 20:54:15 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6743 invoked by uid 99); 12 Aug 2013 20:54:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Aug 2013 20:54:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Aug 2013 20:54:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AB63523889BB; Mon, 12 Aug 2013 20:53:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1513254 - in /cxf/trunk: core/ distribution/ distribution/manifest/ parent/ rt/databinding/aegis/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/frontend/simple/ rt/javascript/javascript-tests/ rt/management/ rt/rs/clien... Date: Mon, 12 Aug 2013 20:53:51 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130812205352.AB63523889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Aug 12 20:53:50 2013 New Revision: 1513254 URL: http://svn.apache.org/r1513254 Log: Flip to using jc-over-slf4j for testing and such to make sure all the logging goes to one place Modified: cxf/trunk/core/pom.xml cxf/trunk/distribution/manifest/pom.xml cxf/trunk/distribution/pom.xml cxf/trunk/parent/pom.xml cxf/trunk/rt/databinding/aegis/pom.xml cxf/trunk/rt/databinding/xmlbeans/pom.xml cxf/trunk/rt/frontend/jaxrs/pom.xml cxf/trunk/rt/frontend/jaxws/pom.xml cxf/trunk/rt/frontend/simple/pom.xml cxf/trunk/rt/javascript/javascript-tests/pom.xml cxf/trunk/rt/management/pom.xml cxf/trunk/rt/rs/client/pom.xml cxf/trunk/rt/security/pom.xml cxf/trunk/rt/transports/http-hc/pom.xml cxf/trunk/rt/transports/http-jetty/pom.xml cxf/trunk/rt/transports/http-netty/netty-client/pom.xml cxf/trunk/rt/transports/http-netty/netty-server/pom.xml cxf/trunk/rt/transports/http/pom.xml cxf/trunk/rt/ws/policy/pom.xml cxf/trunk/rt/ws/rm/pom.xml cxf/trunk/services/sts/sts-core/pom.xml cxf/trunk/systests/databinding/pom.xml cxf/trunk/systests/jaxws/pom.xml cxf/trunk/systests/rs-security/pom.xml cxf/trunk/systests/transport-jms/pom.xml cxf/trunk/systests/transports/pom.xml cxf/trunk/systests/uncategorized/pom.xml cxf/trunk/systests/ws-rm/pom.xml cxf/trunk/systests/ws-security/pom.xml cxf/trunk/systests/ws-specs/pom.xml cxf/trunk/tools/javato/ws/pom.xml Modified: cxf/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/core/pom.xml (original) +++ cxf/trunk/core/pom.xml Mon Aug 12 20:53:50 2013 @@ -98,12 +98,23 @@ log4j 1.2.17 true + provided org.slf4j slf4j-api true + + org.slf4j + slf4j-jdk14 + test + + + org.slf4j + jcl-over-slf4j + test + cglib Modified: cxf/trunk/distribution/manifest/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/distribution/manifest/pom.xml (original) +++ cxf/trunk/distribution/manifest/pom.xml Mon Aug 12 20:53:50 2013 @@ -179,7 +179,10 @@ org.slf4j slf4j-jdk14 - + + org.slf4j + jcl-over-slf4j + ${project.groupId} cxf-rt-transports-jms @@ -360,10 +363,6 @@ ${cxf.asm.artifactId} - commons-logging - commons-logging - - com.sun.xml.fastinfoset FastInfoset Modified: cxf/trunk/distribution/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/distribution/pom.xml (original) +++ cxf/trunk/distribution/pom.xml Mon Aug 12 20:53:50 2013 @@ -187,6 +187,10 @@ org.slf4j slf4j-jdk14 + + org.slf4j + jcl-over-slf4j + ${project.groupId} @@ -408,10 +412,6 @@ ${cxf.asm.artifactId} - commons-logging - commons-logging - - com.sun.xml.fastinfoset FastInfoset Modified: cxf/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/parent/pom.xml (original) +++ cxf/trunk/parent/pom.xml Mon Aug 12 20:53:50 2013 @@ -623,16 +623,34 @@ org.apache.httpcomponents httpclient ${cxf.httpcomponents.client.version} + + + commons-logging + commons-logging + + org.apache.httpcomponents httpcore-nio ${cxf.httpcomponents.core.version} + + + commons-logging + commons-logging + + org.apache.httpcomponents httpasyncclient ${cxf.httpcomponents.asyncclient.version} + + + commons-logging + commons-logging + + org.apache.maven @@ -773,6 +791,11 @@ org.slf4j + jcl-over-slf4j + ${cxf.slf4j.version} + + + org.slf4j slf4j-api ${cxf.slf4j.version} @@ -940,6 +963,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -963,6 +990,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -986,6 +1017,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -1009,6 +1044,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -1032,6 +1071,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -1055,6 +1098,10 @@ avalon-framework avalon-framework + + commons-logging + commons-logging + @@ -1156,6 +1203,12 @@ commons-httpclient commons-httpclient 3.1 + + + commons-logging + commons-logging + + commons-codec Modified: cxf/trunk/rt/databinding/aegis/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/pom.xml (original) +++ cxf/trunk/rt/databinding/aegis/pom.xml Mon Aug 12 20:53:50 2013 @@ -73,6 +73,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-rt-frontend-jaxws ${project.version} Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original) +++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Mon Aug 12 20:53:50 2013 @@ -102,10 +102,15 @@ test - org.slf4j - slf4j-jdk14 - test - + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + org.springframework spring-beans Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/pom.xml (original) +++ cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Aug 12 20:53:50 2013 @@ -80,8 +80,8 @@ javax.ws.rs-api - javax.annotation - javax.annotation-api + javax.annotation + javax.annotation-api @@ -122,6 +122,11 @@ org.slf4j + jcl-over-slf4j + test + + + org.slf4j slf4j-jdk14 test Modified: cxf/trunk/rt/frontend/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/pom.xml (original) +++ cxf/trunk/rt/frontend/jaxws/pom.xml Mon Aug 12 20:53:50 2013 @@ -172,7 +172,17 @@ org.apache.geronimo.specs geronimo-javamail_1.4_spec test - + + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + Modified: cxf/trunk/rt/frontend/simple/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/pom.xml (original) +++ cxf/trunk/rt/frontend/simple/pom.xml Mon Aug 12 20:53:50 2013 @@ -94,6 +94,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-core ${project.version} Modified: cxf/trunk/rt/javascript/javascript-tests/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-tests/pom.xml (original) +++ cxf/trunk/rt/javascript/javascript-tests/pom.xml Mon Aug 12 20:53:50 2013 @@ -92,6 +92,11 @@ org.slf4j + jcl-over-slf4j + test + + + org.slf4j slf4j-jdk14 test Modified: cxf/trunk/rt/management/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/management/pom.xml (original) +++ cxf/trunk/rt/management/pom.xml Mon Aug 12 20:53:50 2013 @@ -45,6 +45,11 @@ ${project.version} + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-testutils ${project.version} Modified: cxf/trunk/rt/rs/client/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/rs/client/pom.xml (original) +++ cxf/trunk/rt/rs/client/pom.xml Mon Aug 12 20:53:50 2013 @@ -91,9 +91,15 @@ easymock test + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + - - - - Modified: cxf/trunk/rt/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/security/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/security/pom.xml (original) +++ cxf/trunk/rt/security/pom.xml Mon Aug 12 20:53:50 2013 @@ -59,8 +59,9 @@ - commons-logging - commons-logging + org.slf4j + slf4j-jdk14 + test junit Modified: cxf/trunk/rt/transports/http-hc/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-hc/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-hc/pom.xml (original) +++ cxf/trunk/rt/transports/http-hc/pom.xml Mon Aug 12 20:53:50 2013 @@ -75,7 +75,11 @@ org.slf4j slf4j-jdk14 - 1.6.2 + test + + + org.slf4j + jcl-over-slf4j test Modified: cxf/trunk/rt/transports/http-jetty/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/pom.xml (original) +++ cxf/trunk/rt/transports/http-jetty/pom.xml Mon Aug 12 20:53:50 2013 @@ -124,6 +124,11 @@ org.slf4j + jcl-over-slf4j + test + + + org.slf4j slf4j-jdk14 test Modified: cxf/trunk/rt/transports/http-netty/netty-client/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-netty/netty-client/pom.xml (original) +++ cxf/trunk/rt/transports/http-netty/netty-client/pom.xml Mon Aug 12 20:53:50 2013 @@ -112,7 +112,16 @@ ${project.version} test - + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + Modified: cxf/trunk/rt/transports/http-netty/netty-server/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-netty/netty-server/pom.xml (original) +++ cxf/trunk/rt/transports/http-netty/netty-server/pom.xml Mon Aug 12 20:53:50 2013 @@ -123,7 +123,16 @@ ${project.version} test - + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + Modified: cxf/trunk/rt/transports/http/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/pom.xml (original) +++ cxf/trunk/rt/transports/http/pom.xml Mon Aug 12 20:53:50 2013 @@ -102,6 +102,16 @@ org.apache.aries.blueprint.core true + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test + Modified: cxf/trunk/rt/ws/policy/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/pom.xml (original) +++ cxf/trunk/rt/ws/policy/pom.xml Mon Aug 12 20:53:50 2013 @@ -96,6 +96,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.easymock easymock test Modified: cxf/trunk/rt/ws/rm/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/pom.xml (original) +++ cxf/trunk/rt/ws/rm/pom.xml Mon Aug 12 20:53:50 2013 @@ -120,7 +120,11 @@ provided true - + + org.slf4j + jcl-over-slf4j + test + Modified: cxf/trunk/services/sts/sts-core/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/pom.xml (original) +++ cxf/trunk/services/sts/sts-core/pom.xml Mon Aug 12 20:53:50 2013 @@ -67,6 +67,12 @@ ${cxf.spring.ldap.version} provided true + + + commons-logging + commons-logging + + com.hazelcast @@ -88,6 +94,11 @@ org.slf4j + jcl-over-slf4j + test + + + org.slf4j slf4j-jdk14 test Modified: cxf/trunk/systests/databinding/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/databinding/pom.xml (original) +++ cxf/trunk/systests/databinding/pom.xml Mon Aug 12 20:53:50 2013 @@ -250,7 +250,12 @@ org.slf4j slf4j-jdk14 test - + + + org.slf4j + jcl-over-slf4j + test + org.apache.cxf cxf-rt-transports-local Modified: cxf/trunk/systests/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/jaxws/pom.xml (original) +++ cxf/trunk/systests/jaxws/pom.xml Mon Aug 12 20:53:50 2013 @@ -141,6 +141,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-rt-transports-local ${project.version} Modified: cxf/trunk/systests/rs-security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/rs-security/pom.xml (original) +++ cxf/trunk/systests/rs-security/pom.xml Mon Aug 12 20:53:50 2013 @@ -97,6 +97,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-rt-frontend-jaxrs ${project.version} Modified: cxf/trunk/systests/transport-jms/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/pom.xml (original) +++ cxf/trunk/systests/transport-jms/pom.xml Mon Aug 12 20:53:50 2013 @@ -149,7 +149,12 @@ org.slf4j slf4j-jdk14 test - + + + org.slf4j + jcl-over-slf4j + test + org.apache.cxf cxf-rt-transports-local Modified: cxf/trunk/systests/transports/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/transports/pom.xml (original) +++ cxf/trunk/systests/transports/pom.xml Mon Aug 12 20:53:50 2013 @@ -134,7 +134,12 @@ org.slf4j slf4j-jdk14 test - + + + org.slf4j + jcl-over-slf4j + test + org.apache.cxf cxf-rt-transports-local Modified: cxf/trunk/systests/uncategorized/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/uncategorized/pom.xml (original) +++ cxf/trunk/systests/uncategorized/pom.xml Mon Aug 12 20:53:50 2013 @@ -174,7 +174,12 @@ org.slf4j slf4j-jdk14 test - + + + org.slf4j + jcl-over-slf4j + test + org.apache.cxf cxf-rt-transports-local Modified: cxf/trunk/systests/ws-rm/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/ws-rm/pom.xml (original) +++ cxf/trunk/systests/ws-rm/pom.xml Mon Aug 12 20:53:50 2013 @@ -74,6 +74,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-rt-ws-addr ${project.version} Modified: cxf/trunk/systests/ws-security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/pom.xml (original) +++ cxf/trunk/systests/ws-security/pom.xml Mon Aug 12 20:53:50 2013 @@ -104,6 +104,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-core ${project.version} Modified: cxf/trunk/systests/ws-specs/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/pom.xml (original) +++ cxf/trunk/systests/ws-specs/pom.xml Mon Aug 12 20:53:50 2013 @@ -125,6 +125,11 @@ test + org.slf4j + jcl-over-slf4j + test + + org.apache.cxf cxf-rt-ws-addr ${project.version} Modified: cxf/trunk/tools/javato/ws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=1513254&r1=1513253&r2=1513254&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/pom.xml (original) +++ cxf/trunk/tools/javato/ws/pom.xml Mon Aug 12 20:53:50 2013 @@ -149,7 +149,16 @@ ${project.version} test - + + org.slf4j + jcl-over-slf4j + test + + + org.slf4j + slf4j-jdk14 + test +