jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1369136 - in /jackrabbit/oak/trunk: oak-core/pom.xml oak-run/pom.xml
Date Fri, 03 Aug 2012 18:14:26 GMT
Author: alexparvulescu
Date: Fri Aug  3 18:14:26 2012
New Revision: 1369136

URL: http://svn.apache.org/viewvc?rev=1369136&view=rev
Log:
OAK-154 Full text search index

Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    jackrabbit/oak/trunk/oak-run/pom.xml

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1369136&r1=1369135&r2=1369136&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Aug  3 18:14:26 2012
@@ -57,12 +57,6 @@
             <Bundle-Activator>
               org.apache.jackrabbit.oak.osgi.Activator
             </Bundle-Activator>
-            <!-- FIXME: Shouldn't need to inline Lucene (OAK-154) -->
-            <Embed-Dependency>
-              lucene-core;inline=true,
-              lucene-analyzers-common;inline=true,
-              tika-core;inline=true
-            </Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>
@@ -167,24 +161,23 @@
     </dependency>
 
     <!-- Optional Lucene dependency -->
-    <!-- FIXME: make these optional again (OAK-154) -->
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
       <version>4.0.0-ALPHA</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers-common</artifactId>
       <version>4.0.0-ALPHA</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
       <version>1.2</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
 
     <!-- Logging -->

Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1369136&r1=1369135&r2=1369136&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Fri Aug  3 18:14:26 2012
@@ -113,6 +113,22 @@
       <artifactId>logback-classic</artifactId>
       <version>1.0.1</version>
     </dependency>
+    <!-- FIXME, OAK-154 -->
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>4.0.0-ALPHA</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>4.0.0-ALPHA</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>1.2</version>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>



Mime
View raw message