incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1210853 - /sling/trunk/bundles/jcr/davex/pom.xml
Date Tue, 06 Dec 2011 10:30:12 GMT
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>
 



Mime
View raw message