You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/02/08 16:37:06 UTC
svn commit: r1068445 - in /qpid/trunk/qpid: bin/release.sh java/common.xml
java/module.xml
Author: robbie
Date: Tue Feb 8 15:37:06 2011
New Revision: 1068445
URL: http://svn.apache.org/viewvc?rev=1068445&view=rev
Log:
QPID-1916: default to using a local repo in the scratch dir (configurable with maven.local.repo), generate poms into the scratch dir, make the artifacts a SNAPSHOT version by default (configurable with maven.snapshot), and tweak the SNAPSHOT output version naming not to be unique (configurable with maven.unique.version)
Modified:
qpid/trunk/qpid/bin/release.sh
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/module.xml
Modified: qpid/trunk/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/bin/release.sh?rev=1068445&r1=1068444&r2=1068445&view=diff
==============================================================================
--- qpid/trunk/qpid/bin/release.sh (original)
+++ qpid/trunk/qpid/bin/release.sh Tue Feb 8 15:37:06 2011
@@ -208,7 +208,7 @@ fi
if [ "JAVA" == "$JAVA" ] ; then
pushd qpid-${VER}/java
- ant build release release-bin release-mvn -Dsvnversion.output=${REV}
+ ant build release release-bin release-mvn -Dsvnversion.output=${REV} -Dmaven.snapshot=false
popd
cp qpid-${VER}/java/release/*.tar.gz artifacts/qpid-java-${VER}.tar.gz
Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1068445&r1=1068444&r2=1068445&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Tue Feb 8 15:37:06 2011
@@ -70,6 +70,13 @@
</fileset>
</path>
+ <property name="maven.local.repo" value="${build.scratch}/maven-local-repo"/>
+ <property name="maven.unique.version" value="false"/>
+ <property name="maven.snapshot" value="true"/>
+ <condition property="maven.version.suffix" value="" else="-SNAPSHOT">
+ <isfalse value="${maven.snapshot}"/>
+ </condition>
+
<macrodef name="indirect">
<attribute name="name"/>
<attribute name="variable"/>
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1068445&r1=1068444&r2=1068445&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Feb 8 15:37:06 2011
@@ -219,10 +219,10 @@
<args>
<arg line='"${project.root}/genpom"'/>
<arg line='-s "${project.root}/lib/poms"'/>
- <arg line='-o "${build}/qpid-${module.name}.pom"'/>
+ <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
<arg line="-u http://qpid.apache.org"/>
<arg line="-g org.apache.qpid"/>
- <arg line="-v ${project.version}"/>
+ <arg line="-v ${project.version}${maven.version.suffix}"/>
<arg line="-p qpid"/>
<arg line='-m "${module.depends}"'/>
<arg line="-a ${module.name}"/>
@@ -235,12 +235,15 @@
<target name="release-mvn" depends="pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release">
<antcall target="build"/>
- <artifact:pom id="module.pom" file="${build}/qpid-${module.name}.pom"/>
+ <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
- <artifact:install file="${module.jar}" pomRefId="module.pom"/>
+ <artifact:install file="${module.jar}" pomRefId="module.pom">
+ <localRepository path="${maven.local.repo}"/>
+ </artifact:install>
- <artifact:deploy file="${module.jar}" pomRefId="module.pom">
+ <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
<attach file="${module.source.jar}" classifier="sources"/>
+ <localRepository path="${maven.local.repo}"/>
<remoteRepository url="file://${module.release.base}/maven"/>
</artifact:deploy>
</target>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org