Author: tommaso
Date: Thu Mar 13 15:18:41 2014
New Revision: 1577189
URL: http://svn.apache.org/r1577189
Log:
OAK-1538 - create oak-solr-osgi
Added:
jackrabbit/oak/trunk/oak-solr-osgi/
jackrabbit/oak/trunk/oak-solr-osgi/pom.xml (with props)
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1577189&r1=1577188&r2=1577189&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Thu Mar 13 15:18:41 2014
@@ -34,7 +34,6 @@
<properties>
<tika.version>1.3</tika.version>
- <lucene.version>4.7.0</lucene.version>
<known.issues>
<!-- Jackrabbit query tests -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtEnd
<!-- OAK-318 -->
@@ -102,10 +101,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>
<Import-Package>
org.apache.lucene.sandbox.*;resolution:=optional,
*
@@ -169,7 +164,7 @@
<version>${tika.version}</version>
</dependency>
- <!-- Embedded non-OSGi Lucene dependencies -->
+ <!-- Lucene dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1577189&r1=1577188&r2=1577189&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Mar 13 15:18:41 2014
@@ -46,7 +46,7 @@
<mongo.db>MongoMKDB</mongo.db>
<mongo.db2>MongoMKDB2</mongo.db2>
<segment.db>SegmentMK</segment.db>
- <solr.version>4.7.0</solr.version>
+ <lucene.version>4.7.0</lucene.version>
<!-- Note that we're using SLF4J API version 1.7 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
<!-- when compiling and running test cases and the oak-run jar. -->
Added: jackrabbit/oak/trunk/oak-solr-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-osgi/pom.xml?rev=1577189&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-osgi/pom.xml (added)
+++ jackrabbit/oak/trunk/oak-solr-osgi/pom.xml Thu Mar 13 15:18:41 2014
@@ -0,0 +1,234 @@
+<?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.19-SNAPSHOT</version>
+ <relativePath>../oak-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>oak-solr-osgi</artifactId>
+ <name>Oak Solr OSGi</name>
+ <description>Oak Solr OSGi support</description>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ org.apache.lucene.*;resolution:=optional,
+ com.carrotsearch.*;resolution:=optional,
+ com.googlecode.*;resolution:=optional,
+ com.spatial4j.*;resolution:=optional,
+ com.sun.*;resolution:=optional,
+ jline;resolution:=optional,
+ org.apache.hadoop.*;resolution:=optional,
+ org.apache.regexp.*;resolution:=optional,
+ org.apache.log4j.*;resolution:=optional,
+ org.jboss.netty.*;resolution:=optional,
+ org.restlet.*;resolution:=optional,
+ org.joda.time.*;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+
org.apache.jackrabbit.oak.plugins.index.solr.configuration,
+ org.apache.jackrabbit.oak.plugins.index.solr.index,
+ org.apache.jackrabbit.oak.plugins.index.solr.query,
+
org.apache.jackrabbit.oak.plugins.index.solr.server,
+ org.apache.jackrabbit.oak.plugins.index.solr.util
+ </Export-Package>
+
<Embed-Dependency>*;scope=runtime;inline=true</Embed-Dependency>
+
<Service-Component>OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr
+
.osgi.SolrQueryIndexProviderService.xml,OSGI-INF/org.apache.jackrabbit.
+
oak.plugins.index.solr.osgi.SolrServerProviderService.xml,OSGI-I
+
NF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrIndexEditorPro
+
viderService.xml,OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.
+
osgi.EmbeddedSolrServerConfigurationProvider.xml,OSGI-INF/org.apache.ja
+
ckrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvi
+
der.xml,OSGI-INF/org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakS
+
olrConfigurationProviderService.xml</Service-Component>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-solr-core</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Solr -->
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${lucene.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.noggit</groupId>
+ <artifactId>noggit</artifactId>
+ <version>0.5</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Lucene -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-grouping</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-join</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ <version>${lucene.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: jackrabbit/oak/trunk/oak-solr-osgi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
