You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/11/27 12:25:53 UTC
svn commit: r1642093 - in /jackrabbit/oak/branches/1.0: ./ oak-lucene/pom.xml
Author: chetanm
Date: Thu Nov 27 11:25:53 2014
New Revision: 1642093
URL: http://svn.apache.org/r1642093
Log:
OAK-2270 - Resolve usage of ImmutableTree wrt OSGi constraints
Merging revisions 1639622,1639966
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-lucene/pom.xml
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1639622,1639966
Modified: jackrabbit/oak/branches/1.0/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/pom.xml?rev=1642093&r1=1642092&r2=1642093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/pom.xml Thu Nov 27 11:25:53 2014
@@ -105,7 +105,12 @@
org.apache.lucene.sandbox.*;resolution:=optional,
*
</Import-Package>
- <Embed-Dependency>lucene-*;inline=true</Embed-Dependency>
+ <Embed-Dependency>
+ lucene-*;inline=true,
+ <!-- TODO FIXME OAK-2270 -->
+ oak-core;inline="org/apache/jackrabbit/oak/plugins/tree/AbstractTree*|org/apache/jackrabbit/oak/plugins/tree/ImmutableTree*"
+ <!-- TODO FIXME OAK-2270 -->
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>