Index: oak-lucene/pom.xml
===================================================================
--- oak-lucene/pom.xml	(revision 1571154)
+++ oak-lucene/pom.xml	(working copy)
@@ -105,11 +105,6 @@
               org.apache.jackrabbit.oak.plugins.index.lucene,
               org.apache.jackrabbit.oak.plugins.index.lucene.util
             </Export-Package>
-            <_exportcontents>
-                org.apache.lucene.*;version=${lucene.version};-split-package:=merge-first,
-                org.tartarus.snowball.*;version=${lucene.version};-split-package:=merge-first
-            </_exportcontents>
-            <Embed-Dependency>lucene-*;inline=true</Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>
Index: oak-lucene-osgi/pom.xml
===================================================================
--- oak-lucene-osgi/pom.xml	(revision 0)
+++ oak-lucene-osgi/pom.xml	(working copy)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>oak-parent</artifactId>
+        <version>0.18-SNAPSHOT</version>
+        <relativePath>../oak-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>oak-lucene-osgi</artifactId>
+    <name>Oak Lucene OSGi bundle</name>
+    <packaging>bundle</packaging>
+    <description>Oak OSGi support for Lucene bundle</description>
+
+    <properties>
+        <lucene.version>4.6.1</lucene.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.lucene.*;version=${lucene.version};-split-package:=merge-first,
+                            org.tartarus.snowball.*;version=${lucene.version};-split-package:=merge-first
+                        </Export-Package>
+                        <Import-Package>
+                            org.antlr.runtime.*;resolution:=optional,
+                            com.spatial4j.core.*;resolution:=optional,
+                            org.apache.regexp.*;resolution:=optional,
+                            org.objectweb.asm.*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Embed-Dependency>
+                            *;scope=runtime
+                        </Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-common</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queries</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-codecs</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-misc</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-grouping</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-highlighter</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-join</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-suggest</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-spatial</artifactId>
+            <version>${lucene.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

Property changes on: oak-lucene-osgi/pom.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: oak-solr-core/pom.xml
===================================================================
--- oak-solr-core/pom.xml	(revision 1571154)
+++ oak-solr-core/pom.xml	(working copy)
@@ -46,41 +46,7 @@
               org.apache.jackrabbit.oak.plugins.index.solr.server,
               org.apache.jackrabbit.oak.plugins.index.solr.util
             </Export-Package>
-              <_exportcontents>
-                  org.apache.solr.*;version=${solr.version},
-              </_exportcontents>
-              <Import-Package>
-                  org.slf4j.impl;resolution:=optional,
-                  com.ibm.icu.*;resolution:=optional,
-                  org.apache.log4j.jmx;resolution:=optional,
-                  org.apache.log4j.spi;resolution:=optional,
-                  org.jboss.netty.*;resolution:=optional,
-                  jline.*;resolution:=optional,
-                  org.eclipse.jetty.*;resolution:=optional,
-                  javax.servlet.*; version="[2.5.0,4.0.0)",
-                  org.tartarus.snowball;resolution:=optional,
-                  org.restlet;resolution:=optional,
-                  org.restlet.*;resolution:=optional,
-                  org.apache.hadoop.*;resolution:=optional,
-                  com.carrotsearch.hppc.*;resolution:=optional,
-                  com.googlecode.concurrentlinkedhashmap.*;resolution:=optional,
-                  com.spatial4j.core.*;resolution:=optional,
-                  org.apache.log4j.*;resolution:=optional,
-                  org.apache.zookeeper.server.quorum.flexible.*;resolution:=optional,
-                  org.joda.time.*;resolution:=optional,
-                  org.apache.lucene.queries.*;resolution:=optional,
-                  org.apache.lucene.queryparser.*;resolution:=optional,
-                  org.apache.lucene.search.grouping.*;resolution:=optional,
-                  org.apache.lucene.search.highlight.*;resolution:=optional,
-                  org.apache.lucene.search.postingshighlight.*;resolution:=optional,
-                  org.apache.lucene.search.spell.*;resolution:=optional,
-                  org.apache.lucene.search.suggest.*;resolution:=optional,
-                  org.apache.lucene.search.vectorhighlight.*;resolution:=optional,
-                  org.apache.lucene.spatial.*;resolution:=optional,
-                  *
-              </Import-Package>
-              <DynamicImport-Package>*</DynamicImport-Package>
-              <Embed-Dependency>solr-solrj,solr-core,org.noggit</Embed-Dependency>
+            <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>
@@ -133,7 +99,6 @@
           <groupId>org.apache.solr</groupId>
           <artifactId>solr-core</artifactId>
           <version>${solr.version}</version>
-          <scope>runtime</scope>
           <exclusions>
               <exclusion>
                   <groupId>org.slf4j</groupId>
@@ -146,12 +111,6 @@
           <artifactId>solr-solrj</artifactId>
           <version>${solr.version}</version>
       </dependency>
-      <dependency>
-          <groupId>org.noggit</groupId>
-          <artifactId>noggit</artifactId>
-          <version>0.5</version>
-          <scope>runtime</scope>
-      </dependency>
 
     <!-- sorlj dependencies needed for OSGi deployments -->
     <dependency>
Index: oak-solr-osgi/pom.xml
===================================================================
--- oak-solr-osgi/pom.xml	(revision 0)
+++ oak-solr-osgi/pom.xml	(working copy)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>oak-parent</artifactId>
+        <version>0.18-SNAPSHOT</version>
+        <relativePath>../oak-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>oak-solr-osgi</artifactId>
+    <name>Oak Solr OSGi bundle</name>
+    <packaging>bundle</packaging>
+    <description>Oak OSGi support for Solr bundle</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.solr.*;version=${solr.version};-split-package:=merge-first
+                        </Export-Package>
+                        <Import-Package>
+                            org.slf4j.impl;resolution:=optional,
+                            com.ibm.icu.*;resolution:=optional,
+                            org.apache.log4j.jmx;resolution:=optional,
+                            org.apache.log4j.spi;resolution:=optional,
+                            org.jboss.netty.*;resolution:=optional,
+                            jline.*;resolution:=optional,
+                            org.eclipse.jetty.*;resolution:=optional,
+                            javax.servlet.*; version="[2.5.0,4.0.0)",
+                            org.tartarus.snowball;resolution:=optional,
+                            org.restlet;resolution:=optional,
+                            org.restlet.*;resolution:=optional,
+                            org.apache.hadoop.*;resolution:=optional,
+                            com.carrotsearch.hppc.*;resolution:=optional,
+                            com.googlecode.concurrentlinkedhashmap.*;resolution:=optional,
+                            com.spatial4j.core.*;resolution:=optional,
+                            org.apache.log4j.*;resolution:=optional,
+                            org.apache.zookeeper.server.quorum.flexible.*;resolution:=optional,
+                            org.joda.time.*;resolution:=optional,
+                            .*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Embed-Dependency>
+                            *;scope=runtime
+                        </Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.noggit</groupId>
+            <artifactId>noggit</artifactId>
+            <version>0.5</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>

Property changes on: oak-solr-osgi/pom.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: oak-solr-remote/pom.xml
===================================================================
--- oak-solr-remote/pom.xml	(revision 1571154)
+++ oak-solr-remote/pom.xml	(working copy)
@@ -101,6 +101,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>solr-solrj</artifactId>
+      <version>${solr.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>3.3.6</version>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1571154)
+++ pom.xml	(working copy)
@@ -54,6 +54,8 @@
     <module>oak-auth-ldap</module>
     <module>oak-run</module>
     <module>oak-it</module>
+    <module>oak-lucene-osgi</module>
+    <module>oak-solr-osgi</module>
     <!-- <module>oak-mk-perf</module> -->
   </modules>