sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-jcr-webdav] 18/29: SLING-2302 Update to Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
Date Tue, 07 Nov 2017 09:51:23 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit b5d9a118c70b0b7ffa368071aad3fc1ad631046c
Author: Felix Meschberger <fmeschbe@apache.org>
AuthorDate: Tue Dec 6 10:28:53 2011 +0000

    SLING-2302 Update to Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1210851 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index c52e266..3affc27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,37 +51,29 @@
             <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>
-                        <_exportcontents>
-                            org.apache.jackrabbit.server.io; version=2.3,
-                            org.apache.jackrabbit.webdav;
-                            org.apache.jackrabbit.webdav.property; version=2.3
-                        </_exportcontents>
+                        <Export-Package>
+                            org.apache.jackrabbit.server.io;version=2.3;provide:=true
+                        </Export-Package>
                         <Private-Package>
+                            org.apache.jackrabbit.server,
+                            org.apache.jackrabbit.webdav.simple,
                             org.apache.sling.jcr.webdav.impl.*
                         </Private-Package>
-                        <Import-Package>
-                            <!-- ignore HTTP client methods of webdav -->
-                            !org.apache.commons.httpclient.*,
-                            
-                            <!-- ignore XML resolver of xerces -->
-                            !org.apache.xml.resolver.*,
-                            
-                            <!-- don't import any sun stuff -->
-                            !sun.*,
-                            
-                            <!-- import the rest -->
-                            *
-                        </Import-Package>
                         <Embed-Dependency>
-                            jackrabbit-jcr-server,
-                            jackrabbit-webdav,
-                            jackrabbit-jcr-commons
+                            jackrabbit-jcr-server;inline=
+                                org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl*.class|
+                                org/apache/jackrabbit/webdav/jcr/ItemResourceConstants*.class|
+                                org/apache/jackrabbit/webdav/jcr/JcrDavException*.class|
+                                org/apache/jackrabbit/webdav/jcr/JcrDavSession*.class|
+                                org/apache/jackrabbit/webdav/jcr/JcrValueType*.class|
+                                org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock*.class|
+                                META-INF/maven/**
                         </Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
                 </configuration>
             </plugin>
@@ -121,7 +113,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-server</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.4</version>
             <scope>compile</scope>
         </dependency>
 

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

Mime
View raw message