Skip to content

Commit 356e9f2

Browse files
fzslucamilanesio
authored andcommitted
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.
1 parent a7330da commit 356e9f2

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<classpathentry kind="lib" path="ext/lucene-core-5.5.2.jar" sourcepath="ext/src/lucene-core-5.5.2.jar" />
2525
<classpathentry kind="lib" path="ext/lucene-analyzers-common-5.5.2.jar" sourcepath="ext/src/lucene-analyzers-common-5.5.2.jar" />
2626
<classpathentry kind="lib" path="ext/lucene-highlighter-5.5.2.jar" sourcepath="ext/src/lucene-highlighter-5.5.2.jar" />
27-
<classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
2827
<classpathentry kind="lib" path="ext/lucene-memory-5.5.2.jar" sourcepath="ext/src/lucene-memory-5.5.2.jar" />
28+
<classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
2929
<classpathentry kind="lib" path="ext/lucene-queryparser-5.5.2.jar" sourcepath="ext/src/lucene-queryparser-5.5.2.jar" />
3030
<classpathentry kind="lib" path="ext/lucene-sandbox-5.5.2.jar" sourcepath="ext/src/lucene-sandbox-5.5.2.jar" />
3131
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />

build.moxie

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ dependencies:
146146
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
147147
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
148148
- compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
149-
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
149+
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-join
150150
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
151-
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
151+
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-spatial
152152
- compile 'org.pegdown:pegdown:1.5.0' :war
153153
- compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
154154
- compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war

gitblit.iml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,46 +213,46 @@
213213
</library>
214214
</orderEntry>
215215
<orderEntry type="module-library">
216-
<library name="lucene-join-5.5.2.jar">
216+
<library name="lucene-memory-5.5.2.jar">
217217
<CLASSES>
218-
<root url="jar://$MODULE_DIR$/ext/lucene-join-5.5.2.jar!/" />
218+
<root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
219219
</CLASSES>
220220
<JAVADOC />
221221
<SOURCES>
222-
<root url="jar://$MODULE_DIR$/ext/src/lucene-join-5.5.2.jar!/" />
222+
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
223223
</SOURCES>
224224
</library>
225225
</orderEntry>
226226
<orderEntry type="module-library">
227-
<library name="lucene-grouping-5.5.2.jar">
227+
<library name="lucene-queries-5.5.2.jar">
228228
<CLASSES>
229-
<root url="jar://$MODULE_DIR$/ext/lucene-grouping-5.5.2.jar!/" />
229+
<root url="jar://$MODULE_DIR$/ext/lucene-queries-5.5.2.jar!/" />
230230
</CLASSES>
231231
<JAVADOC />
232232
<SOURCES>
233-
<root url="jar://$MODULE_DIR$/ext/src/lucene-grouping-5.5.2.jar!/" />
233+
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-5.5.2.jar!/" />
234234
</SOURCES>
235235
</library>
236236
</orderEntry>
237237
<orderEntry type="module-library">
238-
<library name="lucene-queries-5.5.2.jar">
238+
<library name="lucene-queryparser-5.5.2.jar">
239239
<CLASSES>
240-
<root url="jar://$MODULE_DIR$/ext/lucene-queries-5.5.2.jar!/" />
240+
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-5.5.2.jar!/" />
241241
</CLASSES>
242242
<JAVADOC />
243243
<SOURCES>
244-
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-5.5.2.jar!/" />
244+
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-5.5.2.jar!/" />
245245
</SOURCES>
246246
</library>
247247
</orderEntry>
248248
<orderEntry type="module-library">
249-
<library name="lucene-memory-5.5.2.jar">
249+
<library name="lucene-sandbox-5.5.2.jar">
250250
<CLASSES>
251-
<root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
251+
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-5.5.2.jar!/" />
252252
</CLASSES>
253253
<JAVADOC />
254254
<SOURCES>
255-
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
255+
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-5.5.2.jar!/" />
256256
</SOURCES>
257257
</library>
258258
</orderEntry>

0 commit comments

Comments
 (0)