Author: tommaso
Date: Mon Oct 14 12:38:11 2019
New Revision: 1868445
URL: http://svn.apache.org/viewvc?rev=1868445&view=rev
Log:
OAK-8698 - applied patch from Fabrizio Fortino
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-search-mt/pom.xml
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1868445&r1=1868444&r2=1868445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Mon Oct 14 12:38:11 2019
@@ -213,31 +213,26 @@
<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-queryparser</artifactId>
<version>${lucene.version}</version>
- <scope>provided</scope>
- </dependency>
+ </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-suggest</artifactId>
<version>${lucene.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -367,6 +362,12 @@
<version>${jackrabbit.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Modified: jackrabbit/oak/trunk/oak-search-mt/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/pom.xml?rev=1868445&r1=1868444&r2=1868445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-mt/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-mt/pom.xml Mon Oct 14 12:38:11 2019
@@ -43,7 +43,7 @@
<Export-Package>
!*
</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
+
<Embed-Dependency>*;scope=compile,artifactId=!oak-lucene</Embed-Dependency>
<Import-Package>
com.ibm.uvm.tools.*;resolution:=optional,
com.sun.jdmk.comm.*;resolution:=optional,
@@ -108,7 +108,6 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.joshua</groupId>
