You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/02/23 00:19:14 UTC
lucene-solr git commit: 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 declara
Repository: lucene-solr
Updated Branches:
refs/heads/master 54a544b30 -> eeee1c3f4
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.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eeee1c3f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eeee1c3f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eeee1c3f
Branch: refs/heads/master
Commit: eeee1c3f407f8a77132fcd43fd56ac8e3b9ce4db
Parents: 54a544b
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Feb 22 18:18:31 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Feb 22 18:19:00 2016 -0500
----------------------------------------------------------------------
dev-tools/idea/solr/core/src/java/solr-core.iml | 12 +++---------
dev-tools/idea/solr/core/src/solr-core-tests.iml | 9 ---------
dev-tools/idea/solr/solrj/src/solrj-tests.iml | 9 ---------
dev-tools/maven/solr/core/src/java/pom.xml.template | 5 +++++
4 files changed, 8 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eeee1c3f/dev-tools/idea/solr/core/src/java/solr-core.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/core/src/java/solr-core.iml b/dev-tools/idea/solr/core/src/java/solr-core.iml
index eb54942..3ffd185 100644
--- a/dev-tools/idea/solr/core/src/java/solr-core.iml
+++ b/dev-tools/idea/solr/core/src/java/solr-core.iml
@@ -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>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eeee1c3f/dev-tools/idea/solr/core/src/solr-core-tests.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/core/src/solr-core-tests.iml b/dev-tools/idea/solr/core/src/solr-core-tests.iml
index 6e2bb6f..eb27c57 100644
--- a/dev-tools/idea/solr/core/src/solr-core-tests.iml
+++ b/dev-tools/idea/solr/core/src/solr-core-tests.iml
@@ -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>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eeee1c3f/dev-tools/idea/solr/solrj/src/solrj-tests.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/solrj/src/solrj-tests.iml b/dev-tools/idea/solr/solrj/src/solrj-tests.iml
index 0b3c252..13cdb58 100644
--- a/dev-tools/idea/solr/solrj/src/solrj-tests.iml
+++ b/dev-tools/idea/solr/solrj/src/solrj-tests.iml
@@ -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>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eeee1c3f/dev-tools/maven/solr/core/src/java/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/core/src/java/pom.xml.template b/dev-tools/maven/solr/core/src/java/pom.xml.template
index b8408b0..949a0a7 100644
--- a/dev-tools/maven/solr/core/src/java/pom.xml.template
+++ b/dev-tools/maven/solr/core/src/java/pom.xml.template
@@ -47,6 +47,11 @@
</dependencies>
<build>
<sourceDirectory>${module-path}</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/../resources</directory>
+ </resource>
+ </resources>
<testSourceDirectory/>
<testResources/>
<plugins>