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/05/09 12:54:58 UTC
svn commit: r1100952 - in /qpid/trunk/qpid/java: common.xml
maven-settings.xml module.xml
Author: robbie
Date: Mon May 9 10:54:58 2011
New Revision: 1100952
URL: http://svn.apache.org/viewvc?rev=1100952&view=rev
Log:
NO-JIRA: add settings file to allow specifying qpid specific settings, allow configuring 'remote' repo location, tidy up some use of literal values
Added:
qpid/trunk/qpid/java/maven-settings.xml
Modified:
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/module.xml
Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1100952&r1=1100951&r2=1100952&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Mon May 9 10:54:58 2011
@@ -24,6 +24,8 @@
<property name="project.name" value="qpid"/>
<property name="project.version" value="0.11"/>
+ <property name="project.url" value="http://qpid.apache.org"/>
+ <property name="project.groupid" value="org.apache.qpid"/>
<property name="project.namever" value="${project.name}-${project.version}"/>
<property name="resources" location="${project.root}/resources"/>
@@ -76,6 +78,7 @@
</path>
<property name="maven.local.repo" value="${build.scratch}/maven-local-repo"/>
+ <property name="maven.settings.xml" value="${project.root}/maven-settings.xml"/>
<property name="maven.unique.version" value="false"/>
<property name="maven.snapshot" value="true"/>
<condition property="maven.version.suffix" value="" else="-SNAPSHOT">
Added: qpid/trunk/qpid/java/maven-settings.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/maven-settings.xml?rev=1100952&view=auto
==============================================================================
--- qpid/trunk/qpid/java/maven-settings.xml (added)
+++ qpid/trunk/qpid/java/maven-settings.xml Mon May 9 10:54:58 2011
@@ -0,0 +1,2 @@
+<settings>
+</settings>
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1100952&r1=1100951&r2=1100952&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Mon May 9 10:54:58 2011
@@ -66,6 +66,8 @@
<property name="module.release.bz2" location="${module.release}/${module.namever}.tar.bz2"/>
<property name="module.genpom.args" value=""/>
+ <property name="maven.remote.repo" value="file://${module.release.base}/maven"/>
+
<property name="broker.log.prefix" value="BROKER: "/>
<property name="broker.log.interleave" value="true"/>
@@ -221,8 +223,8 @@
<arg line='"${project.root}/genpom"'/>
<arg line='-s "${project.root}/lib/poms"'/>
<arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
- <arg line="-u http://qpid.apache.org"/>
- <arg line="-g org.apache.qpid"/>
+ <arg line="-u ${project.url}"/>
+ <arg line="-g ${project.groupid}"/>
<arg line="-v ${project.version}${maven.version.suffix}"/>
<arg line="-p qpid"/>
<arg line='-m "${module.depends}"'/>
@@ -238,14 +240,14 @@
<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" settingsFile="${maven.settings.xml}">
<localRepository path="${maven.local.repo}"/>
</artifact:install>
- <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
+ <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}" settingsFile="${maven.settings.xml}">
<attach file="${module.source.jar}" classifier="sources"/>
<localRepository path="${maven.local.repo}"/>
- <remoteRepository url="file://${module.release.base}/maven"/>
+ <remoteRepository url="${maven.remote.repo}"/>
</artifact:deploy>
</target>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org