You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by Justin Edelson <ju...@justinedelson.com> on 2011/12/06 13:49:25 UTC
Re: svn commit: r1210851 - in /sling/trunk: bundles/jcr/webdav/pom.xml launchpad/builder/src/main/bundles/list.xml
Hi Felix,
Just curious - why was it necessary to change the version of the maven-bundle-plugin used? Is that something we should do in the parent pom for all bundles?
Justin
On Dec 6, 2011, at 5:28 AM, fmeschbe@apache.org wrote:
> Author: fmeschbe
> Date: Tue Dec 6 10:28:53 2011
> New Revision: 1210851
>
> URL: http://svn.apache.org/viewvc?rev=1210851&view=rev
> Log:
> SLING-2302 Update to Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
>
> Modified:
> sling/trunk/bundles/jcr/webdav/pom.xml
> sling/trunk/launchpad/builder/src/main/bundles/list.xml
>
> Modified: sling/trunk/bundles/jcr/webdav/pom.xml
> URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=1210851&r1=1210850&r2=1210851&view=diff
> ==============================================================================
> --- sling/trunk/bundles/jcr/webdav/pom.xml (original)
> +++ sling/trunk/bundles/jcr/webdav/pom.xml Tue Dec 6 10:28:53 2011
> @@ -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>
>
>
> Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
> URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1210851&r1=1210850&r2=1210851&view=diff
> ==============================================================================
> --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
> +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Dec 6 10:28:53 2011
> @@ -418,17 +418,22 @@
> <bundle>
> <groupId>org.apache.jackrabbit</groupId>
> <artifactId>jackrabbit-jcr-commons</artifactId>
> - <version>2.2.9</version>
> + <version>2.3.4</version>
> </bundle>
> <bundle>
> <groupId>org.apache.jackrabbit</groupId>
> <artifactId>jackrabbit-spi</artifactId>
> - <version>2.2.9</version>
> + <version>2.3.4</version>
> </bundle>
> <bundle>
> <groupId>org.apache.jackrabbit</groupId>
> <artifactId>jackrabbit-spi-commons</artifactId>
> - <version>2.2.9</version>
> + <version>2.3.4</version>
> + </bundle>
> + <bundle>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-webdav</artifactId>
> + <version>2.3.4</version>
> </bundle>
> <bundle>
> <groupId>org.apache.jackrabbit</groupId>
>
>