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 5CA759644 for ; Mon, 6 Feb 2012 22:15:35 +0000 (UTC) Received: (qmail 35606 invoked by uid 500); 6 Feb 2012 22:15:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35562 invoked by uid 500); 6 Feb 2012 22:15:34 -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 35555 invoked by uid 99); 6 Feb 2012 22:15:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 22:15:34 +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, 06 Feb 2012 22:15:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B879B2388B34 for ; Mon, 6 Feb 2012 22:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1241215 - in /cxf/branches/2.4.x-fixes: ./ osgi/bundle/pom.xml pom.xml Date: Mon, 06 Feb 2012 22:15:11 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120206221511.B879B2388B34@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Feb 6 22:15:11 2012 New Revision: 1241215 URL: http://svn.apache.org/viewvc?rev=1241215&view=rev Log: Merged revisions 1241197 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1241197 | dkulp | 2012-02-06 16:44:15 -0500 (Mon, 06 Feb 2012) | 10 lines Merged revisions 1241174 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1241174 | dkulp | 2012-02-06 15:55:10 -0500 (Mon, 06 Feb 2012) | 2 lines Add notimestamp to javadoc calls. With the timestamp removed, updating the javadoc in svn will involve much smaller diffs ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/osgi/bundle/pom.xml cxf/branches/2.4.x-fixes/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/osgi/bundle/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/pom.xml?rev=1241215&r1=1241214&r2=1241215&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/osgi/bundle/pom.xml (original) +++ cxf/branches/2.4.x-fixes/osgi/bundle/pom.xml Mon Feb 6 22:15:11 2012 @@ -179,6 +179,7 @@ cxf.schema.version = ${os}

Apache CXF API

${project.build.directory}/sources + true Modified: cxf/branches/2.4.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/pom.xml?rev=1241215&r1=1241214&r2=1241215&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/pom.xml (original) +++ cxf/branches/2.4.x-fixes/pom.xml Mon Feb 6 22:15:11 2012 @@ -504,6 +504,7 @@ 1.5 UTF-8 false + true