Juan Hernandez has uploaded a new change for review. Change subject: packaging: Bump version number to 3.3.0-SNAPSHOT ......................................................................
packaging: Bump version number to 3.3.0-SNAPSHOT Increase the version numbers and use -SNAPSHOT suffix in all artifact versions. Change-Id: I67a2a72019c903c9eed7cc8211b82d532d242a44 Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile M backend/manager/dbscripts/pom.xml M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/beans/pom.xml M backend/manager/modules/beans/scheduler/pom.xml M backend/manager/modules/bll/pom.xml M backend/manager/modules/common/pom.xml M backend/manager/modules/compat/pom.xml M backend/manager/modules/dal/pom.xml M backend/manager/modules/engineencryptutils/pom.xml M backend/manager/modules/pom.xml M backend/manager/modules/restapi/interface/common/jaxrs/pom.xml M backend/manager/modules/restapi/interface/common/pom.xml M backend/manager/modules/restapi/interface/definition/pom.xml M backend/manager/modules/restapi/interface/pom.xml M backend/manager/modules/restapi/jaxrs/pom.xml M backend/manager/modules/restapi/pom.xml M backend/manager/modules/restapi/types/pom.xml M backend/manager/modules/restapi/webapp/pom.xml M backend/manager/modules/root/pom.xml M backend/manager/modules/searchbackend/pom.xml M backend/manager/modules/utils/pom.xml M backend/manager/modules/vdsbroker/pom.xml M backend/manager/pom.xml M backend/manager/tools/engine-config/pom.xml M backend/manager/tools/engine-notifier/engine-notifier-resources/pom.xml M backend/manager/tools/engine-notifier/engine-notifier-service/pom.xml M backend/manager/tools/engine-notifier/pom.xml M backend/manager/tools/engine-tools-common/pom.xml M backend/manager/tools/pom.xml M backend/pom.xml M build-tools-root/checkstyles/pom.xml M build-tools-root/ovirt-checkstyle-extension/pom.xml M build-tools-root/pom.xml M ear/pom.xml M frontend/api/genericapi/pom.xml M frontend/api/pom.xml M frontend/pom.xml M frontend/wars/pom.xml M frontend/wars/rmw-war/pom.xml M frontend/webadmin/modules/frontend/pom.xml M frontend/webadmin/modules/gwt-common/pom.xml M frontend/webadmin/modules/gwt-extension/pom.xml M frontend/webadmin/modules/pom.xml M frontend/webadmin/modules/uicommonweb/pom.xml M frontend/webadmin/modules/uicompat/pom.xml M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/webadmin/pom.xml M frontend/webadmin/pom.xml M packaging/engine-setup.8 M packaging/engine-upgrade.8 M packaging/fedora/spec/ovirt-engine.spec.in M pom.xml 53 files changed, 64 insertions(+), 60 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/11143/1 diff --git a/Makefile b/Makefile index cd2aa3b..93504d3 100644 --- a/Makefile +++ b/Makefile @@ -51,12 +51,13 @@ PYTHON_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") # RPM version -APP_VERSION:=$(shell cat pom.xml | grep '<engine.version>' | awk -F\> '{print $$2}' | awk -F\< '{print $$1}') +POM_VERSION:=$(shell cat pom.xml | grep '<engine.version>' | awk -F\> '{print $$2}' | awk -F\< '{print $$1}') +APP_VERSION:=$(subst -SNAPSHOT,,$(POM_VERSION)) RPM_VERSION:=$(shell echo $(APP_VERSION) | sed "s/-/_/") # Release Version; used to create y in <x.x.x-y> numbering. # Should be used to create releases. -RPM_RELEASE_VERSION=1 +RPM_RELEASE_VERSION=0.1 SPEC_FILE_IN=packaging/fedora/spec/ovirt-engine.spec.in SPEC_FILE=$(PACKAGE_NAME).spec @@ -259,10 +260,10 @@ install -dm 755 $(DESTDIR)$(PKG_JAVA_DIR) install -dm 755 $(DESTDIR)$(MAVENPOM_DIR) - X=`find "$(MAVEN_OUTPUT_DIR)" -name engine-server-ear-$(APP_VERSION).ear` && unzip "$$X" -d "$(DESTDIR)$(PKG_EAR_DIR)" + X=`find "$(MAVEN_OUTPUT_DIR)" -name 'engine-server-ear-$(APP_VERSION)*'.ear` && unzip "$$X" -d "$(DESTDIR)$(PKG_EAR_DIR)" for artifact_id in $(ARTIFACTS); do \ - POM=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-$(APP_VERSION).pom"`; \ + POM=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-$(APP_VERSION)*.pom"`; \ if ! [ -f "$${POM}" ]; then \ echo "ERROR: Cannot find artifact $${artifact_id}"; \ exit 1; \ diff --git a/backend/manager/dbscripts/pom.xml b/backend/manager/dbscripts/pom.xml index 8937f0e..de75dfc 100644 --- a/backend/manager/dbscripts/pom.xml +++ b/backend/manager/dbscripts/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>dbscripts</artifactId> <packaging>pom</packaging> diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 438dc3c..b59bd26 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -543,8 +543,8 @@ select fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1'); select fn_db_update_config_value('SupportedVDSMVersions','4.9,4.10','general'); select fn_db_update_config_value('TruststoreUrl','.truststore','general'); -select fn_db_update_config_value('VdcVersion','3.2.0.0','general'); -select fn_db_update_config_value('ProductRPMVersion','3.2.0.0','general'); +select fn_db_update_config_value('VdcVersion','3.3.0.0','general'); +select fn_db_update_config_value('ProductRPMVersion','3.3.0.0','general'); select fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ipmilan:;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','general'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.0'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); diff --git a/backend/manager/modules/beans/pom.xml b/backend/manager/modules/beans/pom.xml index 3697b8d..d354e49 100644 --- a/backend/manager/modules/beans/pom.xml +++ b/backend/manager/modules/beans/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>beans</artifactId> diff --git a/backend/manager/modules/beans/scheduler/pom.xml b/backend/manager/modules/beans/scheduler/pom.xml index 0cb4304..94d4035 100644 --- a/backend/manager/modules/beans/scheduler/pom.xml +++ b/backend/manager/modules/beans/scheduler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>beans</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>scheduler</artifactId> diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index fde4507..cb42fb0 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>bll</artifactId> diff --git a/backend/manager/modules/common/pom.xml b/backend/manager/modules/common/pom.xml index 8167f40..e8d2877 100644 --- a/backend/manager/modules/common/pom.xml +++ b/backend/manager/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>common</artifactId> diff --git a/backend/manager/modules/compat/pom.xml b/backend/manager/modules/compat/pom.xml index cbe0fde..e57ac5e 100644 --- a/backend/manager/modules/compat/pom.xml +++ b/backend/manager/modules/compat/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>compat</artifactId> diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index 69cb04e..9baee43 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>dal</artifactId> <packaging>jar</packaging> diff --git a/backend/manager/modules/engineencryptutils/pom.xml b/backend/manager/modules/engineencryptutils/pom.xml index 20b7821..735d444 100644 --- a/backend/manager/modules/engineencryptutils/pom.xml +++ b/backend/manager/modules/engineencryptutils/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engineencryptutils</artifactId> diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 13bc719..21a1de9 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>manager-modules</artifactId> diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml index c337d2e..dbc4e95 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>common-parent</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>interface-common-jaxrs</artifactId> diff --git a/backend/manager/modules/restapi/interface/common/pom.xml b/backend/manager/modules/restapi/interface/common/pom.xml index 3efb288..d0eb9d5 100644 --- a/backend/manager/modules/restapi/interface/common/pom.xml +++ b/backend/manager/modules/restapi/interface/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>interface</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>common-parent</artifactId> diff --git a/backend/manager/modules/restapi/interface/definition/pom.xml b/backend/manager/modules/restapi/interface/definition/pom.xml index ad928a0..c907c90 100644 --- a/backend/manager/modules/restapi/interface/definition/pom.xml +++ b/backend/manager/modules/restapi/interface/definition/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>interface</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>restapi-definition</artifactId> diff --git a/backend/manager/modules/restapi/interface/pom.xml b/backend/manager/modules/restapi/interface/pom.xml index fd5af49..6ea02aa 100644 --- a/backend/manager/modules/restapi/interface/pom.xml +++ b/backend/manager/modules/restapi/interface/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-parent</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>interface</artifactId> diff --git a/backend/manager/modules/restapi/jaxrs/pom.xml b/backend/manager/modules/restapi/jaxrs/pom.xml index 7abcf40..6bb8d73 100644 --- a/backend/manager/modules/restapi/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/jaxrs/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-parent</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>restapi-jaxrs</artifactId> diff --git a/backend/manager/modules/restapi/pom.xml b/backend/manager/modules/restapi/pom.xml index 07ae826..fe66016 100644 --- a/backend/manager/modules/restapi/pom.xml +++ b/backend/manager/modules/restapi/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>restapi-parent</artifactId> @@ -20,7 +20,7 @@ </modules> <properties> - <engine.api.version>3.2.0</engine.api.version> + <engine.api.version>3.3.0-SNAPSHOT</engine.api.version> <resteasy.version>2.3.2.Final</resteasy.version> <maven-jaxb22-plugin.version>0.8.1</maven-jaxb22-plugin.version> <easymock.version>3.0</easymock.version> diff --git a/backend/manager/modules/restapi/types/pom.xml b/backend/manager/modules/restapi/types/pom.xml index 0d0fa5d..57af8bf 100644 --- a/backend/manager/modules/restapi/types/pom.xml +++ b/backend/manager/modules/restapi/types/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-parent</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>restapi-types</artifactId> diff --git a/backend/manager/modules/restapi/webapp/pom.xml b/backend/manager/modules/restapi/webapp/pom.xml index 8b3700d..40e48c0 100644 --- a/backend/manager/modules/restapi/webapp/pom.xml +++ b/backend/manager/modules/restapi/webapp/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-parent</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>restapi-webapp</artifactId> diff --git a/backend/manager/modules/root/pom.xml b/backend/manager/modules/root/pom.xml index 9bf68c0..50e918f 100644 --- a/backend/manager/modules/root/pom.xml +++ b/backend/manager/modules/root/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>root-war</artifactId> diff --git a/backend/manager/modules/searchbackend/pom.xml b/backend/manager/modules/searchbackend/pom.xml index 47ebddd..65a6b05 100644 --- a/backend/manager/modules/searchbackend/pom.xml +++ b/backend/manager/modules/searchbackend/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>searchbackend</artifactId> diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index 7509de3..78a913b 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>utils</artifactId> diff --git a/backend/manager/modules/vdsbroker/pom.xml b/backend/manager/modules/vdsbroker/pom.xml index 453be11..a880a03 100644 --- a/backend/manager/modules/vdsbroker/pom.xml +++ b/backend/manager/modules/vdsbroker/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>vdsbroker</artifactId> diff --git a/backend/manager/pom.xml b/backend/manager/pom.xml index 621297b..8963ea6 100644 --- a/backend/manager/pom.xml +++ b/backend/manager/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>backend</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>manager</artifactId> <packaging>pom</packaging> diff --git a/backend/manager/tools/engine-config/pom.xml b/backend/manager/tools/engine-config/pom.xml index 23c7e82..dafe361 100644 --- a/backend/manager/tools/engine-config/pom.xml +++ b/backend/manager/tools/engine-config/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-tools</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-config</artifactId> <packaging>jar</packaging> diff --git a/backend/manager/tools/engine-notifier/engine-notifier-resources/pom.xml b/backend/manager/tools/engine-notifier/engine-notifier-resources/pom.xml index e614c3c..f24e101 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-resources/pom.xml +++ b/backend/manager/tools/engine-notifier/engine-notifier-resources/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>engine-notifier</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-notifier-resources</artifactId> diff --git a/backend/manager/tools/engine-notifier/engine-notifier-service/pom.xml b/backend/manager/tools/engine-notifier/engine-notifier-service/pom.xml index 1673008..e1937f7 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-service/pom.xml +++ b/backend/manager/tools/engine-notifier/engine-notifier-service/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>engine-notifier</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-notifier-service</artifactId> diff --git a/backend/manager/tools/engine-notifier/pom.xml b/backend/manager/tools/engine-notifier/pom.xml index 177aa37..1384a0a 100644 --- a/backend/manager/tools/engine-notifier/pom.xml +++ b/backend/manager/tools/engine-notifier/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-tools</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-notifier</artifactId> diff --git a/backend/manager/tools/engine-tools-common/pom.xml b/backend/manager/tools/engine-tools-common/pom.xml index df9a3ad..b798b74 100644 --- a/backend/manager/tools/engine-tools-common/pom.xml +++ b/backend/manager/tools/engine-tools-common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager-tools</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-tools-common</artifactId> <packaging>jar</packaging> diff --git a/backend/manager/tools/pom.xml b/backend/manager/tools/pom.xml index e4fc390..56187f7 100644 --- a/backend/manager/tools/pom.xml +++ b/backend/manager/tools/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> <artifactId>manager</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>manager-tools</artifactId> <packaging>pom</packaging> diff --git a/backend/pom.xml b/backend/pom.xml index a519d55..18b45e6 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>backend</artifactId> @@ -20,7 +20,7 @@ <properties> <engine.groupId>org.ovirt.engine.core</engine.groupId> - <engine.version>3.2.0</engine.version> + <engine.version>3.3.0-SNAPSHOT</engine.version> </properties> </project> diff --git a/build-tools-root/checkstyles/pom.xml b/build-tools-root/checkstyles/pom.xml index b3f2b91..fa3946e 100644 --- a/build-tools-root/checkstyles/pom.xml +++ b/build-tools-root/checkstyles/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>build-tools-root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>checkstyles</artifactId> <packaging>jar</packaging> diff --git a/build-tools-root/ovirt-checkstyle-extension/pom.xml b/build-tools-root/ovirt-checkstyle-extension/pom.xml index 347f395..b70fd89 100644 --- a/build-tools-root/ovirt-checkstyle-extension/pom.xml +++ b/build-tools-root/ovirt-checkstyle-extension/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>build-tools-root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>ovirt-checkstyle-extension</artifactId> <name>oVirt Checkstyle Checks</name> diff --git a/build-tools-root/pom.xml b/build-tools-root/pom.xml index 49c0e70..bf0aea5 100644 --- a/build-tools-root/pom.xml +++ b/build-tools-root/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>build-tools-root</artifactId> <packaging>pom</packaging> diff --git a/ear/pom.xml b/ear/pom.xml index d66753b..9aba8a2 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>engine-server-ear</artifactId> diff --git a/frontend/api/genericapi/pom.xml b/frontend/api/genericapi/pom.xml index a55c906..96ad6ee 100644 --- a/frontend/api/genericapi/pom.xml +++ b/frontend/api/genericapi/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>api</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>genericapi</artifactId> diff --git a/frontend/api/pom.xml b/frontend/api/pom.xml index 2360b55..f1054a5 100644 --- a/frontend/api/pom.xml +++ b/frontend/api/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>frontend-all</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>api</artifactId> diff --git a/frontend/pom.xml b/frontend/pom.xml index 1e84ffd..c797f45 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>frontend-all</artifactId> <groupId>org.ovirt.engine.ui</groupId> @@ -18,7 +18,7 @@ </modules> <properties> <engine.groupId>org.ovirt.engine.ui</engine.groupId> - <engine.version>3.2.0</engine.version> + <engine.version>3.3.0-SNAPSHOT</engine.version> <aspectj.version>1.6.11</aspectj.version> </properties> <build> diff --git a/frontend/wars/pom.xml b/frontend/wars/pom.xml index 24edd2b..1bf4a2b 100644 --- a/frontend/wars/pom.xml +++ b/frontend/wars/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>frontend-all</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>wars</artifactId> diff --git a/frontend/wars/rmw-war/pom.xml b/frontend/wars/rmw-war/pom.xml index c5c8413..6c284de 100644 --- a/frontend/wars/rmw-war/pom.xml +++ b/frontend/wars/rmw-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>wars</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>rmw-war</artifactId> diff --git a/frontend/webadmin/modules/frontend/pom.xml b/frontend/webadmin/modules/frontend/pom.xml index 6bbf739..088cbd6 100644 --- a/frontend/webadmin/modules/frontend/pom.xml +++ b/frontend/webadmin/modules/frontend/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>frontend</artifactId> <packaging>jar</packaging> diff --git a/frontend/webadmin/modules/gwt-common/pom.xml b/frontend/webadmin/modules/gwt-common/pom.xml index ba0a0ac..173c481 100644 --- a/frontend/webadmin/modules/gwt-common/pom.xml +++ b/frontend/webadmin/modules/gwt-common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>gwt-common</artifactId> <packaging>jar</packaging> diff --git a/frontend/webadmin/modules/gwt-extension/pom.xml b/frontend/webadmin/modules/gwt-extension/pom.xml index 0fc31e9..4369542 100644 --- a/frontend/webadmin/modules/gwt-extension/pom.xml +++ b/frontend/webadmin/modules/gwt-extension/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>gwt-extension</artifactId> <packaging>jar</packaging> diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index 796fffc..ae9cac4 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-all</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> diff --git a/frontend/webadmin/modules/uicommonweb/pom.xml b/frontend/webadmin/modules/uicommonweb/pom.xml index 45b01cc..7cecbae 100644 --- a/frontend/webadmin/modules/uicommonweb/pom.xml +++ b/frontend/webadmin/modules/uicommonweb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>uicommonweb</artifactId> diff --git a/frontend/webadmin/modules/uicompat/pom.xml b/frontend/webadmin/modules/uicompat/pom.xml index ff1176e..4a381c0 100644 --- a/frontend/webadmin/modules/uicompat/pom.xml +++ b/frontend/webadmin/modules/uicompat/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>webadmin-modules</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>uicompat</artifactId> <packaging>jar</packaging> diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml b/frontend/webadmin/modules/userportal-gwtp/pom.xml index 96e8229..b44c578 100644 --- a/frontend/webadmin/modules/userportal-gwtp/pom.xml +++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>webadmin-modules</artifactId> <groupId>org.ovirt.engine.ui</groupId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>userportal</artifactId> <packaging>war</packaging> diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml index 0ce5e74..fa16a79 100644 --- a/frontend/webadmin/modules/webadmin/pom.xml +++ b/frontend/webadmin/modules/webadmin/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>webadmin-modules</artifactId> <groupId>org.ovirt.engine.ui</groupId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>webadmin</artifactId> <packaging>war</packaging> diff --git a/frontend/webadmin/pom.xml b/frontend/webadmin/pom.xml index b92e0a8..e86713a 100644 --- a/frontend/webadmin/pom.xml +++ b/frontend/webadmin/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.ui</groupId> <artifactId>frontend-all</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </parent> <artifactId>webadmin-all</artifactId> <packaging>pom</packaging> diff --git a/packaging/engine-setup.8 b/packaging/engine-setup.8 index 1327697..977059a 100644 --- a/packaging/engine-setup.8 +++ b/packaging/engine-setup.8 @@ -1,4 +1,4 @@ -.TH engine\-setup 8 "August 23, 2012" "3.2.0" +.TH engine\-setup 8 "August 23, 2012" "3.3.0" .SH NAME engine\-setup \- Setup and configuration utility for Red Hat Enterprise Virtualization Manager. diff --git a/packaging/engine-upgrade.8 b/packaging/engine-upgrade.8 index 0d743b6..4198d3f 100644 --- a/packaging/engine-upgrade.8 +++ b/packaging/engine-upgrade.8 @@ -1,4 +1,4 @@ -.TH engine\-upgrade 8 "September 4, 2012" "3.2.0" +.TH engine\-upgrade 8 "September 4, 2012" "3.3.0" .SH NAME engine\-upgrade \- Upgrade utility for Red Hat Enterprise Virtualization Manager. diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 990845c..f163ac3 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -842,6 +842,9 @@ %changelog +* Thu Jan 17 2013 Juan Hernandez <[email protected]> - 3.3.0-1 +- Bump version to 3.3.0 + * Fri Nov 02 2012 Juan Hernandez <[email protected]> - 3.2.0-1 - Bump version to 3.2.0 diff --git a/pom.xml b/pom.xml index 0732fb4..16f5a44 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ovirt-root</name> <description>oVirt Engine Root Project</description> @@ -33,7 +33,7 @@ <properties> <!-- Version Info --> - <engine.version>3.2.0</engine.version> + <engine.version>3.3.0-SNAPSHOT</engine.version> <engine.groupId>org.ovirt.engine</engine.groupId> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -- To view, visit http://gerrit.ovirt.org/11143 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67a2a72019c903c9eed7cc8211b82d532d242a44 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
