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 0E8AE957F for ; Thu, 15 Mar 2012 21:32:33 +0000 (UTC) Received: (qmail 97942 invoked by uid 500); 15 Mar 2012 21:32:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97830 invoked by uid 500); 15 Mar 2012 21:32:32 -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 97821 invoked by uid 99); 15 Mar 2012 21:32:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2012 21:32:32 +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; Thu, 15 Mar 2012 21:32:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A1D1C23889E1; Thu, 15 Mar 2012 21:32:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1301213 - /cxf/branches/2.5.x-fixes/ Date: Thu, 15 Mar 2012 21:32:09 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120315213209.A1D1C23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Mar 15 21:32:09 2012 New Revision: 1301213 URL: http://svn.apache.org/viewvc?rev=1301213&view=rev Log: Blocking revisions 1300594,1300630,1300662,1300673,1300691,1300714,1301005,1301131,1301154,1301158 via svn from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300594 | dkulp | 2012-03-14 11:37:19 -0400 (Wed, 14 Mar 2012) | 1 line pom was obviously copied from http's pom, but osgi info not updated ........ ........ r1300630 | dkulp | 2012-03-14 12:42:27 -0400 (Wed, 14 Mar 2012) | 1 line Bunch of OSGi manifest and feature updates ........ ........ r1300662 | dkulp | 2012-03-14 13:46:05 -0400 (Wed, 14 Mar 2012) | 2 lines Update versions for various things we use, particularly OSGi bundles to use the new bundles that have sources attachable. ........ ........ r1300673 | dkulp | 2012-03-14 14:19:46 -0400 (Wed, 14 Mar 2012) | 1 line Fix java 5 compile ........ ........ r1300691 | dkulp | 2012-03-14 15:24:32 -0400 (Wed, 14 Mar 2012) | 1 line More osgi updates ........ ........ r1300714 | dkulp | 2012-03-14 16:39:20 -0400 (Wed, 14 Mar 2012) | 1 line Back out a version of the jaxb bundle due to a bug that affects Camel ........ ........ r1301005 | dkulp | 2012-03-15 10:35:22 -0400 (Thu, 15 Mar 2012) | 1 line Fix typo in sts feature ........ ........ r1301131 | dkulp | 2012-03-15 14:33:13 -0400 (Thu, 15 Mar 2012) | 3 lines Update the HTTPTransportActivator stuff to not have to sync on ALL the matchers, just on each one individually. Also, apply the regex stuff first, then the specific address based and name based last. ........ ........ r1301154 | dkulp | 2012-03-15 15:07:46 -0400 (Thu, 15 Mar 2012) | 1 line Fix java5 compile ........ ........ r1301158 | dkulp | 2012-03-15 15:21:16 -0400 (Thu, 15 Mar 2012) | 2 lines Cleanup some deps in hopes that jenkins will generate the same Import-Packages that I get locally ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.