You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2020/12/17 20:33:59 UTC
[lucene-solr] branch branch_8x updated: Clean up IDEA config
generation (#2156)
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 453555c Clean up IDEA config generation (#2156)
453555c is described below
commit 453555c6c2b220e3a280af58d883f6e3ca21bbd7
Author: Mike Drob <md...@apache.org>
AuthorDate: Thu Dec 17 14:33:40 2020 -0600
Clean up IDEA config generation (#2156)
---
dev-tools/idea/.idea/ant.xml | 3 +-
dev-tools/idea/.idea/libraries/Ivy.xml | 2 +-
dev-tools/idea/.idea/modules.xml | 1 -
dev-tools/idea/.idea/workspace.xml | 10 ---
dev-tools/idea/lucene/expressions/expressions.iml | 1 -
dev-tools/idea/lucene/sandbox/sandbox.iml | 1 -
.../idea/solr/contrib/clustering/clustering.iml | 40 -----------
.../maven/solr/contrib/clustering/pom.xml.template | 78 ----------------------
dev-tools/maven/solr/contrib/pom.xml.template | 1 -
9 files changed, 2 insertions(+), 135 deletions(-)
diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index c270538..7664109 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -32,8 +32,8 @@
<buildFile url="file://$PROJECT_DIR$/lucene/queryparser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/replicator/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/sandbox/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/spatial/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/spatial-extras/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/lucene/spatial3d/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/suggest/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
@@ -43,7 +43,6 @@
<buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
diff --git a/dev-tools/idea/.idea/libraries/Ivy.xml b/dev-tools/idea/.idea/libraries/Ivy.xml
index 798dc0f..405960a 100644
--- a/dev-tools/idea/.idea/libraries/Ivy.xml
+++ b/dev-tools/idea/.idea/libraries/Ivy.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Ivy">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lucene/tools/lib/ivy-2.3.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/tools/lib/ivy-2.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index e87ff94..eb47674 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -52,7 +52,6 @@
<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" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 8503297..f7e537c 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -276,14 +276,6 @@
<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" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-clustering" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=@version.base@ -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
- </configuration>
<configuration default="false" name="Solr dataimporthandler contrib" type="JUnit" factoryName="JUnit">
<module name="dataimporthandler" />
<option name="TEST_OBJECT" value="pattern" />
@@ -366,7 +358,6 @@
<item index="22" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
<item index="23" class="java.lang.String" itemvalue="JUnit.Module replicator" />
<item index="24" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.Module spatial" />
<item index="26" class="java.lang.String" itemvalue="JUnit.Module spatial-extras" />
<item index="27" class="java.lang.String" itemvalue="JUnit.Module spatial3d" />
<item index="28" class="java.lang.String" itemvalue="JUnit.Module suggest" />
@@ -375,7 +366,6 @@
<item index="31" class="java.lang.String" itemvalue="JUnit.Solrj" />
<item index="32" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
<item index="33" class="java.lang.String" itemvalue="JUnit.Solr analytics contrib" />
- <item index="34" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
<item index="35" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
<item index="36" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
<item index="37" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
diff --git a/dev-tools/idea/lucene/expressions/expressions.iml b/dev-tools/idea/lucene/expressions/expressions.iml
index 805db2d..ade0f59 100644
--- a/dev-tools/idea/lucene/expressions/expressions.iml
+++ b/dev-tools/idea/lucene/expressions/expressions.iml
@@ -24,7 +24,6 @@
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" module-name="lucene-core" />
- <orderEntry type="module" module-name="queries" />
</component>
</module>
diff --git a/dev-tools/idea/lucene/sandbox/sandbox.iml b/dev-tools/idea/lucene/sandbox/sandbox.iml
index 47cf8da..05caa9f 100644
--- a/dev-tools/idea/lucene/sandbox/sandbox.iml
+++ b/dev-tools/idea/lucene/sandbox/sandbox.iml
@@ -23,7 +23,6 @@
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="codecs" />
- <orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="lucene-core" />
</component>
</module>
diff --git a/dev-tools/idea/solr/contrib/clustering/clustering.iml b/dev-tools/idea/solr/contrib/clustering/clustering.iml
deleted file mode 100644
index ecb9dec..0000000
--- a/dev-tools/idea/solr/contrib/clustering/clustering.iml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-clustering/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-clustering/classes/test" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
- </library>
- </orderEntry>
- <orderEntry type="library" name="Solr core library" level="project" />
- <orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
- <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="phonetic" />
- <orderEntry type="module" module-name="solr-core" />
- <orderEntry type="module" module-name="solrj" />
- <orderEntry type="module" module-name="spatial" />
- <orderEntry type="module" module-name="suggest" />
- <orderEntry type="module" module-name="lucene-core" />
- <orderEntry type="module" module-name="analysis-common" />
- </component>
-</module>
diff --git a/dev-tools/maven/solr/contrib/clustering/pom.xml.template b/dev-tools/maven/solr/contrib/clustering/pom.xml.template
deleted file mode 100644
index 831dede..0000000
--- a/dev-tools/maven/solr/contrib/clustering/pom.xml.template
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
- 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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <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-clustering</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Clustering</name>
- <description>Apache Solr Clustering</description>
- <properties>
- <module-directory>solr/contrib/clustering</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-clustering.internal.dependencies@
-@solr-clustering.external.dependencies@
-@solr-clustering.internal.test.dependencies@
-@solr-clustering.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>
diff --git a/dev-tools/maven/solr/contrib/pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml.template
index d8280e4..a26bc4c 100644
--- a/dev-tools/maven/solr/contrib/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/pom.xml.template
@@ -33,7 +33,6 @@
<modules>
<module>analysis-extras</module>
<module>analytics</module>
- <module>clustering</module>
<module>dataimporthandler</module>
<module>dataimporthandler-extras</module>
<module>extraction</module>