Change version to 1.2.0

Devstack plugin takes now the current version number for Java components
from pom.xml files.

Change-Id: Icce74fd6d7e674f408277e328468bedbc3d0aa6b
This commit is contained in:
Witold Bedyk 2016-11-22 09:30:10 +01:00
parent cbf8e42732
commit 45427340b3
3 changed files with 23 additions and 6 deletions

View File

@ -857,7 +857,10 @@ function install_monasca_api_java {
(cd "${MONASCA_API_DIR}"/java ; sudo mvn clean package -DskipTests)
sudo cp -f "${MONASCA_API_DIR}"/java/target/monasca-api-1.1.0-SNAPSHOT-shaded.jar /opt/monasca/monasca-api.jar
local version="$(get_version_from_pom "${MONASCA_API_DIR}"/java)"
sudo cp -f "${MONASCA_API_DIR}"/java/target/monasca-api-${version}-shaded.jar \
/opt/monasca/monasca-api.jar
sudo useradd --system -g monasca mon-api || true
@ -1107,7 +1110,10 @@ function install_monasca_persister_java {
git_clone $MONASCA_PERSISTER_REPO $MONASCA_PERSISTER_DIR $MONASCA_PERSISTER_BRANCH
(cd "${MONASCA_PERSISTER_DIR}"/java ; sudo mvn clean package -DskipTests)
sudo cp -f "${MONASCA_PERSISTER_DIR}"/java/target/monasca-persister-1.1.0-SNAPSHOT-shaded.jar /opt/monasca/monasca-persister.jar
local version="$(get_version_from_pom "${MONASCA_PERSISTER_DIR}"/java)"
sudo cp -f "${MONASCA_PERSISTER_DIR}"/java/target/monasca-persister-${version}-shaded.jar \
/opt/monasca/monasca-persister.jar
sudo useradd --system -g monasca mon-persister || true
@ -1514,7 +1520,10 @@ function install_monasca_thresh {
git_clone $MONASCA_THRESH_REPO $MONASCA_THRESH_DIR $MONASCA_THRESH_BRANCH
(cd "${MONASCA_THRESH_DIR}"/thresh ; sudo mvn clean package -DskipTests)
sudo cp -f "${MONASCA_THRESH_DIR}"/thresh/target/monasca-thresh-2.0.0-SNAPSHOT-shaded.jar /opt/monasca/monasca-thresh.jar
local version="$(get_version_from_pom "${MONASCA_THRESH_DIR}"/thresh)"
sudo cp -f "${MONASCA_THRESH_DIR}"/thresh/target/monasca-thresh-${version}-shaded.jar \
/opt/monasca/monasca-thresh.jar
sudo useradd --system -g monasca mon-thresh || true
@ -1958,6 +1967,14 @@ function compare_versions {
return
}
# Prints the version specified in the pom.xml file in the directory given by
# the argument
function get_version_from_pom {
python -c "import xml.etree.ElementTree as ET; \
print(ET.parse(open('$1/pom.xml')).getroot().find( \
'{http://maven.apache.org/POM/4.0.0}version').text)"
}
# Allows this script to be called directly outside of
# the devstack infrastructure code. Uncomment to use.
#if [[ $(type -t is_service_enabled) != 'function' ]]; then

View File

@ -5,7 +5,7 @@
<groupId>monasca-api</groupId>
<artifactId>monasca-api</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<url>http://github.com/openstack/monasca-api</url>
<packaging>jar</packaging>
@ -19,7 +19,7 @@
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss</maven.build.timestamp.format>
<computedVersion>${project.version}-${timestamp}-${gitRevision}</computedVersion>
<computedName>${project.artifactId}-${computedVersion}</computedName>
<mon.common.version>1.1.0-SNAPSHOT</mon.common.version>
<mon.common.version>1.2.0-SNAPSHOT</mon.common.version>
<dropwizard.version>0.7.0</dropwizard.version>
<hikaricp.version>2.3.9</hikaricp.version>

View File

@ -4,7 +4,7 @@
<groupId>monasca</groupId>
<artifactId>monasca-api-base</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<url>http://github.com/openstack/monasca-api</url>
<packaging>pom</packaging>