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/11/02 13:58:00 UTC
lucene-solr:master: SOLR-8542: Add maven config and improve IntelliJ
config.
Repository: lucene-solr
Updated Branches:
refs/heads/master d0e32f3e5 -> 9eb806a23
SOLR-8542: Add maven config and improve IntelliJ config.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9eb806a2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9eb806a2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9eb806a2
Branch: refs/heads/master
Commit: 9eb806a23339a4c6ade88ac86da889b8b889a936
Parents: d0e32f3
Author: Steve Rowe <sa...@apache.org>
Authored: Wed Nov 2 09:57:35 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Nov 2 09:57:54 2016 -0400
----------------------------------------------------------------------
dev-tools/idea/.idea/modules.xml | 4 +-
dev-tools/idea/.idea/workspace.xml | 72 ++++++++++--------
dev-tools/idea/solr/contrib/ltr/ltr.iml | 6 +-
.../maven/solr/contrib/ltr/pom.xml.template | 80 ++++++++++++++++++++
dev-tools/maven/solr/contrib/pom.xml.template | 1 +
5 files changed, 127 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9eb806a2/dev-tools/idea/.idea/modules.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index 5d2d106..d6b44f4 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -49,18 +49,18 @@
<module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analytics/analytics.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/ltr.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-cell/morphlines-cell.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analytics/analytics.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/ltr.iml" />
</modules>
</component>
</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9eb806a2/dev-tools/idea/.idea/workspace.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 7750e90..65be571 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -228,6 +228,14 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
+ <configuration default="false" name="solrcloud" type="Application" factoryName="Application" singleton="true">
+ <option name="MAIN_CLASS_NAME" value="org.eclipse.jetty.start.Main" />
+ <option name="VM_PARAMETERS" value="-DzkRun -Dhost=127.0.0.1 -Duser.timezone=UTC -Djetty.home=$PROJECT_DIR$/solr/server -Dsolr.solr.home=$PROJECT_DIR$/solr/server/solr -Dsolr.install.dir=$PROJECT_DIR$/solr -Dsolr.log=$PROJECT_DIR$/solr/server/logs/solr.log" />
+ <option name="PROGRAM_PARAMETERS" value="--module=http" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/server" />
+ <option name="PARENT_ENVS" value="true" />
+ <module name="server" />
+ </configuration>
<configuration default="false" name="Solr core" type="JUnit" factoryName="JUnit">
<module name="solr-core-tests" />
<option name="TEST_OBJECT" value="pattern" />
@@ -252,6 +260,14 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
+ <configuration default="false" name="Solr analytics contrib" type="JUnit" factoryName="JUnit">
+ <module name="analytics" />
+ <option name="TEST_OBJECT" value="pattern" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analytics" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
+ </configuration>
<configuration default="false" name="Solr clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
<option name="TEST_OBJECT" value="pattern" />
@@ -292,6 +308,14 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
+ <configuration default="false" name="Solr ltr contrib" type="JUnit" factoryName="JUnit">
+ <module name="ltr" />
+ <option name="TEST_OBJECT" value="pattern" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/ltr" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
+ </configuration>
<configuration default="false" name="Solr map-reduce contrib" type="JUnit" factoryName="JUnit">
<module name="map-reduce" />
<option name="TEST_OBJECT" value="pattern" />
@@ -332,24 +356,8 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
- <configuration default="false" name="Solr analytics contrib" type="JUnit" factoryName="JUnit">
- <module name="analytics" />
- <option name="TEST_OBJECT" value="pattern" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analytics" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
- </configuration>
- <configuration default="false" name="solrcloud" type="Application" factoryName="Application" singleton="true">
- <option name="MAIN_CLASS_NAME" value="org.eclipse.jetty.start.Main" />
- <option name="VM_PARAMETERS" value="-DzkRun -Dhost=127.0.0.1 -Duser.timezone=UTC -Djetty.home=$PROJECT_DIR$/solr/server -Dsolr.solr.home=$PROJECT_DIR$/solr/server/solr -Dsolr.install.dir=$PROJECT_DIR$/solr -Dsolr.log=$PROJECT_DIR$/solr/server/logs/solr.log" />
- <option name="PROGRAM_PARAMETERS" value="--module=http" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/server" />
- <option name="PARENT_ENVS" value="true" />
- <module name="server" />
- </configuration>
- <list size="42">
+ <list size="44">
<item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
<item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
<item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
@@ -378,20 +386,22 @@
<item index="25" class="java.lang.String" itemvalue="JUnit.Module spatial-extras" />
<item index="26" class="java.lang.String" itemvalue="JUnit.Module spatial3d" />
<item index="27" class="java.lang.String" itemvalue="JUnit.Module suggest" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.Solr core" />
- <item index="29" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
- <item index="30" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
- <item index="31" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
- <item index="32" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
- <item index="33" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
- <item index="34" class="java.lang.String" itemvalue="JUnit.Solr map-reduce contrib" />
- <item index="35" class="java.lang.String" itemvalue="JUnit.Solr morphlines-cell contrib" />
- <item index="36" class="java.lang.String" itemvalue="JUnit.Solr morphlines-core contrib" />
- <item index="37" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
- <item index="38" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
- <item index="39" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
- <item index="40" class="java.lang.String" itemvalue="JUnit.Solrj" />
- <item index="41" class="java.lang.String" itemvalue="Application.solrcloud" />
+ <item index="28" class="java.lang.String" itemvalue="Application.solrcloud" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.Solr core" />
+ <item index="30" class="java.lang.String" itemvalue="JUnit.Solrj" />
+ <item index="31" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
+ <item index="32" class="java.lang.String" itemvalue="JUnit.Solr analytics contrib" />
+ <item index="33" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
+ <item index="34" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
+ <item index="35" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
+ <item index="36" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
+ <item index="37" class="java.lang.String" itemvalue="JUnit.Solr map-reduce contrib" />
+ <item index="38" class="java.lang.String" itemvalue="JUnit.Solr morphlines-cell contrib" />
+ <item index="39" class="java.lang.String" itemvalue="JUnit.Solr morphlines-core contrib" />
+ <item index="40" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+ <item index="41" class="java.lang.String" itemvalue="JUnit.Solr ltr contrib" />
+ <item index="42" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+ <item index="43" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
</list>
</component>
</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9eb806a2/dev-tools/idea/solr/contrib/ltr/ltr.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/ltr/ltr.iml b/dev-tools/idea/solr/contrib/ltr/ltr.iml
index efc505d..37369e6 100644
--- a/dev-tools/idea/solr/contrib/ltr/ltr.iml
+++ b/dev-tools/idea/solr/contrib/ltr/ltr.iml
@@ -15,14 +15,14 @@
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="module-library">
+ <orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
+ <root url="file://$MODULE_DIR$/test-lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+ <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9eb806a2/dev-tools/maven/solr/contrib/ltr/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/ltr/pom.xml.template b/dev-tools/maven/solr/contrib/ltr/pom.xml.template
new file mode 100644
index 0000000..67d74e7
--- /dev/null
+++ b/dev-tools/maven/solr/contrib/ltr/pom.xml.template
@@ -0,0 +1,80 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-ltr</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Analytics Package</name>
+ <description>
+ Apache Solr Learning to Rank Package
+ </description>
+ <properties>
+ <module-directory>solr/contrib/ltr</module-directory>
+ <relative-top-level>../../../..</relative-top-level>
+ <module-path>${relative-top-level}/${module-directory}</module-path>
+ </properties>
+ <scm>
+ <connection>scm:git:${vc-anonymous-base-url}</connection>
+ <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
+ <url>${vc-browse-base-url};f=${module-directory}</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <!-- This dependency cannot be put into solr-parent, because local -->
+ <!-- dependencies are always ordered before inherited dependencies. -->
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ @solr-analytics.internal.dependencies@
+ @solr-analytics.external.dependencies@
+ @solr-analytics.internal.test.dependencies@
+ @solr-analytics.external.test.dependencies@
+ </dependencies>
+ <build>
+ <sourceDirectory>${module-path}/src/java</sourceDirectory>
+ <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${module-path}/src/test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9eb806a2/dev-tools/maven/solr/contrib/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml.template
index 9b020108..6ca72b2 100644
--- a/dev-tools/maven/solr/contrib/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/pom.xml.template
@@ -38,6 +38,7 @@
<module>dataimporthandler-extras</module>
<module>extraction</module>
<module>langid</module>
+ <module>ltr</module>
<module>morphlines-cell</module>
<module>morphlines-core</module>
<module>map-reduce</module>