You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:47:34 UTC

[sling-org-apache-sling-jcr-davex] 30/44: SLING-2301 Update to Jackrabbit JCR Server 2.3.4 and import Jackrabbit WebDAV (instead of embedding)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.davex-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-davex.git

commit fbcb7a367e54c94a7d04b401dccd404f6cffabd0
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Tue Dec 6 10:30:12 2011 +0000

    SLING-2301 Update to Jackrabbit JCR Server 2.3.4 and import Jackrabbit WebDAV (instead of embedding)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/davex@1210853 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index be90d86..a4a55f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.