Return-Path: 
 <commits-return-10412-apmail-sling-commits-archive=sling.apache.org@sling.apache.org>
X-Original-To: apmail-sling-commits-archive@www.apache.org
Delivered-To: apmail-sling-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 A37A896E3
	for <apmail-sling-commits-archive@www.apache.org>;
 Tue,  6 Dec 2011 10:30:34 +0000 (UTC)
Received: (qmail 50821 invoked by uid 500); 6 Dec 2011 10:30:34 -0000
Delivered-To: apmail-sling-commits-archive@sling.apache.org
Received: (qmail 50786 invoked by uid 500); 6 Dec 2011 10:30:34 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 50779 invoked by uid 99); 6 Dec 2011 10:30:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2011 10:30: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; Tue, 06 Dec 2011 10:30:33 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AC08323889E7;
	Tue,  6 Dec 2011 10:30:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1210853 - /sling/trunk/bundles/jcr/davex/pom.xml
Date: Tue, 06 Dec 2011 10:30:12 -0000
To: commits@sling.apache.org
From: fmeschbe@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111206103012.AC08323889E7@eris.apache.org>

Author: fmeschbe
Date: Tue Dec  6 10:30:12 2011
New Revision: 1210853

URL: http://svn.apache.org/viewvc?rev=1210853&view=rev
Log:
SLING-2301 Update to Jackrabbit JCR Server 2.3.4 and import Jackrabbit WebDAV (instead of embedding)

Modified:
    sling/trunk/bundles/jcr/davex/pom.xml

Modified: sling/trunk/bundles/jcr/davex/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1210853&r1=1210852&r2=1210853&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/pom.xml (original)
+++ sling/trunk/bundles/jcr/davex/pom.xml Tue Dec  6 10:30:12 2011
@@ -41,23 +41,21 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-Category>sling,jcr</Bundle-Category>
                         <Private-Package>
+                            org.apache.jackrabbit.server,
+                            org.apache.jackrabbit.server.jcr,
+                            org.apache.jackrabbit.server.remoting.davex,
+                            org.apache.jackrabbit.server.util,
+                            org.apache.jackrabbit.webdav.jcr.*,
                             org.apache.sling.jcr.davex.impl.*
                         </Private-Package>
-                        <Import-Package>
-                            <!-- ignore HTTP client methods of webdav -->
-                            !org.apache.commons.httpclient.*,
-
-                            <!-- import the rest -->
-                            *
-                        </Import-Package>
                         <Embed-Dependency>
-                            jackrabbit-jcr-server,
-                            jackrabbit-webdav,
+                            jackrabbit-jcr-server;inline=org/apache/jackrabbit/server/io/IOUtil*.class,
                             org.apache.sling.commons.osgi;inline=org/apache/sling/commons/osgi/OsgiUtil.class
                         </Embed-Dependency>
                     </instructions>
@@ -88,13 +86,13 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-server</artifactId>
-            <version>2.2.9</version>
+            <version>2.3.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.2.9</version>
+            <version>2.3.4</version>
             <scope>provided</scope>
         </dependency>