Return-Path: 
 <commits-return-19470-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 751479815
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 27 Apr 2012 20:48:59 +0000 (UTC)
Received: (qmail 45871 invoked by uid 500); 27 Apr 2012 20:48:59 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 45819 invoked by uid 500); 27 Apr 2012 20:48:59 -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 45812 invoked by uid 99); 27 Apr 2012 20:48:59 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 20:48:59 +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; Fri, 27 Apr 2012 20:48:57 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2455E238897A;
	Fri, 27 Apr 2012 20:48:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1331586 -
 /cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
Date: Fri, 27 Apr 2012 20:48:36 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120427204836.2455E238897A@eris.apache.org>

Author: dkulp
Date: Fri Apr 27 20:48:35 2012
New Revision: 1331586

URL: http://svn.apache.org/viewvc?rev=1331586&view=rev
Log:
Fix servlet imports in oauth

Modified:
    cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml

Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml?rev=1331586&r1=1331585&r2=1331586&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml Fri Apr 27 20:48:35 2012
@@ -34,6 +34,11 @@
         <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    <properties>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -52,6 +57,8 @@
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <version>${cxf.servlet-api.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <!--test dependencies-->
         <dependency>