Exclude Lucene transitive dependencies.
Exclude Lucene dependencies `lucene-spatial` and `lucene-join`.
They were added during the update but are not needed. This patch
excludes them explicitly so that they do not show up in the
generated IDE files and `ext` directory.
diff --git a/.classpath b/.classpath
index 42756d8..42cbfbc 100644
--- a/.classpath
+++ b/.classpath
@@ -24,8 +24,8 @@
<classpathentry kind="lib" path="ext/lucene-core-5.5.2.jar" sourcepath="ext/src/lucene-core-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-analyzers-common-5.5.2.jar" sourcepath="ext/src/lucene-analyzers-common-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-highlighter-5.5.2.jar" sourcepath="ext/src/lucene-highlighter-5.5.2.jar" />
- <classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-memory-5.5.2.jar" sourcepath="ext/src/lucene-memory-5.5.2.jar" />
+ <classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-queryparser-5.5.2.jar" sourcepath="ext/src/lucene-queryparser-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-sandbox-5.5.2.jar" sourcepath="ext/src/lucene-sandbox-5.5.2.jar" />
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
diff --git a/build.moxie b/build.moxie
index 9e5da70..f21241d 100644
--- a/build.moxie
+++ b/build.moxie
@@ -146,9 +146,9 @@
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
-- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-join
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
-- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-spatial
- compile 'org.pegdown:pegdown:1.5.0' :war
- compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
- compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war
diff --git a/gitblit.iml b/gitblit.iml
index aefea94..1f4aa24 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -213,24 +213,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-join-5.5.2.jar">
+ <library name="lucene-memory-5.5.2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-join-5.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-join-5.5.2.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="lucene-grouping-5.5.2.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-grouping-5.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-grouping-5.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -246,13 +235,24 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-memory-5.5.2.jar">
+ <library name="lucene-queryparser-5.5.2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-5.5.2.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-sandbox-5.5.2.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-5.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
