OK I committed that. I also committed this, to hopefully fix the broken 3.x Maven build:
Index: hudson-lucene-solr-maven-3.x.sh =================================================================== --- hudson-lucene-solr-maven-3.x.sh (revision 1128882) +++ hudson-lucene-solr-maven-3.x.sh (working copy) @@ -2,7 +2,7 @@ . $WORKSPACE/nightly/hudson-settings.sh #Update the Version # when doing a release -MAVEN_ARTIFACT_VERSION=3.2-SNAPSHOT +MAVEN_ARTIFACT_VERSION=3.3-SNAPSHOT SOLR_JAVA_HOME=$JAVA_HOME_15 Mike http://blog.mikemccandless.com On Sun, May 29, 2011 at 10:55 AM, Michael McCandless <[email protected]> wrote: > OK I think this should do it? I'll commit shortly if nobody objects...: > > Index: hudson-lusolr-tests-trunk.sh > =================================================================== > --- hudson-lusolr-tests-trunk.sh (revision 1128882) > +++ hudson-lusolr-tests-trunk.sh (working copy) > @@ -21,3 +21,29 @@ > -Djunit.formatter=xml \ > -Dargs="$TEST_JVM_ARGS" \ > test > + > +# verify lucene core javadocs have no warnings w/ Java 1.5 > +cd $WORKSPACE/$CORE_DIR > +JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ > + javadocs-all javadocs-test-framework > + > +# verify lucene core javadocs have no warnings w/ Java 1.6 > +cd $WORKSPACE/$CORE_DIR > +JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ > + javadocs-all javadocs-test-framework > + > +# verify modules' javadocs have no warnings w/ Java 1.5 > +cd $WORKSPACE/$MODULES_DIR > +JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ > + javadocs > + > +# verify modules' javadocs have no warnings w/ Java 1.6 > +cd $WORKSPACE/$MODULES_DIR > +JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ > + javadocs > + > +# verify solr javadocs have no warnings > +cd $WORKSPACE/$SOLR_DIR > +JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ > + javadocs > + > Index: hudson-lusolr-tests-3.x.sh > =================================================================== > --- hudson-lusolr-tests-3.x.sh (revision 1128882) > +++ hudson-lusolr-tests-3.x.sh (working copy) > @@ -25,3 +25,19 @@ > -Djunit.formatter=xml \ > -Dargs="$TEST_JVM_ARGS" \ > test > + > +# verify lucene core javadocs have no warnings w/ Java 1.5 > +cd $WORKSPACE/$CORE_DIR > +JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ > + javadocs-all javadocs-test-framework > + > +# verify lucene core javadocs have no warnings w/ Java 1.6 > +cd $WORKSPACE/$CORE_DIR > +JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ > + javadocs-all javadocs-test-framework > + > +# verify solr javadocs have no warnings > +cd $WORKSPACE/$SOLR_DIR > +JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ > + javadocs > + > > Mike > > http://blog.mikemccandless.com > > On Sun, May 29, 2011 at 10:45 AM, Michael McCandless > <[email protected]> wrote: >> I think for Solr it's actually "ant javadocs" (confusingly!). This >> seems to subsume javadoc-all? >> >> Also, I don't think I'm getting javadoc warnings for Solr? (I do get >> lots of compilation warnings). If you introduce a javadoc warning it >> fails the build... >> >> I agree it'd be great if we could gen the non-Solr javadocs with both >> 1.5 and 1.6. In theory this should be easy? "export JAVA_HOME=....; >> ant javadocs"? >> >> I'll try to make a patch for the nightly shell scripts... >> >> Mike >> >> http://blog.mikemccandless.com >> >> On Sun, May 29, 2011 at 10:20 AM, Steven A Rowe <[email protected]> wrote: >>> I checked what it would take to test all of the javadocs on trunk, and >>> found that there is no one target to call. To cover all javadocs: >>> >>> cd lucene ; ant javadocs-all javadocs-test-framework >>> cd ../modules ; ant javadocs >>> cd ../solr ; ant javadoc-all javadoc-test-framework >>> >>> Ideally, the javadocs would be generated once under 1.5 and again under >>> 1.6, for all of branch_3x, and for lucene/ & modules/ on trunk. >>> >>> I got a bunch of javadoc warnings in Solr, so (assuming I don't have setup >>> issues) some work needs to be done to fix the warnings before bombarding >>> everybody with failure messages every 30 minutes. >>> >>> I assume the branch_3x issues are similar, but I haven't looked into it yet. >>> >>> Steve >>> >>>> -----Original Message----- >>>> From: Michael McCandless [mailto:[email protected]] >>>> Sent: Sunday, May 29, 2011 8:48 AM >>>> To: [email protected] Dev >>>> Subject: do the Jenkins while(true) builds now catch javadoc warnings...? >>>> >>>> I know we discussed that this was an easy fix to the shell script... >>>> but did anyone make the change? >>>> >>>> Ie, so that we catch JS warnings in the while(true) build, not just >>>> nightly/POM builds. >>>> >>>> Mike >>>> >>>> http://blog.mikemccandless.com >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>> >>> >> > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
