You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/02/01 19:22:36 UTC
svn commit: r1066116 - in /lucene/dev/nightly: common-maven.sh
hudson-lucene-solr-maven-3.x.sh hudson-lucene-solr-maven-trunk.sh
Author: sarowe
Date: Tue Feb 1 18:22:35 2011
New Revision: 1066116
URL: http://svn.apache.org/viewvc?rev=1066116&view=rev
Log:
since top-level 3.x generate-maven-artifacts now populates the same top-level dist/maven/ dir as trunk does, the maven artifact move can now be done in common-maven.sh rather than separately in the trunk and 3.x maven builds
Modified:
lucene/dev/nightly/common-maven.sh
lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh
lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1066116&r1=1066115&r2=1066116&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Tue Feb 1 18:22:35 2011
@@ -27,4 +27,7 @@ echo ">>> Running the Maven build"
$M2_HOME/bin/mvn --batch-mode --fail-at-end clean install
echo ">>> Done running the Maven build"
-mkdir -p $MAVEN_ARTIFACTS/org/apache
+echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS"
+mkdir -p $MAVEN_ARTIFACTS
+mv -f $WORKSPACE/$ROOT_DIR/dist/maven/* $MAVEN_ARTIFACTS/
+echo ">>> Done moving Maven Artifacts"
Modified: lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh?rev=1066116&r1=1066115&r2=1066116&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh Tue Feb 1 18:22:35 2011
@@ -7,10 +7,3 @@ MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
export JAVA_HOME=$JAVA_HOME_15
. $WORKSPACE/nightly/common-maven.sh
-
-echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS"
-mv -f $WORKSPACE/$CORE_DIR/dist/maven/org/apache/lucene \
- $MAVEN_ARTIFACTS/org/apache
-mv -f $WORKSPACE/$SOLR_DIR/dist/maven/org/apache/solr \
- $MAVEN_ARTIFACTS/org/apache
-echo ">>> Done moving Maven Artifacts"
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=1066116&r1=1066115&r2=1066116&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb 1 18:22:35 2011
@@ -10,9 +10,4 @@ echo ">>> Ignoring BasicDistributedZkTes
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"
-mv -f $WORKSPACE/$ROOT_DIR/dist/maven/org/apache/* \
- $MAVEN_ARTIFACTS/org/apache
-echo ">>> Done moving Maven Artifacts"
+. $WORKSPACE/nightly/common-maven.sh
\ No newline at end of file