diff options
| author | Robert Greig <rgreig@apache.org> | 2006-12-26 21:10:20 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2006-12-26 21:10:20 +0000 |
| commit | 779bdce3e5a2541b28c28892dd19b3bd7cc72ece (patch) | |
| tree | 80153050d440898679ef59d09b3a66a2dc911dd8 /java/pom.xml | |
| parent | 6536407690660e10529c826ab3aa21baaa121ea1 (diff) | |
| download | qpid-python-779bdce3e5a2541b28c28892dd19b3bd7cc72ece.tar.gz | |
QPID-227 Renamed version.properties to qpidversion.properties due to clash with a dependency also using version.properties. Also improved robustness where properties file does not contain expected properties.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@490373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/pom.xml b/java/pom.xml index 7a2790ec5c..dd63bbb100 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -186,11 +186,11 @@ time, during the 'package' phase to capture the version of any resources added to jar files. This svnversion command is always run in the top directory to accurately reflect the svnversion range accross all modules at the time of the build. - The properties are placed into a file 'version.properties' in the target/classes directory of any child module that runs + The properties are placed into a file 'qpidversion.properties' in the target/classes directory of any child module that runs this plugin. - The 'version.properties' file is loaded by the org.apache.qpid.common.QpidProperties class. + The 'qpidversion.properties' file is loaded by the org.apache.qpid.common.QpidProperties class. Be carefull of the possibility that the 'common' module may run this antrun plugin and recieve its own set of - version.properties and then the client or broker being built against an older version of the common library ending up with + qpidversion.properties and then the client or broker being built against an older version of the common library ending up with the wrong version information. This is unlikely to happen because the client or broker should pick up its own properties from the classpath first. If this happens it will be obvious because the productName property will be 'Qpid Common Utilities'. If this is a problem then push this ant task down into the client and broker poms and remove it @@ -208,7 +208,7 @@ </exec> <!-- Write the version.properties out. --> - <propertyfile file="target/classes/version.properties"> + <propertyfile file="target/classes/qpidversion.properties"> <entry key="qpid.svnversion" value="${svnversion}"/> <entry key="qpid.name" value="${project.name}"/> <entry key="qpid.version" value="${project.version}"/> |