You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2010/08/19 21:58:37 UTC
svn commit: r987286 - in /lucene/dev/trunk: ./ modules/ modules/analysis/
modules/analysis/common/ modules/analysis/icu/ modules/analysis/phonetic/
modules/analysis/smartcn/ modules/analysis/stempel/
Author: ryan
Date: Thu Aug 19 19:58:36 2010
New Revision: 987286
URL: http://svn.apache.org/viewvc?rev=987286&view=rev
Log:
getting 'generate-maven-artifacts' to work with analysis module
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/modules/analysis/build.xml
lucene/dev/trunk/modules/analysis/common/pom.xml.template
lucene/dev/trunk/modules/analysis/icu/pom.xml.template
lucene/dev/trunk/modules/analysis/phonetic/pom.xml.template
lucene/dev/trunk/modules/analysis/smartcn/pom.xml.template
lucene/dev/trunk/modules/analysis/stempel/pom.xml.template
lucene/dev/trunk/modules/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Thu Aug 19 19:58:36 2010
@@ -22,13 +22,7 @@
<sequential>
<subant target="test" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
- </subant>
-
- <subant target="test" inheritall="false" failonerror="true">
<fileset dir="modules" includes="build.xml" />
- </subant>
-
- <subant target="test" inheritall="false" failonerror="true">
<fileset dir="solr" includes="build.xml" />
</subant>
</sequential>
@@ -44,13 +38,12 @@
</sequential>
</target>
+ <!-- run with -Dmaven.dist.dir=maven to put all the artifacts in one place -->
<target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr">
<sequential>
<subant target="generate-maven-artifacts" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
- </subant>
-
- <subant target="generate-maven-artifacts" inheritall="false" failonerror="true">
+ <fileset dir="modules" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
</subant>
</sequential>
Modified: lucene/dev/trunk/modules/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/build.xml?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/build.xml Thu Aug 19 19:58:36 2010
@@ -81,7 +81,7 @@
<target name="build-artifacts-and-tests" depends="default,compile-test" />
- <target name="dist-maven" depends="default">
+ <target name="dist-maven" depends="default,javadocs">
<ant dir="common" target="dist-maven" />
<ant dir="icu" target="dist-maven" />
<ant dir="phonetic" target="dist-maven" />
Modified: lucene/dev/trunk/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/pom.xml.template?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/trunk/modules/analysis/common/pom.xml.template Thu Aug 19 19:58:36 2010
@@ -27,7 +27,7 @@
<version>@version@</version>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
<name>Lucene Analyzers</name>
<version>@version@</version>
<description>Additional Analyzers</description>
Modified: lucene/dev/trunk/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/pom.xml.template?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/trunk/modules/analysis/icu/pom.xml.template Thu Aug 19 19:58:36 2010
@@ -27,7 +27,7 @@
<version>@version@</version>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-icu</artifactId>
+ <artifactId>lucene-analyzers-icu</artifactId>
<name>
Lucene ICUCollationKeyFilter/Analyzer
</name>
Modified: lucene/dev/trunk/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/phonetic/pom.xml.template?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/trunk/modules/analysis/phonetic/pom.xml.template Thu Aug 19 19:58:36 2010
@@ -27,7 +27,7 @@
<version>@version@</version>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-phonetic</artifactId>
+ <artifactId>lucene-analyzers-phonetic</artifactId>
<name>
Lucene Phonetic Filters
</name>
Modified: lucene/dev/trunk/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/smartcn/pom.xml.template?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/trunk/modules/analysis/smartcn/pom.xml.template Thu Aug 19 19:58:36 2010
@@ -27,7 +27,7 @@
<version>@version@</version>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-smartcn</artifactId>
+ <artifactId>lucene-analyzers-smartcn</artifactId>
<name>Lucene Smart Chinese Analyzer</name>
<version>@version@</version>
<description>Smart Chinese Analyzer</description>
Modified: lucene/dev/trunk/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/stempel/pom.xml.template?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/trunk/modules/analysis/stempel/pom.xml.template Thu Aug 19 19:58:36 2010
@@ -27,7 +27,7 @@
<version>@version@</version>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-stempel</artifactId>
+ <artifactId>lucene-analyzers-stempel</artifactId>
<name>Lucene Stempel Analyzer</name>
<version>@version@</version>
<description>Stempel Analyzer</description>
Modified: lucene/dev/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/build.xml?rev=987286&r1=987285&r2=987286&view=diff
==============================================================================
--- lucene/dev/trunk/modules/build.xml (original)
+++ lucene/dev/trunk/modules/build.xml Thu Aug 19 19:58:36 2010
@@ -34,6 +34,14 @@
</sequential>
</target>
+ <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Modules">
+ <sequential>
+ <subant target="dist-maven" inheritall="false" failonerror="true">
+ <fileset dir="analysis" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
+
<target name="clean" description="Clean all modules">
<sequential>
<subant target="clean" inheritall="false" failonerror="true">