svn commit: r1420677 - in /lucene/dev/trunk: build.xml lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Wed Dec 12 13:57:33 2012
New Revision: 1420677

URL: http://svn.apache.org/viewvc?rev=1420677&view=rev
Log:
Hopefully fix the nightly Maven build:
- The artifact creation never "installed" the artifacts in the local repository, so the validate task depended on downloading them -> which was wrong.
- The jenkins-maven-nightly target now runs actually 2 builds: One that deploys to apache repo using ANT, installs locally and validates the artifacts with the locally installed versions; after that it runs the maven-based build with "mvn"

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/lucene/common-build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1420677&r1=1420676&r2=1420677&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Wed Dec 12 13:57:33 2012
@@ -368,7 +368,19 @@
   <!-- Jenkins tasks -->
   <target name="jenkins-hourly" depends="clean,test-with-heapdumps,validate,documentation-lint,jar-checksums,check-svn-working-copy"/>
   
-  <target name="jenkins-maven-nightly" depends="clean,remove-maven-artifacts,generate-maven-artifacts,run-maven-build"/>
+  <target name="jenkins-maven-nightly" depends="clean">
+    <!-- step 1: build, install, deploy, and validate ANT-generated maven artifacts: -->
+    <antcall>
+      <target name="remove-maven-artifacts"/>
+      <!-- this implicitely publishes the maven artifacts: -->
+      <target name="validate-maven-dependencies"/>
+    </antcall>
+    <!-- step 2: run the maven build to check that the pom templates also work to drive "mvn": -->
+    <antcall>
+      <target name="remove-maven-artifacts"/>
+      <target name="run-maven-build"/>
+    </antcall>
+  </target>
   
   <target name="jenkins-clover" depends="run-clover"/>
 </project>

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1420677&r1=1420676&r2=1420677&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Wed Dec 12 13:57:33 2012
@@ -475,6 +475,10 @@
       <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
       <parent-poms/>
       <artifact:pom id="maven.project" file="@{pom.xml}"/>
+      <artifact:install file="@{jar.file}">
+        <artifact-attachments/>
+        <pom refid="maven.project"/>
+      </artifact:install>
       <artifact:deploy file="@{jar.file}">
         <artifact-attachments/>
         <remoteRepository id="${m2.repository.id}" url="${m2.repository.url}">