diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-09-15 15:24:06 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-09-15 15:24:06 +0000 |
| commit | 9251cb4f43a277aa30b0ba0b79444b18f69f84e5 (patch) | |
| tree | a448d2eea8d4f214c9a81111fdeb71fb32d11225 /qpid/java/common/src | |
| parent | acc5dc6df13777cd7cd399094342d5535c46f3eb (diff) | |
| download | qpid-python-9251cb4f43a277aa30b0ba0b79444b18f69f84e5.tar.gz | |
QPID-6101: Allow setting of qpid version suffix whilst building qpid common library
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1625062 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java | 7 | ||||
| -rw-r--r-- | qpid/java/common/src/main/resources/qpidversion.properties | 23 |
2 files changed, 29 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java index 25baf86fe6..cdd44d3443 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java @@ -58,6 +58,9 @@ public class QpidProperties /** Defines the name of the version property. */ public static final String RELEASE_VERSION_PROPERTY = "qpid.version"; + /** Defines the name of the version suffix property. */ + public static final String RELEASE_VERSION_SUFFIX = "qpid.version.suffix"; + /** Defines the name of the source code revision property. */ public static final String BUILD_VERSION_PROPERTY = "qpid.svnversion"; @@ -101,7 +104,9 @@ public class QpidProperties } productName = readPropertyValue(props, PRODUCT_NAME_PROPERTY); - releaseVersion = readPropertyValue(props, RELEASE_VERSION_PROPERTY); + String versionSuffix = (String) props.get(RELEASE_VERSION_SUFFIX); + String version = readPropertyValue(props, RELEASE_VERSION_PROPERTY); + releaseVersion = versionSuffix == null || "".equals(versionSuffix) ? version : version + ";" + versionSuffix; buildVersion = readPropertyValue(props, BUILD_VERSION_PROPERTY); } } diff --git a/qpid/java/common/src/main/resources/qpidversion.properties b/qpid/java/common/src/main/resources/qpidversion.properties new file mode 100644 index 0000000000..1fc575368a --- /dev/null +++ b/qpid/java/common/src/main/resources/qpidversion.properties @@ -0,0 +1,23 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +qpid.name=${qpid.name} +qpid.version=${qpid.version} +qpid.version.suffix=${qpid.version.suffix} +qpid.svnversion=${buildNumber}
\ No newline at end of file |