Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8692: Deal with the new solr/core/src/resources/ dir: 1) add Maven config; and 2) improve IntelliJ config by using a new content root in solr-core module pointing to the resources dir, rather than using module-library declarations in the solr-core, solr-core-tests and solrj modules.

This commit is contained in:
Steve Rowe 2016-02-22 18:18:31 -05:00
parent 54a544b307
commit eeee1c3f40
4 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev-tools/idea/solr/core/src/java/solr-core.iml
View File

@ -6,6 +6,9 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../resources">
<sourceFolder url="file://$MODULE_DIR$/../resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr core library" level="project" />
@ -27,14 +30,5 @@
<orderEntry type="module" module-name="queryparser" />
<orderEntry type="module" module-name="join" />
<orderEntry type="module" module-name="sandbox" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/resources" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

9
dev-tools/idea/solr/core/src/solr-core-tests.iml
View File

@ -31,14 +31,5 @@
<orderEntry type="module" scope="TEST" module-name="expressions" />
<orderEntry type="module" scope="TEST" module-name="icu" />
<orderEntry type="module" scope="TEST" module-name="analysis-extras" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/resources" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

9
dev-tools/idea/solr/solrj/src/solrj-tests.iml
View File

@ -29,14 +29,5 @@
<orderEntry type="module" scope="TEST" module-name="solr-core" />
<orderEntry type="module" scope="TEST" module-name="analysis-common" />
<orderEntry type="module" scope="TEST" module-name="lucene-core" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/../../core/src/resources" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

5
dev-tools/maven/solr/core/src/java/pom.xml.template
View File

@ -47,6 +47,11 @@
</dependencies>
<build>
<sourceDirectory>${module-path}</sourceDirectory>
<resources>
<resource>
<directory>${module-path}/../resources</directory>
</resource>
</resources>
<testSourceDirectory/>
<testResources/>
<plugins>