getting 'generate-maven-artifacts' to work with analysis module

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@987286 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -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>

modules/analysis/build.xml

@@ -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" />

modules/analysis/common/pom.xml.template

@@ -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>

modules/analysis/icu/pom.xml.template

@@ -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>

modules/analysis/phonetic/pom.xml.template

@@ -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>

modules/analysis/smartcn/pom.xml.template

@@ -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>

modules/analysis/stempel/pom.xml.template

@@ -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>

modules/build.xml

@@ -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">