diff --git a/build.xml b/build.xml index 76258509ebc..04d5a83dafc 100644 --- a/build.xml +++ b/build.xml @@ -38,6 +38,13 @@ + + + + + + diff --git a/dev-tools/maven/lucene/contrib/ant/pom.xml b/dev-tools/maven/lucene/contrib/ant/pom.xml new file mode 100644 index 00000000000..3410b4f773f --- /dev/null +++ b/dev-tools/maven/lucene/contrib/ant/pom.xml @@ -0,0 +1,115 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-ant + jar + Lucene Contrib Ant + Ant task to create Lucene indexes + + lucene/contrib/ant + ../../build/contrib/ant + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + jtidy + jtidy + + + org.apache.ant + ant + + + org.apache.ant + ant-junit + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.ant.HtmlDocument + HtmlDocument + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml b/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml new file mode 100644 index 00000000000..336ee7c2dc4 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../pom.xml + + org.apache.lucene + lucene-bdb-je + jar + Lucene Contrib bdb-je + Berkeley DB based Directory implementation + + lucene/contrib/db/bdb-je + ../../../build/contrib/db/bdb-je + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + com.sleepycat + berkeleydb-je + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/db/bdb/pom.xml b/dev-tools/maven/lucene/contrib/db/bdb/pom.xml new file mode 100644 index 00000000000..4ff4ec2c799 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/db/bdb/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../pom.xml + + org.apache.lucene + lucene-bdb + jar + Lucene Contrib bdb + Berkeley DB based Directory implementation + + lucene/contrib/db/bdb + ../../../build/contrib/db/bdb + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + com.sleepycat + berkeleydb + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + + + + + diff --git a/lucene/contrib/spatial/pom.xml.template b/dev-tools/maven/lucene/contrib/db/pom.xml similarity index 73% rename from lucene/contrib/spatial/pom.xml.template rename to dev-tools/maven/lucene/contrib/db/pom.xml index 9b81a3e609c..a267ff9139e 100644 --- a/lucene/contrib/spatial/pom.xml.template +++ b/dev-tools/maven/lucene/contrib/db/pom.xml @@ -1,7 +1,6 @@ - - 4.0.0 org.apache.lucene - lucene-contrib - @version@ + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml org.apache.lucene - lucene-spatial - Lucene Spatial - @version@ - Spatial search package. - jar - + lucene-db-aggregator + Lucene Database aggregator POM + pom + + bdb + bdb-je + + ../../build/contrib/db/lucene-db-aggregator org.apache.maven.plugins - maven-compiler-plugin + maven-deploy-plugin - 1.5 - 1.5 + true - diff --git a/dev-tools/maven/lucene/contrib/demo/pom.xml b/dev-tools/maven/lucene/contrib/demo/pom.xml new file mode 100644 index 00000000000..e2e61c46090 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/demo/pom.xml @@ -0,0 +1,124 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-demo + war + Lucene Demos + This is the demo for Apache Lucene Java + + lucene/contrib/demo + ../../build/contrib/demo + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + javax.servlet + servlet-api + provided + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.apache.maven.plugins + maven-war-plugin + + src/jsp + true + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + ${build-directory} + + windows + unix + + + + org.apache.lucene.demo.DeleteFiles + DeleteFiles + + + org.apache.lucene.demo.IndexFiles + IndexFiles + + + org.apache.lucene.demo.IndexHTML + IndexHTML + + + org.apache.lucene.demo.SearchFiles + SearchFiles + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/highlighter/pom.xml b/dev-tools/maven/lucene/contrib/highlighter/pom.xml new file mode 100644 index 00000000000..7df7e4affca --- /dev/null +++ b/dev-tools/maven/lucene/contrib/highlighter/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-highlighter + jar + Lucene Highlighter + + This is the highlighter for apache lucene java + + + lucene/contrib/highlighter + ../../build/contrib/highlighter + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-memory + ${project.version} + + + ${project.groupId} + lucene-queries + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/instantiated/pom.xml b/dev-tools/maven/lucene/contrib/instantiated/pom.xml new file mode 100644 index 00000000000..f40c5544d16 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/instantiated/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-instantiated + jar + Lucene InstantiatedIndex + InstantiatedIndex, alternative RAM store for small corpora. + + lucene/contrib/instantiated + ../../build/contrib/instantiated + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/lucli/pom.xml b/dev-tools/maven/lucene/contrib/lucli/pom.xml new file mode 100644 index 00000000000..f6266f7caa2 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/lucli/pom.xml @@ -0,0 +1,108 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-lucli + jar + Lucene Lucli + Lucene Command Line Interface + + lucene/contrib/lucli + ../../build/contrib/lucli + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + jline + jline + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + lucli.Lucli + lucli + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/memory/pom.xml b/dev-tools/maven/lucene/contrib/memory/pom.xml new file mode 100644 index 00000000000..940fdf1b34e --- /dev/null +++ b/dev-tools/maven/lucene/contrib/memory/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-memory + jar + Lucene Memory + + High-performance single-document index to compare against Query + + + lucene/contrib/memory + ../../build/contrib/memory + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/misc/pom.xml b/dev-tools/maven/lucene/contrib/misc/pom.xml new file mode 100644 index 00000000000..62bf4577e53 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/misc/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-misc + jar + Lucene Miscellaneous + Miscellaneous Lucene extensions + + lucene/contrib/misc + ../../build/contrib/misc + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.index.FieldNormModifier + FieldNormModifier + + + org.apache.lucene.index.IndexSplitter + IndexSplitter + + + org.apache.lucene.index.MultiPassIndexSplitter + MultiPassIndexSplitter + + + org.apache.lucene.misc.GetTermInfo + GetTermInfo + + + org.apache.lucene.misc.HighFreqTerms + HighFreqTerms + + + org.apache.lucene.misc.IndexMergeTool + IndexMergeTool + + + org.apache.lucene.misc.LengthNormModifier + LengthNormModifier + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/pom.xml b/dev-tools/maven/lucene/contrib/pom.xml new file mode 100644 index 00000000000..039b87d80a7 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../pom.xml + + org.apache.lucene + lucene-contrib-aggregator + Lucene Contrib aggregator POM + pom + + ant + db + demo + highlighter + instantiated + lucli + memory + misc + queries + queryparser + spatial + spellchecker + swing + wordnet + xml-query-parser + + + build/lucene-contrib-aggregator + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/dev-tools/maven/lucene/contrib/queries/pom.xml b/dev-tools/maven/lucene/contrib/queries/pom.xml new file mode 100644 index 00000000000..4cef0b9fa3b --- /dev/null +++ b/dev-tools/maven/lucene/contrib/queries/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-queries + jar + Lucene Queries + + Queries - various query object exotica not in core + + + lucene/contrib/queries + ../../build/contrib/queries + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + jakarta-regexp + jakarta-regexp + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/queryparser/pom.xml b/dev-tools/maven/lucene/contrib/queryparser/pom.xml new file mode 100644 index 00000000000..6f215fa962d --- /dev/null +++ b/dev-tools/maven/lucene/contrib/queryparser/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-queryparser + jar + Lucene Query Parser + + This is the Flexible Query Parser for apache lucene java + + + lucene/contrib/queryparser + ../../build/contrib/queryparser + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/spatial/pom.xml b/dev-tools/maven/lucene/contrib/spatial/pom.xml new file mode 100644 index 00000000000..6bac5c10a8f --- /dev/null +++ b/dev-tools/maven/lucene/contrib/spatial/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-spatial + jar + Lucene Spatial + Spatial search package + + lucene/contrib/spatial + ../../build/contrib/spatial + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-queries + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/spellchecker/pom.xml b/dev-tools/maven/lucene/contrib/spellchecker/pom.xml new file mode 100644 index 00000000000..5be1474a734 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/spellchecker/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-spellchecker + jar + Lucene Spellchecker + Spell Checker + + lucene/contrib/spellchecker + ../../build/contrib/spellchecker + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/lucene/contrib/swing/pom.xml b/dev-tools/maven/lucene/contrib/swing/pom.xml new file mode 100644 index 00000000000..1f2f4e5e424 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/swing/pom.xml @@ -0,0 +1,101 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-swing + jar + Lucene Swing + Swing Models + + lucene/contrib/swing + ../../build/contrib/swing + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.swing.models.ListSearcherSimulator + ListSearchSimulator + + + org.apache.lucene.swing.models.TableSearcherSimulator + TableSearchSimulator + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/wordnet/pom.xml b/dev-tools/maven/lucene/contrib/wordnet/pom.xml new file mode 100644 index 00000000000..d55557322b6 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/wordnet/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-wordnet + jar + Lucene Wordnet + WordNet + + lucene/contrib/wordnet + ../../build/contrib/wordnet + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.wordnet.SynExpand + SynExpand + + + org.apache.lucene.wordnet.SynExpand + SynExpand + + + org.apache.lucene.wordnet.Syns2Index + Syns2Index + + + + + + + diff --git a/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml b/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml new file mode 100644 index 00000000000..f4c9aea1dd7 --- /dev/null +++ b/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.lucene + lucene-xml-query-parser + jar + Lucene XML Query Parser + XML query parser + + lucene/contrib/xml-query-parser + ../../build/contrib/xml-query-parser + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-queries + ${project.version} + + + javax.servlet + servlet-api + provided + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/lucene/contrib/db/bdb/pom.xml.template b/dev-tools/maven/lucene/pom.xml similarity index 63% rename from lucene/contrib/db/bdb/pom.xml.template rename to dev-tools/maven/lucene/pom.xml index 04696d96060..42b7c546157 100644 --- a/lucene/contrib/db/bdb/pom.xml.template +++ b/dev-tools/maven/lucene/pom.xml @@ -1,7 +1,6 @@ - + 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"> + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../pom.xml + + org.apache.lucene + lucene-core + jar + Lucene Core + Apache Lucene Java Core + + lucene + ../build + + + + junit + junit + test + + + org.apache.ant + ant + test + + + org.apache.ant + ant-junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + java + test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.version} + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.index.CheckIndex + CheckIndex + + + org.apache.lucene.index.IndexReader + IndexReader + + + org.apache.lucene.store.LockStressTest + LockStressTest + + + org.apache.lucene.store.LockVerifyServer + IndexReader + + + org.apache.lucene.util.English + English + + + + + + + diff --git a/dev-tools/maven/modules/analysis/common/pom.xml b/dev-tools/maven/modules/analysis/common/pom.xml new file mode 100644 index 00000000000..8977178b874 --- /dev/null +++ b/dev-tools/maven/modules/analysis/common/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../lucene/pom.xml + + org.apache.lucene + lucene-analyzers-common + jar + Lucene Common Analyzers + Additional Analyzers + + modules/analysis/common + ../build/common + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.analysis.charfilter.HtmlStripCharFilter + HtmlStripCharFilter + + + org.apache.lucene.analysis.en.PorterStemmer + EnglishPorterStemmer + + + org.tartarus.snowball.TestApp + SnowballTestApp + + + + + + + diff --git a/dev-tools/maven/modules/analysis/icu/pom.xml b/dev-tools/maven/modules/analysis/icu/pom.xml new file mode 100644 index 00000000000..1ce2183627e --- /dev/null +++ b/dev-tools/maven/modules/analysis/icu/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../lucene/pom.xml + + org.apache.lucene + lucene-analyzers-icu + jar + Lucene ICU Analysis Components + + Provides integration with ICU (International Components for Unicode) for + stronger Unicode and internationalization support. + + + modules/analysis/icu + ../build/icu + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + test-jar + test + + + com.ibm.icu + icu4j + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/modules/analysis/phonetic/pom.xml b/dev-tools/maven/modules/analysis/phonetic/pom.xml new file mode 100644 index 00000000000..665752e5300 --- /dev/null +++ b/dev-tools/maven/modules/analysis/phonetic/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../lucene/pom.xml + + org.apache.lucene + lucene-analyzers-phonetic + jar + Lucene Phonetic Filters + + Provides phonetic encoding via Commons Codec. + + + modules/analysis/phonetic + ../build/phonetic + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + test-jar + test + + + commons-codec + commons-codec + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/lucene/lucene-demos-pom.xml.template b/dev-tools/maven/modules/analysis/pom.xml similarity index 54% rename from lucene/lucene-demos-pom.xml.template rename to dev-tools/maven/modules/analysis/pom.xml index 8f4d6321a4a..7829ed61b77 100644 --- a/lucene/lucene-demos-pom.xml.template +++ b/dev-tools/maven/modules/analysis/pom.xml @@ -1,7 +1,6 @@ - + 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"> - 4.0.0 org.apache.lucene lucene-parent - @version@ + 4.0-SNAPSHOT + ../../lucene/pom.xml org.apache.lucene - lucene-demos - Lucene Demos - @version@ - This is the demo for Apache Lucene Java - jar - - - org.apache.lucene - lucene-core - @version@ - - + lucene-analysis-modules-aggregator + Lucene Analysis Modules aggregator POM + pom + + common + icu + phonetic + smartcn + stempel + + + build/lucene-analysis-modules-aggregator + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/dev-tools/maven/modules/analysis/smartcn/pom.xml b/dev-tools/maven/modules/analysis/smartcn/pom.xml new file mode 100644 index 00000000000..10a1a013dea --- /dev/null +++ b/dev-tools/maven/modules/analysis/smartcn/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../lucene/pom.xml + + org.apache.lucene + lucene-analyzers-smartcn + jar + Lucene Smart Chinese Analyzer + Smart Chinese Analyzer + + modules/analysis/smartcn + ../build/smartcn + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/modules/analysis/stempel/pom.xml b/dev-tools/maven/modules/analysis/stempel/pom.xml new file mode 100644 index 00000000000..19b6907e127 --- /dev/null +++ b/dev-tools/maven/modules/analysis/stempel/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../../lucene/pom.xml + + org.apache.lucene + lucene-analyzers-stempel + jar + Lucene Stempel Analyzer + Stempel Analyzer + + modules/analysis/stempel + ../build/stempel + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + src/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/modules/benchmark/pom.xml b/dev-tools/maven/modules/benchmark/pom.xml new file mode 100755 index 00000000000..e4b35e338c4 --- /dev/null +++ b/dev-tools/maven/modules/benchmark/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + 4.0-SNAPSHOT + ../../lucene/pom.xml + + org.apache.lucene + lucene-benchmark + jar + Lucene Benchmark + Lucene Benchmarking Module + + modules/benchmark + build + + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + test-jar + test + + + ${project.groupId} + lucene-analyzers-common + ${project.version} + + + ${project.groupId} + lucene-demo + ${project.version} + classes + + + ${project.groupId} + lucene-highlighter + ${project.version} + + + ${project.groupId} + lucene-memory + ${project.version} + + + commons-beanutils + commons-beanutils + + + commons-collections + commons-collections + + + org.apache.commons + commons-compress + + + commons-digester + commons-digester + + + commons-logging + commons-logging + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.lucene.benchmark.byTask.Benchmark + Benchmark + + + org.apache.lucene.benchmark.quality.trec.QueryDriver + QueryDriver + + + org.apache.lucene.benchmark.quality.utils.QualityQueriesFinder + QualityQueriesFinder + + + org.apache.lucene.benchmark.utils.ExtractReuters + ExtractReuters + + + org.apache.lucene.benchmark.utils.ExtractWikipedia + ExtractWikipedia + + + + + + + diff --git a/lucene/contrib/instantiated/pom.xml.template b/dev-tools/maven/modules/pom.xml similarity index 73% rename from lucene/contrib/instantiated/pom.xml.template rename to dev-tools/maven/modules/pom.xml index b65d04946f0..1b60080c172 100644 --- a/lucene/contrib/instantiated/pom.xml.template +++ b/dev-tools/maven/modules/pom.xml @@ -1,7 +1,6 @@ - - 4.0.0 org.apache.lucene - lucene-contrib - @version@ + lucene-parent + 4.0-SNAPSHOT + ../lucene/pom.xml org.apache.lucene - lucene-instantiated - Lucene InstantiatedIndex - @version@ - InstantiatedIndex, alternative RAM store for small corpora. - jar - + lucene-modules-aggregator + Lucene Modules aggregator POM + pom + + analysis + benchmark + + build/lucene-modules-aggregator org.apache.maven.plugins - maven-compiler-plugin + maven-deploy-plugin - 1.5 - 1.5 + true - diff --git a/dev-tools/maven/pom.xml b/dev-tools/maven/pom.xml new file mode 100644 index 00000000000..c0c5ae7d812 --- /dev/null +++ b/dev-tools/maven/pom.xml @@ -0,0 +1,690 @@ + + + 4.0.0 + + org.apache + apache + 8 + + org.apache.lucene + lucene-solr-grandparent + 4.0-SNAPSHOT + pom + Grandparent POM for Apache Lucene Java and Apache Solr + Parent POM for Apache Lucene Java and Apache Solr + http://lucene.apache.org/java + + lucene + modules + solr + + + 4.0.0 + yyyy-MM-dd HH:mm:ss + 1.5 + + + JIRA + http://issues.apache.org/jira/browse/LUCENE + + + Hudson + http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/ + + + + General List + general-subscribe@lucene.apache.org + general-unsubscribe@lucene.apache.org + + http://mail-archives.apache.org/mod_mbox/lucene-general/ + + + + Java User List + java-user-subscribe@lucene.apache.org + java-user-unsubscribe@lucene.apache.org + + http://mail-archives.apache.org/mod_mbox/lucene-java-user/ + + + + Java Developer List + dev-subscribe@lucene.apache.org + dev-unsubscribe@lucene.apache.org + http://mail-archives.apache.org/mod_mbox/lucene-dev/ + + + Java Commits List + commits-subscribe@lucene.apache.org + commits-unsubscribe@lucene.apache.org + + http://mail-archives.apache.org/mod_mbox/lucene-java-commits/ + + + + 2000 + + + scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory} + + + scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory} + + + http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory} + + + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + carrot2.org + Carrot2 Maven2 repository + http://download.carrot2.org/maven2/ + + never + + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + + false + + + never + + + + + + + com.ibm.icu + icu4j + 4.6 + + + com.sleepycat + berkeleydb + 4.7.25 + + + com.sleepycat + berkeleydb-je + 3.3.93 + + + commons-beanutils + commons-beanutils + 1.7.0 + + + commons-codec + commons-codec + 1.4 + + + commons-collections + commons-collections + 3.2.1 + + + commons-digester + commons-digester + 1.7 + + + commons-fileupload + commons-fileupload + 1.2.1 + + + commons-io + commons-io + 1.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-lang + commons-lang + 2.4 + + + commons-logging + commons-logging + 1.1.1 + + + jakarta-regexp + jakarta-regexp + 1.4 + + + javax.activation + activation + 1.1 + + + javax.mail + mail + 1.4.1 + + + jline + jline + 0.9.1 + + + jtidy + jtidy + 4aug2000r7-dev + + + junit + junit + 4.7 + + + org.apache.ant + ant + 1.7.1 + + + org.apache.ant + ant-junit + 1.7.1 + + + org.apache.commons + commons-compress + 1.1 + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + 1.0.1 + + + org.apache.solr + solr-commons-csv + ${project.version} + + + org.apache.solr + solr-noggit + ${project.version} + + + org.apache.tika + tika-core + 0.8 + + + org.apache.tika + tika-parsers + 0.8 + + + org.apache.velocity + velocity + 1.6.4 + + + org.apache.velocity + velocity-tools + 2.0 + + + org.apache.zookeeper + zookeeper + 3.3.1 + + + org.carrot2 + carrot2-core + 3.4.2 + + + org.codehaus.woodstox + wstx-asl + 3.2.7 + + + org.easymock + easymock + 2.2 + + + org.mortbay.jetty + jetty + 6.1.26 + + + org.mortbay.jetty + jetty-util + 6.1.26 + + + org.mortbay.jetty + jsp-2.1-glassfish + 2.1.v20091210 + + + org.mortbay.jetty + jsp-2.1-jetty + 6.1.26 + + + org.mortbay.jetty + jsp-api-2.1-glassfish + 2.1.v20091210 + + + org.slf4j + jcl-over-slf4j + 1.5.5 + + + org.slf4j + log4j-over-slf4j + 1.5.5 + + + org.slf4j + slf4j-api + 1.5.5 + + + org.slf4j + slf4j-jdk14 + 1.5.5 + + + xerces + xercesImpl + 2.10.0 + + + xml-apis + xml-apis + 2.10.0 + + + javax.servlet + servlet-api + 2.4 + + + + + lucene/build/lucene-parent + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + ${java.compat.version} + ${java.compat.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0 + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + + + + + ${project.groupId} + ${project.groupId} + ${project.name} + + ${base.specification.version}.${now.version} + The Apache Software Foundation + + ${project.version} ${svn.revision} - ${user.name} - ${now.timestamp} + The Apache Software Foundation + ${java.compat.version} + ${java.compat.version} + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7.1 + + plain + ${project.build.testOutputDirectory} + + temp + 1 + ${tests.codec} + ${tests.directory} + ${tests.iter} + ${tests.locale} + ${tests.luceneMatchVersion} + ${tests.multiplier} + ${tests.nightly} + ${tests.seed} + ${tests.timezone} + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + + + + + ${project.groupId} + ${project.groupId} + ${project.name} + + ${base.specification.version}.${now.version} + The Apache Software Foundation + + ${project.version} ${svn.revision} - ${user.name} - ${now.timestamp} + The Apache Software Foundation + ${java.compat.version} + ${java.compat.version} + + + + + + org.codehaus.mojo + appassembler-maven-plugin + 1.1 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.5 + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0-beta-4 + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + + + org.codehaus.gmaven + gmaven-plugin + 1.3 + + + + + + org.codehaus.gmaven + gmaven-plugin + + + generate-timestamps + validate + + execute + + + + project.properties['now.timestamp'] = "${maven.build.timestamp}" + project.properties['now.version'] = ("${maven.build.timestamp}" =~ /[- :]/).replaceAll(".") + project.properties['now.year'] = "${maven.build.timestamp}".substring(0, 4) + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + true + svn.revision + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java-compat-version-and-maven-2.2.1 + + enforce + + + + + Java ${java.compat.version}+ is required. + [${java.compat.version},) + + + Maven 2.2.1+ is required. + [2.2.1,) + + + + + + + + + + + + bootstrap + + + + org.apache.maven.plugins + maven-antrun-plugin + + + get-jars-and-poms + install + + run + + + + + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + install-icu4j + install + + install-file + + + com.ibm.icu + icu4j + 4.6 + jar + modules/analysis/icu/lib/icu4j-4_6.jar + + + + install-xercesImpl + install + + install-file + + + xerces + xercesImpl + 2.10.0 + jar + modules/benchmark/lib/xercesImpl-2.10.0.jar + + + + install-xml-apis + install + + install-file + + + xml-apis + xml-apis + 2.10.0 + jar + modules/benchmark/lib/xml-apis-2.10.0.jar + + + + install-berkeleydb + install + + install-file + + + com.sleepycat + berkeleydb + 4.7.25 + jar + lucene/contrib/db/bdb/lib/db-4.7.25.jar + + + + install-berkeleydb-je + install + + install-file + + + com.sleepycat + berkeleydb-je + 3.3.93 + jar + lucene/contrib/db/bdb-je/lib/je-3.3.93.jar + + + + install-solr-commons-csv + install + + install-file + + + org.apache.solr + solr-commons-csv + ${project.version} + jar + solr/lib/commons-csv-1.0-SNAPSHOT-r966014.jar + + + + install-solr-noggit + install + + install-file + + + org.apache.solr + solr-noggit + ${project.version} + jar + solr/lib/apache-solr-noggit-r944541.jar + + + + + + + + + diff --git a/dev-tools/maven/solr/contrib/analysis-extras/pom.xml b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml new file mode 100644 index 00000000000..ce67bbaf22e --- /dev/null +++ b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.solr + solr-analysis-extras + jar + Apache Solr Analysis Extras + Apache Solr Analysis Extras + + solr/contrib/analysis-extras + build + 4.0 + + + + ${project.groupId} + solr-core + ${project.version} + + + ${project.groupId} + solr-core + ${project.version} + test-jar + test + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + + + org.apache.lucene + lucene-analyzers-icu + ${project.version} + + + org.apache.lucene + lucene-analyzers-smartcn + ${project.version} + + + org.apache.lucene + lucene-analyzers-stempel + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes + ${build-directory}/test-classes + src/java + src/test + + + test-files + + + ../../src/test-files + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../../testlogging.properties + + + + + + diff --git a/dev-tools/maven/solr/contrib/clustering/pom.xml b/dev-tools/maven/solr/contrib/clustering/pom.xml new file mode 100644 index 00000000000..81266fd9cda --- /dev/null +++ b/dev-tools/maven/solr/contrib/clustering/pom.xml @@ -0,0 +1,103 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.solr + solr-clustering + jar + Apache Solr Clustering + Apache Solr Clustering + + solr/contrib/clustering + build + 4.0 + + + + ${project.groupId} + solr-core + ${project.version} + + + ${project.groupId} + solr-core + ${project.version} + test-jar + test + + + ${project.groupId} + solr-solrj + ${project.version} + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + org.carrot2 + carrot2-core + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes + ${build-directory}/test-classes + + + src/test/resources + + + ../../src/test-files + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../../testlogging.properties + + + + + + diff --git a/solr/contrib/clustering/solr-clustering-pom.xml.template b/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml similarity index 56% rename from solr/contrib/clustering/solr-clustering-pom.xml.template rename to dev-tools/maven/solr/contrib/dataimporthandler/pom.xml index ac066e01afe..a90b1dec722 100644 --- a/solr/contrib/clustering/solr-clustering-pom.xml.template +++ b/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml @@ -1,7 +1,6 @@ - - 4.0.0 - org.apache.solr solr-parent - @version@ + 4.0-SNAPSHOT + ../../pom.xml - org.apache.solr - solr-clustering - Apache Solr Clustering - @version@ - Apache Solr Clustering - jar - - - org.apache.solr - solr-solrj - @version@ - - - org.apache.solr - solr-core - @version@ - - - - org.carrot2 - carrot2-mini - 3.1.0 - - - - - carrot2.org - Carrot2 Maven2 repository - http://download.carrot2.org/maven2/ - - + solr-dataimporthandler-aggregator + pom + Apache Solr DataImportHandler aggregator POM + Apache Solr DataImportHandler aggregator POM + + src + src/extras + + + target/solr-dataimporthandler-aggregator + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml b/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml new file mode 100644 index 00000000000..bae3817983f --- /dev/null +++ b/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml @@ -0,0 +1,132 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../../../pom.xml + + org.apache.solr + solr-dataimporthandler-extras + jar + Apache Solr DataImportHandler Extras + Apache Solr DataImportHandler Extras + + solr/contrib/dataimporthandler/src/extras + ../../target/extras + 4.0 + + + + ${project.groupId} + solr-core + ${project.version} + + + ${project.groupId} + solr-core + ${project.version} + test-jar + test + + + ${project.groupId} + solr-dataimporthandler + ${project.version} + + + ${project.groupId} + solr-dataimporthandler + ${project.version} + test-jar + test + + + ${project.groupId} + solr-solrj + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + commons-io + commons-io + + + javax.activation + activation + + + javax.mail + mail + + + org.apache.tika + tika-parsers + + + org.slf4j + slf4j-api + + + xerces + xercesImpl + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/extras/classes + ${build-directory}/extras/test-classes + main/java + test/java + + + test/resources + + + ../../../../src/test-files + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../../../../testlogging.properties + + + + + + diff --git a/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml b/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml new file mode 100644 index 00000000000..0745d2e5417 --- /dev/null +++ b/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../../pom.xml + + org.apache.solr + solr-dataimporthandler + jar + Apache Solr DataImportHandler + Apache Solr DataImportHandler + + solr/contrib/dataimporthandler + ../target + 4.0 + + + + ${project.groupId} + solr-core + ${project.version} + + + ${project.groupId} + solr-core + ${project.version} + test-jar + test + + + ${project.groupId} + solr-solrj + ${project.version} + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + commons-io + commons-io + + + org.slf4j + slf4j-api + + + junit + junit + test + + + org.easymock + easymock + test + + + + ${build-directory} + ${build-directory}/classes + ${build-directory}/test-classes + main/java + test/java + + + test/resources + + + ../../../src/test-files + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../../../testlogging.properties + + + + + + diff --git a/dev-tools/maven/solr/contrib/extraction/pom.xml b/dev-tools/maven/solr/contrib/extraction/pom.xml new file mode 100644 index 00000000000..75d1f2316c9 --- /dev/null +++ b/dev-tools/maven/solr/contrib/extraction/pom.xml @@ -0,0 +1,114 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.solr + solr-cell + jar + Apache Solr Content Extraction Library + + Apache Solr Content Extraction Library integrates Apache Tika + content extraction framework into Solr + + + solr/contrib/extraction + build + 4.0 + + + + ${project.groupId} + solr-core + ${project.version} + + + ${project.groupId} + solr-core + ${project.version} + test-jar + test + + + ${project.groupId} + solr-solrj + ${project.version} + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + com.ibm.icu + icu4j + + + org.apache.tika + tika-parsers + + + xerces + xercesImpl + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes + ${build-directory}/test-classes + + + src/test/resources + + + ../../src/test-files + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../../testlogging.properties + + + + + + diff --git a/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml similarity index 54% rename from solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template rename to dev-tools/maven/solr/contrib/pom.xml index 287479c73cb..fff3350f474 100644 --- a/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template +++ b/dev-tools/maven/solr/contrib/pom.xml @@ -1,7 +1,6 @@ - + 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"> - 4.0.0 - org.apache.solr solr-parent - @version@ + 4.0-SNAPSHOT + ../pom.xml - org.apache.solr - solr-dataimporthandler-extras - Apache Solr DataImportHandler Extras - @version@ - Apache Solr DataImportHandler Extras - jar - - - - javax.activation - activation - 1.1 - - - javax.mail - mail - 1.4.1 - - - + solr-contrib-aggregator + Apache Solr Contrib aggregator POM + pom + + analysis-extras + clustering + dataimporthandler + extraction + + + ../build/solr-contrib-aggregator + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/solr/src/maven/solr-parent-pom.xml.template b/dev-tools/maven/solr/pom.xml similarity index 51% rename from solr/src/maven/solr-parent-pom.xml.template rename to dev-tools/maven/solr/pom.xml index 211f32de862..465af72a1a0 100644 --- a/solr/src/maven/solr-parent-pom.xml.template +++ b/dev-tools/maven/solr/pom.xml @@ -1,7 +1,6 @@ - + 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"> - 4.0.0 - - org.apache - apache - 4 + org.apache.lucene + lucene-solr-grandparent + 4.0-SNAPSHOT + ../pom.xml - org.apache.solr solr-parent - Apache Solr Parent POM - @version@ - Apache Solr Parent POM - http://lucene.apache.org/solr pom - + Apache Solr parent POM + Apache Solr parent POM + + src + src/solrj + src/webapp + contrib + + + 1.6 + JIRA http://issues.apache.org/jira/browse/SOLR - Hudson http://lucene.zones.apache.org:8080/hudson/job/Solr-Nightly/ - Solr User List @@ -59,41 +60,35 @@ - Solr Developer List - solr-dev-subscribe@lucene.apache.org - solr-dev-unsubscribe@lucene.apache.org - - http://mail-archives.apache.org/mod_mbox/solr-dev/ - + Java Developer List + dev-subscribe@lucene.apache.org + dev-unsubscribe@lucene.apache.org + http://mail-archives.apache.org/mod_mbox/lucene-dev/ - Solr Commits List - solr-commits-subscribe@lucene.apache.org - - solr-commits-unsubscribe@lucene.apache.org - + Java Commits List + commits-subscribe@lucene.apache.org + commits-unsubscribe@lucene.apache.org - http://mail-archives.apache.org/mod_mbox/solr-commits/ + http://mail-archives.apache.org/mod_mbox/lucene-java-commits/ - 2006 - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - scm:svn:http://svn.apache.org/repos/asf/lucene/dev - - - scm:svn:https://svn.apache.org/repos/asf/lucene/dev - - - + + build/solr-parent + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + ${project.name} ${project.version} API (${now.version}) + ${project.name} ${project.version} API (${now.version}) + + + + + diff --git a/dev-tools/maven/solr/src/pom.xml b/dev-tools/maven/solr/src/pom.xml new file mode 100644 index 00000000000..0014b38bfd1 --- /dev/null +++ b/dev-tools/maven/solr/src/pom.xml @@ -0,0 +1,252 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../pom.xml + + org.apache.solr + solr-core + jar + Apache Solr Core + Apache Solr Core + + solr + ../build + 4.0 + + + + ${project.groupId} + solr-solrj + ${project.version} + + + ${project.groupId} + solr-noggit + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + + + org.apache.lucene + lucene-analyzers-phonetic + ${project.version} + + + org.apache.lucene + lucene-highlighter + ${project.version} + + + org.apache.lucene + lucene-memory + ${project.version} + + + org.apache.lucene + lucene-misc + ${project.version} + + + org.apache.lucene + lucene-queries + ${project.version} + + + org.apache.lucene + lucene-spatial + ${project.version} + + + org.apache.lucene + lucene-spellchecker + ${project.version} + + + org.apache.solr + solr-commons-csv + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + commons-codec + commons-codec + + + commons-fileupload + commons-fileupload + + + commons-httpclient + commons-httpclient + + + commons-io + commons-io + + + commons-lang + commons-lang + + + org.apache.velocity + velocity + + + org.apache.velocity + velocity-tools + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jsp-2.1-jetty + provided + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-jdk14 + + + javax.servlet + servlet-api + provided + + + junit + junit + test + + + org.easymock + easymock + test + + + + ${build-directory} + ${build-directory}/solr + ${build-directory}/tests + java + test + + + test-files + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + webapp/src + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../../testlogging.properties + + + + + org.codehaus.mojo + appassembler-maven-plugin + + -Xmx128M + flat + + windows + unix + + + + org.apache.solr.client.solrj.embedded.JettySolrRunner + JettySolrRunner + + + org.apache.solr.util.BitSetPerf + BitSetPerf + -Xms128m -Xbatch + + + org.apache.solr.util.SimplePostTool + SimplePostTool + + + org.apache.solr.util.SuggestMissingFactories + SuggestMissingFactories + + + + + + + diff --git a/dev-tools/maven/solr/src/solrj/pom.xml b/dev-tools/maven/solr/src/solrj/pom.xml new file mode 100644 index 00000000000..262793a6dbe --- /dev/null +++ b/dev-tools/maven/solr/src/solrj/pom.xml @@ -0,0 +1,135 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.solr + solr-solrj + jar + Apache Solr Solrj + Apache Solr Solrj + + solr/src/solrj + ../../build/solrj + 4.0 + + + + org.apache.lucene + lucene-core + ${project.version} + + + org.apache.lucene + lucene-core + ${project.version} + test-jar + test + + + org.apache.lucene + lucene-analyzers-common + ${project.version} + test + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + org.apache.zookeeper + zookeeper + + + javax.jms + jms + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + + + commons-httpclient + commons-httpclient + + + commons-io + commons-io + + + org.slf4j + slf4j-api + + + junit + junit + test + + + + ${build-directory} + ${build-directory} + . + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ../common + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + true + + + + + diff --git a/dev-tools/maven/solr/src/webapp/pom.xml b/dev-tools/maven/solr/src/webapp/pom.xml new file mode 100644 index 00000000000..af914c5a94a --- /dev/null +++ b/dev-tools/maven/solr/src/webapp/pom.xml @@ -0,0 +1,191 @@ + + + 4.0.0 + + org.apache.solr + solr-parent + 4.0-SNAPSHOT + ../../pom.xml + + org.apache.solr + solr + war + Apache Solr Search Server + Apache Solr Search Server + + solr/src/webapp + ../../build/web + + + + ${project.groupId} + solr-core + ${project.version} + + + commons-chain + commons-chain + + + commons-digester + commons-digester + + + commons-logging + commons-logging + + + commons-validator + commons-validator + + + jakarta-regexp + jakarta-regexp + + + dom4j + dom4j + + + log4j + log4j + + + javax.activation + activation + + + javax.mail + mail + + + jline + jline + + + org.apache.struts + struts-core + + + org.apache.struts + struts-taglib + + + org.apache.struts + struts-tiles + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + oro + oro + + + sslext + sslext + + + xml-apis + xml-apis + + + + + ${project.groupId} + solr-dataimporthandler + ${project.version} + + + org.codehaus.woodstox + wstx-asl + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + log4j-over-slf4j + + + + ${build-directory} + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-source-plugin + + + + + + false + + + + org.apache.maven.plugins + maven-war-plugin + + web + web/WEB-INF/web.xml + + + ../../contrib/dataimporthandler/src/main/webapp + + + + + + org.mortbay.jetty + maven-jetty-plugin + + 10 + + + 8080 + 60000 + + + + / + + web,../../contrib/dataimporthandler/src/main/webapp + + + + + + + diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 20c5b3beee7..39fb10982e9 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -907,6 +907,9 @@ Build "ant idea". See http://wiki.apache.org/lucene-java/HowtoConfigureIntelliJ (Steven Rowe) +* LUCENE-2657: Switch from using Maven POM templates to full POMs when + generating Maven artifacts (Steven Rowe) + Test Cases * LUCENE-2037 Allow Junit4 tests in our environment (Erick Erickson diff --git a/lucene/build.xml b/lucene/build.xml index 1d1930a61f4..96e00855c45 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -391,8 +391,11 @@ - - + + + + + @@ -400,8 +403,6 @@ classifier="javadoc"/> - - diff --git a/lucene/common-build.xml b/lucene/common-build.xml index 8223f3ffbc5..be42d5bd648 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -318,32 +318,22 @@ - - - + - - - - - - - - + + - + - - diff --git a/lucene/contrib/ant/pom.xml.template b/lucene/contrib/ant/pom.xml.template deleted file mode 100644 index 1bcf3e113e6..00000000000 --- a/lucene/contrib/ant/pom.xml.template +++ /dev/null @@ -1,48 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-ant - jar - @version@ - Lucene Contrib Ant - Ant task to create Lucene indexes - - - jtidy - jtidy - 4aug2000r7-dev - - - ant - ant - 1.6.5 - - - diff --git a/lucene/contrib/contrib-build.xml b/lucene/contrib/contrib-build.xml index 802d307eb6a..77b1dd04bc6 100644 --- a/lucene/contrib/contrib-build.xml +++ b/lucene/contrib/contrib-build.xml @@ -71,7 +71,7 @@ diff --git a/lucene/contrib/db/bdb-je/pom.xml.template b/lucene/contrib/db/bdb-je/pom.xml.template deleted file mode 100644 index ae11c60273c..00000000000 --- a/lucene/contrib/db/bdb-je/pom.xml.template +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-bdb-je - jar - @version@ - lucene-contrib-bdb-je - Berkeley DB based Directory implementation - - - sleepycat - je - ${sleepycat-je-version} - - - diff --git a/lucene/contrib/demo/build.xml b/lucene/contrib/demo/build.xml index cb2f7e27d7f..8097400f87f 100644 --- a/lucene/contrib/demo/build.xml +++ b/lucene/contrib/demo/build.xml @@ -17,7 +17,7 @@ limitations under the License. --> - + Lucene Demo @@ -75,4 +75,23 @@ outputDir="src/java/org/apache/lucene/demo/html" /> + + + + + + + + + + + + + + + + diff --git a/lucene/contrib/highlighter/pom.xml.template b/lucene/contrib/highlighter/pom.xml.template deleted file mode 100644 index 08421ee8eed..00000000000 --- a/lucene/contrib/highlighter/pom.xml.template +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-highlighter - Lucene Highlighter - @version@ - - This is the highlighter for apache lucene java - - jar - - - org.apache.lucene - lucene-memory - @version@ - - - diff --git a/lucene/contrib/lucli/pom.xml.template b/lucene/contrib/lucli/pom.xml.template deleted file mode 100644 index 8354ded1e33..00000000000 --- a/lucene/contrib/lucli/pom.xml.template +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-lucli - jar - @version@ - lucene-contrib-lucli - Lucene Command Line Interface - - - jline - jline - 0.9.91 - - - diff --git a/lucene/contrib/memory/pom.xml.template b/lucene/contrib/memory/pom.xml.template deleted file mode 100644 index ed5151464d6..00000000000 --- a/lucene/contrib/memory/pom.xml.template +++ /dev/null @@ -1,38 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-memory - Lucene Memory - @version@ - - High-performance single-document index to compare against Query - - jar - diff --git a/lucene/contrib/misc/pom.xml.template b/lucene/contrib/misc/pom.xml.template deleted file mode 100644 index 0c47d3928b9..00000000000 --- a/lucene/contrib/misc/pom.xml.template +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-misc - Lucene Miscellaneous - @version@ - Miscellaneous Lucene extensions - jar - diff --git a/lucene/contrib/queries/pom.xml.template b/lucene/contrib/queries/pom.xml.template deleted file mode 100644 index 0cd10860125..00000000000 --- a/lucene/contrib/queries/pom.xml.template +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-queries - Lucene Queries - @version@ - - Queries - various query object exotica not in core - - jar - - - jakarta-regexp - jakarta-regexp - ${jakarta-regexp-version} - - - diff --git a/lucene/contrib/queryparser/pom.xml.template b/lucene/contrib/queryparser/pom.xml.template deleted file mode 100644 index 96b5c23bfb2..00000000000 --- a/lucene/contrib/queryparser/pom.xml.template +++ /dev/null @@ -1,40 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-queryparser - Lucene Query Parser - @version@ - - This is the Flexible Query Parser for apache lucene java - - jar - - - diff --git a/lucene/contrib/spellchecker/pom.xml.template b/lucene/contrib/spellchecker/pom.xml.template deleted file mode 100644 index d78e5ba9e4e..00000000000 --- a/lucene/contrib/spellchecker/pom.xml.template +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-spellchecker - Lucene Spellchecker - @version@ - Spell Checker - jar - diff --git a/lucene/contrib/swing/pom.xml.template b/lucene/contrib/swing/pom.xml.template deleted file mode 100644 index 2ebf3bc9d03..00000000000 --- a/lucene/contrib/swing/pom.xml.template +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-swing - Lucene Swing - @version@ - Swing Models - jar - diff --git a/lucene/contrib/wordnet/pom.xml.template b/lucene/contrib/wordnet/pom.xml.template deleted file mode 100644 index e9518229364..00000000000 --- a/lucene/contrib/wordnet/pom.xml.template +++ /dev/null @@ -1,37 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-wordnet - Lucene Wordnet - @version@ - WordNet - jar - - diff --git a/lucene/contrib/xml-query-parser/pom.xml.template b/lucene/contrib/xml-query-parser/pom.xml.template deleted file mode 100644 index 4c1e7f8a5a5..00000000000 --- a/lucene/contrib/xml-query-parser/pom.xml.template +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-xml-query-parser - Lucene XML Query Parser - @version@ - XML query parser - jar - - - org.apache.lucene - lucene-queries - @version@ - - - diff --git a/lucene/lucene-contrib-pom.xml.template b/lucene/lucene-contrib-pom.xml.template deleted file mode 100644 index 9c33fb836c1..00000000000 --- a/lucene/lucene-contrib-pom.xml.template +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-parent - @version@ - - lucene-contrib - Lucene Java Contrib POM - @version@ - pom - - - org.apache.lucene - lucene-core - @version@ - - - - 1.0.4 - 1.7 - 3.1 - 1.7.0 - 1.4 - 3.3.93 - 4.0 - - diff --git a/lucene/lucene-core-pom.xml.template b/lucene/lucene-core-pom.xml.template deleted file mode 100644 index da3a14e32a5..00000000000 --- a/lucene/lucene-core-pom.xml.template +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - org.apache.lucene - lucene-parent - @version@ - - 4.0.0 - org.apache.lucene - lucene-core - Lucene Core - @version@ - Apache Lucene Java Core - jar - diff --git a/lucene/lucene-parent-pom.xml.template b/lucene/lucene-parent-pom.xml.template deleted file mode 100644 index 3f01c87cd3c..00000000000 --- a/lucene/lucene-parent-pom.xml.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - org.apache - apache - 4 - - 4.0.0 - org.apache.lucene - lucene-parent - Lucene Java POM - @version@ - Apache Lucene Java POM - http://lucene.apache.org/java - pom - - JIRA - http://issues.apache.org/jira/browse/LUCENE - - - Hudson - - http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/ - - - - - Java User List - java-user-subscribe@lucene.apache.org - java-user-unsubscribe@lucene.apache.org - - http://mail-archives.apache.org/mod_mbox/java-user/ - - - - Java Developer List - java-dev-subscribe@lucene.apache.org - java-dev-unsubscribe@lucene.apache.org - - http://mail-archives.apache.org/mod_mbox/java-dev/ - - - - Java Commits List - java-commits-subscribe@lucene.apache.org - - java-commits-unsubscribe@lucene.apache.org - - - http://mail-archives.apache.org/mod_mbox/java-commits/ - - - - 2000 - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - scm:svn:http://svn.apache.org/repos/asf/lucene/dev - - - scm:svn:https://svn.apache.org/repos/asf/lucene/dev - - - diff --git a/modules/analysis/common/pom.xml.template b/modules/analysis/common/pom.xml.template deleted file mode 100644 index cd4478b2de9..00000000000 --- a/modules/analysis/common/pom.xml.template +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-analyzers-common - Lucene Analyzers - @version@ - Additional Analyzers - jar - diff --git a/modules/analysis/icu/pom.xml.template b/modules/analysis/icu/pom.xml.template deleted file mode 100644 index d9c44ddfcff..00000000000 --- a/modules/analysis/icu/pom.xml.template +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-analyzers-icu - - Lucene ICUCollationKeyFilter/Analyzer - - @version@ - - Provides integration with ICU (International Components for Unicode) for - stronger Unicode and internationalization support. - - jar - - - com.ibm.icu - icu4j - ${icu-version} - - - diff --git a/modules/analysis/phonetic/pom.xml.template b/modules/analysis/phonetic/pom.xml.template deleted file mode 100644 index 5d3b27ce71c..00000000000 --- a/modules/analysis/phonetic/pom.xml.template +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-analyzers-phonetic - - Lucene Phonetic Filters - - @version@ - - Provides phonetic encoding via Commons Codec. - - jar - - - commons-codec - commons-codec - 1.4 - - - diff --git a/modules/analysis/smartcn/pom.xml.template b/modules/analysis/smartcn/pom.xml.template deleted file mode 100644 index bf98c18002d..00000000000 --- a/modules/analysis/smartcn/pom.xml.template +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-analyzers-smartcn - Lucene Smart Chinese Analyzer - @version@ - Smart Chinese Analyzer - jar - diff --git a/modules/analysis/stempel/pom.xml.template b/modules/analysis/stempel/pom.xml.template deleted file mode 100644 index 3cf3ca6c9f5..00000000000 --- a/modules/analysis/stempel/pom.xml.template +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-analyzers-stempel - Lucene Stempel Analyzer - @version@ - Stempel Analyzer - jar - diff --git a/modules/benchmark/build.xml b/modules/benchmark/build.xml index 3bccf5647e1..3e18124a7cf 100644 --- a/modules/benchmark/build.xml +++ b/modules/benchmark/build.xml @@ -260,5 +260,6 @@ - + + diff --git a/modules/benchmark/pom.xml.template b/modules/benchmark/pom.xml.template deleted file mode 100644 index 9e6a1ecd7e0..00000000000 --- a/modules/benchmark/pom.xml.template +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-benchmark - Lucene Benchmark - @version@ - Lucene Benchmarking Contributions - jar - - - org.apache.lucene - lucene-demos - @version@ - - - org.apache.lucene - lucene-highlighter - @version@ - - - commons-beanutils - commons-beanutils - ${commons-beanutils-version} - - - commons-collections - commons-collections - ${commons-collections-version} - - - commons-digester - commons-digester - ${commons-digester-version} - - - commons-logging - commons-logging - ${commons-logging-version} - - - diff --git a/modules/build.xml b/modules/build.xml index 5a07003c66b..6fd84c20f53 100644 --- a/modules/build.xml +++ b/modules/build.xml @@ -56,6 +56,8 @@ + + diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index e542c54d65c..232f8799d7e 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -738,6 +738,10 @@ Build * SOLR-2042: Fixed some Maven deps (Drew Farris via gsingers) +* LUCENE-2657: Switch from using Maven POM templates to full POMs when + generating Maven artifacts (Steven Rowe) + + Documentation ---------------------- diff --git a/solr/build.xml b/solr/build.xml index 9304b565654..0b2a6272bcf 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -216,14 +216,14 @@ - + - + @@ -613,8 +613,8 @@ - + @@ -629,8 +629,8 @@ basedir="${build.javadoc}/solrj" /> - + + + + + + - - - - - - - - - - + - - - - - @@ -846,6 +837,7 @@ + - + - + - + - @@ -879,55 +871,56 @@ - - - - - - - - + - + + + + + + + - - - - - + diff --git a/solr/common-build.xml b/solr/common-build.xml index f7367a506a0..23ac4621b08 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -378,19 +378,34 @@ - - + + + + + + + + + + + + + + + + + + - + - - + @@ -438,6 +453,17 @@ + + + + + + + + + + + diff --git a/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template b/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template deleted file mode 100644 index 807681d7dc1..00000000000 --- a/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template +++ /dev/null @@ -1,39 +0,0 @@ - - - - - 4.0.0 - - - org.apache.solr - solr-parent - @version@ - - - org.apache.solr - solr-dataimporthandler - Apache Solr DataImportHandler - @version@ - Apache Solr DataImportHandler - jar - - diff --git a/solr/contrib/extraction/solr-cell-pom.xml.template b/solr/contrib/extraction/solr-cell-pom.xml.template deleted file mode 100644 index 2285353a2a7..00000000000 --- a/solr/contrib/extraction/solr-cell-pom.xml.template +++ /dev/null @@ -1,51 +0,0 @@ - - - - - 4.0.0 - - - org.apache.solr - solr-parent - @version@ - - - org.apache.solr - solr-cell - Apache Solr Content Extraction Library - @version@ - Apache Solr Content Extraction Library integrates Apache Tika content extraction framework into Solr - jar - - - - org.apache.tika - tika-core - 0.8-SNAPSHOT - - - org.apache.tika - tika-parsers - 0.8-SNAPSHOT - - - diff --git a/solr/src/maven/solr-core-pom.xml.template b/solr/src/maven/solr-core-pom.xml.template deleted file mode 100644 index dfdda7266a8..00000000000 --- a/solr/src/maven/solr-core-pom.xml.template +++ /dev/null @@ -1,148 +0,0 @@ - - - - - 4.0.0 - - - org.apache.solr - solr-parent - @version@ - - - org.apache.solr - solr-core - Apache Solr Core - @version@ - Apache Solr Server - jar - - - - - - org.apache.solr - solr-solrj - @version@ - - - - - org.apache.lucene - lucene-core - @version@ - - - org.apache.lucene - lucene-analyzers-common - @version@ - - - org.apache.lucene - lucene-analyzers-phonetic - @version@ - - - org.apache.lucene - lucene-highlighter - @version@ - - - org.apache.lucene - lucene-memory - @version@ - - - org.apache.lucene - lucene-misc - @version@ - - - org.apache.lucene - lucene-queries - @version@ - - - org.apache.lucene - lucene-spatial - @version@ - - - org.apache.lucene - lucene-spellchecker - @version@ - - - - - org.apache.zookeeper - zookeeper - 3.3.1 - - - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-io - commons-io - 1.4 - - - commons-codec - commons-codec - 1.4 - - - commons-lang - commons-lang - 2.4 - - - commons-fileupload - commons-fileupload - 1.2.1 - - - org.apache.velocity - velocity - 1.6.4 - - - org.apache.velocity - velocity-tools - 2.0 - - - - - org.apache.solr - solr-commons-csv - @version@ - - - - - diff --git a/solr/src/maven/solr-solrj-pom.xml.template b/solr/src/maven/solr-solrj-pom.xml.template deleted file mode 100644 index 0d961250740..00000000000 --- a/solr/src/maven/solr-solrj-pom.xml.template +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - - org.apache.solr - solr-parent - @version@ - - - org.apache.solr - solr-solrj - Apache Solr Solrj - @version@ - Apache Solr Solrj - jar - - - - - - org.slf4j - slf4j-api - 1.5.5 - - - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-codec - commons-codec - 1.3 - - - commons-io - commons-io - 1.4 - - - commons-fileupload - commons-fileupload - 1.2.1 - - - - -