lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1066084 - in /lucene/dev/nightly: common-maven.sh hudson-lucene-3.x.sh hudson-lucene-solr-maven-trunk.sh hudson-lucene-trunk.sh hudson-settings.sh hudson-solr-3.x.sh hudson-solr-trunk.sh
Date Tue, 01 Feb 2011 16:29:53 GMT
Author: sarowe
Date: Tue Feb  1 16:29:52 2011
New Revision: 1066084

URL: http://svn.apache.org/viewvc?rev=1066084&view=rev
Log:
stop generating maven artifacts in the non-maven nightly builds; stop deleting the entire
maven local repository before every build; consolidate maven-specific common settings into
common-maven.sh; ignore BasicDistributedZkTest only in the trunk maven build, since it doesn't
exist in 3.x

Modified:
    lucene/dev/nightly/common-maven.sh
    lucene/dev/nightly/hudson-lucene-3.x.sh
    lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
    lucene/dev/nightly/hudson-lucene-trunk.sh
    lucene/dev/nightly/hudson-settings.sh
    lucene/dev/nightly/hudson-solr-3.x.sh
    lucene/dev/nightly/hudson-solr-trunk.sh

Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Tue Feb  1 16:29:52 2011
@@ -1,6 +1,7 @@
 ## This script is sourced from the *-maven-*.sh scripts.
 ## The commands in this file should work in any branch/trunk.
 
+MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts
 export M2_HOME=$HOME/tools/maven/latest2.2
 
 mkdir -p $MAVEN_ARTIFACTS/org/apache
@@ -24,10 +25,6 @@ echo ">>> Installing non-mavenized deps 
 $M2_HOME/bin/mvn --batch-mode --non-recursive -Pbootstrap install
 echo ">>> Done installing non-mavenized deps into the maven local repo"
 
-echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under
Maven"
-perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\
-     solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
-
 echo ">>> Running the Maven build"
 $M2_HOME/bin/mvn --batch-mode --fail-at-end clean install
 echo ">>> Done running the Maven build"

Modified: lucene/dev/nightly/hudson-lucene-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-3.x.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-3.x.sh Tue Feb  1 16:29:52 2011
@@ -3,10 +3,8 @@
 
 #Update the Version # when doing a release
 VERSION=3.1-$BUILD_ID
-MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
 
 mkdir -p $ARTIFACTS
-mkdir -p $MAVEN_ARTIFACTS
 mkdir -p $JAVADOCS_ARTIFACTS
 cd $WORKSPACE/$CORE_DIR
 
@@ -34,18 +32,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an
 # release it
 mv -f dist/*.tar.gz $ARTIFACTS
 
-#Generate the Maven snapshot
-set +e
-JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  -Dsvn.exe=$SVN_EXE \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  clean generate-maven-artifacts
-#copy the artifacts to the side so the cron job can publish them
-echo "Moving Maven artifacts to $MAVEN_ARTIFACTS"
-mv -f dist/maven/* $MAVEN_ARTIFACTS
-echo "Done moving Maven Artifacts"
-
 #Rerun testsuite with clover on
 set +e
 JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \

Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb  1 16:29:52 2011
@@ -6,6 +6,10 @@ MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
 
 export JAVA_HOME=$JAVA_HOME_16
 
+echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under
Maven"
+perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\
+     solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+
 . $WORKSPACE/nightly/common-maven.sh
 
 echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS"

Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Tue Feb  1 16:29:52 2011
@@ -3,10 +3,8 @@
 
 #Update the Version # when doing a release
 VERSION=4.0-$BUILD_ID
-MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
 
 mkdir -p $ARTIFACTS
-mkdir -p $MAVEN_ARTIFACTS
 mkdir -p $JAVADOCS_ARTIFACTS
 
 #Package the Source and compile Binaries
@@ -54,28 +52,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an
   -Dtests.linedocsfile=$TEST_LINE_DOCS_FILE \
   test
 
-set +e
-#Generate the Maven snapshot
-cd $WORKSPACE/$CORE_DIR
-JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  -Dsvn.exe=$SVN_EXE \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  clean generate-maven-artifacts
-cd $WORKSPACE/$MODULES_DIR
-JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  -Dsvn.exe=$SVN_EXE \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  clean generate-maven-artifacts
-#copy the artifacts to the side so the cron job can publish them
-echo "Moving Maven artifacts to $MAVEN_ARTIFACTS"
-mv -f $WORKSPACE/$CORE_DIR/dist/maven/* $MAVEN_ARTIFACTS
-cp -r $WORKSPACE/$MODULES_DIR/dist/maven/* $MAVEN_ARTIFACTS
-echo "Done moving Maven Artifacts"
-
-#TODO: add maven stuff here *LOL*
-
 #Rerun testsuite with clover on
 set +e
 cd $WORKSPACE/$CORE_DIR

Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Tue Feb  1 16:29:52 2011
@@ -22,12 +22,8 @@ MODULES_DIR=$ROOT_DIR/modules
 SOLR_DIR=$ROOT_DIR/solr
 
 ARTIFACTS=$WORKSPACE/artifacts
-MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts
 JAVADOCS_ARTIFACTS=$WORKSPACE/javadocs
 
-# cleanup maven
-rm -rf $HOME/.m2/repository
-
 #do some checks that are common to all build scripts:
 set +x
 

Modified: lucene/dev/nightly/hudson-solr-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-3.x.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-3.x.sh (original)
+++ lucene/dev/nightly/hudson-solr-3.x.sh Tue Feb  1 16:29:52 2011
@@ -2,10 +2,8 @@
 . $WORKSPACE/nightly/hudson-settings.sh
 
 VERSION=3.1-$BUILD_ID
-MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
 
 mkdir -p $ARTIFACTS
-mkdir -p $MAVEN_ARTIFACTS
 mkdir -p $JAVADOCS_ARTIFACTS
 
 cd $WORKSPACE/$SOLR_DIR
@@ -30,17 +28,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an
 mv -f dist/*.tgz dist/*.zip dist/*.war $ARTIFACTS
 mv -f build/docs/api/* $JAVADOCS_ARTIFACTS
 
-set +e
-JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  -Dlucene_version=$MAVEN_ARTIFACT_VERSION \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  clean generate-maven-artifacts
-
-# release it
-mv -f dist/maven/* $MAVEN_ARTIFACTS
-set -e
-
 # just clean up lucene build to also instrument with clover:
 cd $WORKSPACE/$CORE_DIR
 $ANT_HOME/bin/ant clean

Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Tue Feb  1 16:29:52 2011
@@ -2,10 +2,8 @@
 . $WORKSPACE/nightly/hudson-settings.sh
 
 VERSION=4.0-$BUILD_ID
-MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
 
 mkdir -p $ARTIFACTS
-mkdir -p $MAVEN_ARTIFACTS
 mkdir -p $JAVADOCS_ARTIFACTS
 
 cd $WORKSPACE/$SOLR_DIR
@@ -26,17 +24,6 @@ $ANT_HOME/bin/ant \
 mv -f dist/*.tgz dist/*.zip dist/*.war $ARTIFACTS
 mv -f build/docs/api/* $JAVADOCS_ARTIFACTS
 
-set +e
-$ANT_HOME/bin/ant \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  -Dlucene_version=$MAVEN_ARTIFACT_VERSION \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  clean generate-maven-artifacts
-
-# release it
-mv -f dist/maven/* $MAVEN_ARTIFACTS
-set -e
-
 # just clean up lucene build to also instrument with clover:
 cd $WORKSPACE/$CORE_DIR
 $ANT_HOME/bin/ant clean



Mime
View raw message