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 2012/03/03 17:44:36 UTC
svn commit: r1296660 - in /lucene/dev/nightly: common-maven.sh
hudson-lucene-trunk.sh
Author: sarowe
Date: Sat Mar 3 16:44:36 2012
New Revision: 1296660
URL: http://svn.apache.org/viewvc?rev=1296660&view=rev
Log:
LUCENE-3825: Deploy Maven snapshot artifacts to Apache snapshot repository instead of to a local repository published by Jenkins.
Modified:
lucene/dev/nightly/common-maven.sh
lucene/dev/nightly/hudson-lucene-trunk.sh
Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1296660&r1=1296659&r2=1296660&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Sat Mar 3 16:44:36 2012
@@ -9,33 +9,18 @@ rm -rf $HOME/.m2/repository/org/apache/l
rm -rf $HOME/.m2/repository/org/apache/solr
echo ">>> Done removing Lucene/Solr artifacts from ~/.m2/repository/"
-for TopLevelDir in lucene modules solr ; do
- # There is no modules/ dir in branch_3x
- if [ -d $WORKSPACE/$ROOT_DIR/$TopLevelDir ] ; then
- cd $WORKSPACE/$ROOT_DIR/$TopLevelDir
- if [ "$JAVA_HOME" = "$JAVA_HOME_15" ]; then
- # For branch_3x, compile with Java 1.5
- echo ">>> Packaging in $TopLevelDir/"
- $ANT_HOME/bin/ant \
- -Dsvnversion.exe=$SVNVERSION_EXE \
- -Dsvn.exe=$SVN_EXE \
- package
- echo ">>> Done packaging in $TopLevelDir/"
- fi
- # After compile/javadoc, always use Java 1.6 for Maven Ant Tasks
- echo ">>> Generating the Maven snapshot artifacts in $TopLevelDir/"
- ANT_OPTS="-Xmx256m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
- JAVA_HOME=$JAVA_HOME_16 \
- $ANT_HOME/bin/ant \
- -Dsvnversion.exe=$SVNVERSION_EXE \
- -Dsvn.exe=$SVN_EXE \
- generate-maven-artifacts
- echo ">>> Done generating the Maven snapshot artifacts in $TopLevelDir/"
- fi
-done
-
cd $WORKSPACE/$ROOT_DIR
+echo ">>> Deploying Maven snapshot artifacts to the Apache snapshots repository"
+ANT_OPTS="-Xmx256m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
+ $ANT_HOME/bin/ant \
+ -Dsvnversion.exe=$SVNVERSION_EXE \
+ -Dsvn.exe=$SVN_EXE \
+ -Dm2.repository.id=apache.snapshots.https
+ -Dm2.repository.url=https://repository.apache.org/content/repositories/snapshots
+ generate-maven-artifacts
+echo ">>> Done deploying Maven snapshot artifacts to the Apache snapshots repository"
+
echo ">>> Installing non-mavenized deps into the maven local repo"
$M2_HOME/bin/mvn --batch-mode --non-recursive -Pbootstrap install
echo ">>> Done installing non-mavenized deps into the maven local repo"
@@ -52,10 +37,3 @@ echo ">>> Running tests under Maven"
# Always use Java 1.6 to run tests - fewer bugs than 1.5
JAVA_HOME=$JAVA_HOME_16 $M2_HOME/bin/mvn --batch-mode --fail-at-end test
echo ">>> Done running tests under Maven"
-
-echo ">>> Copying Maven artifacts to $MAVEN_ARTIFACTS"
-rm -rf $MAVEN_ARTIFACTS
-mkdir -p $MAVEN_ARTIFACTS
-cp -R $WORKSPACE/$ROOT_DIR/solr/package/maven/* \
- $WORKSPACE/$ROOT_DIR/*/dist/maven/* $MAVEN_ARTIFACTS/
-echo ">>> Done copying Maven artifacts"
Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1296660&r1=1296659&r2=1296660&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Sat Mar 3 16:44:36 2012
@@ -68,7 +68,7 @@ $ANT_HOME/bin/ant \
-Drun.clover=true \
-Dtests.threadspercpu=0 \
-Dargs="$TEST_JVM_ARGS" \
- clean test
+ clean test-lucene-and-modules
# preserve the return value
RET=$?
set -e