Return-Path: 
 <commits-return-28395-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 615AE10B1F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 14 Aug 2013 18:04:20 +0000 (UTC)
Received: (qmail 18094 invoked by uid 500); 14 Aug 2013 18:04:20 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 18044 invoked by uid 500); 14 Aug 2013 18:04:20 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 18032 invoked by uid 99); 14 Aug 2013 18:04:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Aug 2013 18:04:20 +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; Wed, 14 Aug 2013 18:04:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 143092388999;
	Wed, 14 Aug 2013 18:03:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1513981 - /cxf/branches/2.7.x-fixes/parent/pom.xml
Date: Wed, 14 Aug 2013 18:03:59 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130814180359.143092388999@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Wed Aug 14 18:03:58 2013
New Revision: 1513981

URL: http://svn.apache.org/r1513981
Log:
Merged revisions 1513595 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1513595 | dkulp | 2013-08-13 13:27:26 -0400 (Tue, 13 Aug 2013) | 2 lines

  Moxy internally has a dep on javamail for some attachment processing.

........

Modified:
    cxf/branches/2.7.x-fixes/parent/pom.xml

Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1513981&r1=1513980&r2=1513981&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Wed Aug 14 18:03:58 2013
@@ -1639,6 +1639,11 @@
                     <scope>provided</scope>
                     <optional>true</optional>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                    <version>1.7.1</version>
+                </dependency>
             </dependencies>
             <repositories>
                 <repository>