diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-05-09 10:54:58 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-05-09 10:54:58 +0000 |
| commit | 92635c804de4d9d55ddace0c46fee153f52a4eef (patch) | |
| tree | 6dc9e228ee45e71c3b1d8929c424a9a82862e406 | |
| parent | d0778f0048ad5705102220b17b26d32c550f8f9b (diff) | |
| download | qpid-python-92635c804de4d9d55ddace0c46fee153f52a4eef.tar.gz | |
NO-JIRA: add settings file to allow specifying qpid specific settings, allow configuring 'remote' repo location, tidy up some use of literal values
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1100952 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/common.xml | 3 | ||||
| -rw-r--r-- | qpid/java/maven-settings.xml | 2 | ||||
| -rw-r--r-- | qpid/java/module.xml | 12 |
3 files changed, 12 insertions, 5 deletions
diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 30a442c90c..1125a3230c 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -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"> diff --git a/qpid/java/maven-settings.xml b/qpid/java/maven-settings.xml new file mode 100644 index 0000000000..985f39b6f1 --- /dev/null +++ b/qpid/java/maven-settings.xml @@ -0,0 +1,2 @@ +<settings> +</settings> diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 602d5cf17d..8c6a05e035 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -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> |