Sandro Bonazzola has uploaded a new change for review.
Change subject: Revert "build: ovirt-engine-3.5.0"
......................................................................
Revert "build: ovirt-engine-3.5.0"
This reverts commit ebf21d1a1165205c0338694964052ee1b14044fb.
Blockers have been found after 3.5.0 build so a new build is needed with new
patches.
Change-Id: Icbb04a9fbfccadcd9eebd049f1ac77946756d76b
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M backend/manager/dependencies/pom.xml
M backend/manager/modules/aaa/pom.xml
M backend/manager/modules/bll/pom.xml
M backend/manager/modules/branding/pom.xml
M backend/manager/modules/builtin-extensions/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/docs/pom.xml
M backend/manager/modules/extensions-api-root/extensions-api/pom.xml
M backend/manager/modules/extensions-api-root/pom.xml
M backend/manager/modules/extensions-manager/pom.xml
M backend/manager/modules/logger/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/scheduler/pom.xml
M backend/manager/modules/searchbackend/pom.xml
M backend/manager/modules/services/pom.xml
M backend/manager/modules/utils/pom.xml
M backend/manager/modules/uutils/pom.xml
M backend/manager/modules/vdsbroker/pom.xml
M backend/manager/modules/welcome/pom.xml
M backend/manager/pom.xml
M backend/manager/tools/pom.xml
M backend/pom.xml
M build-tools-root/checkstyles/pom.xml
M build-tools-root/jboss-modules-maven-plugin/pom.xml
M build-tools-root/ovirt-checkstyle-extension/pom.xml
M build-tools-root/pom.xml
M ear/pom.xml
M frontend/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 mavenmake/pom.xml
M ovirt-engine.spec.in
M pom.xml
M version.mak
52 files changed, 55 insertions(+), 58 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/33928/1
diff --git a/backend/manager/dependencies/pom.xml
b/backend/manager/dependencies/pom.xml
index bbc2148..e45aa9d 100644
--- a/backend/manager/dependencies/pom.xml
+++ b/backend/manager/dependencies/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>dependencies</artifactId>
diff --git a/backend/manager/modules/aaa/pom.xml
b/backend/manager/modules/aaa/pom.xml
index 9524a01..ec2b0fe 100644
--- a/backend/manager/modules/aaa/pom.xml
+++ b/backend/manager/modules/aaa/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>aaa</artifactId>
diff --git a/backend/manager/modules/bll/pom.xml
b/backend/manager/modules/bll/pom.xml
index 93c0423..563797c 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>bll</artifactId>
diff --git a/backend/manager/modules/branding/pom.xml
b/backend/manager/modules/branding/pom.xml
index 925f435..5ffb9a1 100644
--- a/backend/manager/modules/branding/pom.xml
+++ b/backend/manager/modules/branding/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>branding</artifactId>
<packaging>jar</packaging>
diff --git a/backend/manager/modules/builtin-extensions/pom.xml
b/backend/manager/modules/builtin-extensions/pom.xml
index bc18e62..d5a5947 100644
--- a/backend/manager/modules/builtin-extensions/pom.xml
+++ b/backend/manager/modules/builtin-extensions/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<groupId>org.ovirt.engine.extensions</groupId>
<artifactId>builtin</artifactId>
diff --git a/backend/manager/modules/common/pom.xml
b/backend/manager/modules/common/pom.xml
index 9bd845f..9833aaa 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
diff --git a/backend/manager/modules/compat/pom.xml
b/backend/manager/modules/compat/pom.xml
index 03498f5..87b7359 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>compat</artifactId>
diff --git a/backend/manager/modules/dal/pom.xml
b/backend/manager/modules/dal/pom.xml
index db21f8b..ae81a5d 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>dal</artifactId>
<packaging>jar</packaging>
diff --git a/backend/manager/modules/docs/pom.xml
b/backend/manager/modules/docs/pom.xml
index 1080d61..a1be577 100644
--- a/backend/manager/modules/docs/pom.xml
+++ b/backend/manager/modules/docs/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>docs</artifactId>
diff --git a/backend/manager/modules/extensions-api-root/extensions-api/pom.xml
b/backend/manager/modules/extensions-api-root/extensions-api/pom.xml
index e52f4db..3ff71b1 100644
--- a/backend/manager/modules/extensions-api-root/extensions-api/pom.xml
+++ b/backend/manager/modules/extensions-api-root/extensions-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api-root</artifactId>
- <version>0.0.0</version>
+ <version>0.0.0-SNAPSHOT</version>
</parent>
<artifactId>ovirt-engine-extensions-api</artifactId>
diff --git a/backend/manager/modules/extensions-api-root/pom.xml
b/backend/manager/modules/extensions-api-root/pom.xml
index f24e1f0..67bc2a4 100644
--- a/backend/manager/modules/extensions-api-root/pom.xml
+++ b/backend/manager/modules/extensions-api-root/pom.xml
@@ -4,7 +4,7 @@
<artifactId>ovirt-engine-extensions-api-root</artifactId>
<groupId>org.ovirt.engine.api</groupId>
- <version>0.0.0</version>
+ <version>0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/backend/manager/modules/extensions-manager/pom.xml
b/backend/manager/modules/extensions-manager/pom.xml
index 0d0a3af..4f545d5 100644
--- a/backend/manager/modules/extensions-manager/pom.xml
+++ b/backend/manager/modules/extensions-manager/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>extensions-manager</artifactId>
diff --git a/backend/manager/modules/logger/pom.xml
b/backend/manager/modules/logger/pom.xml
index e35fa87..a92bbcc 100644
--- a/backend/manager/modules/logger/pom.xml
+++ b/backend/manager/modules/logger/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>logger</artifactId>
diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml
index cf5940c..5afbd94 100644
--- a/backend/manager/modules/pom.xml
+++ b/backend/manager/modules/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
- <version>3.5.0</version>
+ <version>3.5.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 49b277e..186f393 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.5.0</version>
+ <version>3.5.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 90c48ef..376b0ca 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.5.0</version>
+ <version>3.5.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 ce0a305..dccdde3 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.5.0</version>
+ <version>3.5.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 a178e64..031e562 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.5.0</version>
+ <version>3.5.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 84c9be5..2e4202b 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.5.0</version>
+ <version>3.5.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 cd9efcb..efb487a 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>restapi-parent</artifactId>
diff --git a/backend/manager/modules/restapi/types/pom.xml
b/backend/manager/modules/restapi/types/pom.xml
index a98b309..65797a6 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.5.0</version>
+ <version>3.5.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 f8e704a..8b37ac3 100644
--- a/backend/manager/modules/restapi/webapp/pom.xml
+++ b/backend/manager/modules/restapi/webapp/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
- <version>3.5.0</version>
+ <version>3.5.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 c75764c..78861d3 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>root-war</artifactId>
diff --git a/backend/manager/modules/scheduler/pom.xml
b/backend/manager/modules/scheduler/pom.xml
index e43a015..85a840d 100644
--- a/backend/manager/modules/scheduler/pom.xml
+++ b/backend/manager/modules/scheduler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>scheduler</artifactId>
diff --git a/backend/manager/modules/searchbackend/pom.xml
b/backend/manager/modules/searchbackend/pom.xml
index 0c6c409..2777353 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>searchbackend</artifactId>
diff --git a/backend/manager/modules/services/pom.xml
b/backend/manager/modules/services/pom.xml
index 543861b..f6decb9 100644
--- a/backend/manager/modules/services/pom.xml
+++ b/backend/manager/modules/services/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>services</artifactId>
diff --git a/backend/manager/modules/utils/pom.xml
b/backend/manager/modules/utils/pom.xml
index b7b230d..adc3cbb 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>utils</artifactId>
diff --git a/backend/manager/modules/uutils/pom.xml
b/backend/manager/modules/uutils/pom.xml
index 5f4721a..4633d73 100644
--- a/backend/manager/modules/uutils/pom.xml
+++ b/backend/manager/modules/uutils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>uutils</artifactId>
diff --git a/backend/manager/modules/vdsbroker/pom.xml
b/backend/manager/modules/vdsbroker/pom.xml
index c718578..e045efa 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>vdsbroker</artifactId>
diff --git a/backend/manager/modules/welcome/pom.xml
b/backend/manager/modules/welcome/pom.xml
index 3a438d5..ab1a8e6 100644
--- a/backend/manager/modules/welcome/pom.xml
+++ b/backend/manager/modules/welcome/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>welcome</artifactId>
diff --git a/backend/manager/pom.xml b/backend/manager/pom.xml
index 0104558..b743555 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>manager</artifactId>
<packaging>pom</packaging>
diff --git a/backend/manager/tools/pom.xml b/backend/manager/tools/pom.xml
index 3c5d97a..ee3b340 100644
--- a/backend/manager/tools/pom.xml
+++ b/backend/manager/tools/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>tools</artifactId>
diff --git a/backend/pom.xml b/backend/pom.xml
index 6f58293..69e52e7 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>root</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>backend</artifactId>
diff --git a/build-tools-root/checkstyles/pom.xml
b/build-tools-root/checkstyles/pom.xml
index bd78ba3..8ae77d2 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>checkstyles</artifactId>
<packaging>jar</packaging>
diff --git a/build-tools-root/jboss-modules-maven-plugin/pom.xml
b/build-tools-root/jboss-modules-maven-plugin/pom.xml
index a582807..36a5bf0 100644
--- a/build-tools-root/jboss-modules-maven-plugin/pom.xml
+++ b/build-tools-root/jboss-modules-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>build-tools-root</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<name>oVirt JBoss Modules Maven Plugin</name>
diff --git a/build-tools-root/ovirt-checkstyle-extension/pom.xml
b/build-tools-root/ovirt-checkstyle-extension/pom.xml
index 453a967..4e14230 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.5.0</version>
+ <version>3.5.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 b8ef60b..1d09dad 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>build-tools-root</artifactId>
<packaging>pom</packaging>
diff --git a/ear/pom.xml b/ear/pom.xml
index 5881ca9..e19be38 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>root</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>engine-server-ear</artifactId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 20221ce..d4b6700 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>root</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>frontend-all</artifactId>
<groupId>org.ovirt.engine.ui</groupId>
diff --git a/frontend/webadmin/modules/frontend/pom.xml
b/frontend/webadmin/modules/frontend/pom.xml
index 4f55ca3..53d5603 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.5.0</version>
+ <version>3.5.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 ac66d39..c8b4fc9 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.5.0</version>
+ <version>3.5.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 0c10809..205d70b 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.5.0</version>
+ <version>3.5.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 526ccca..8c5d70f 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.5.0</version>
+ <version>3.5.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 a5c62c4..a3c0f33 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>uicommonweb</artifactId>
diff --git a/frontend/webadmin/modules/uicompat/pom.xml
b/frontend/webadmin/modules/uicompat/pom.xml
index 2304966..ba1890a 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.5.0</version>
+ <version>3.5.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 57fc9ad..99c869d 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.5.0</version>
+ <version>3.5.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 1775562..706d3ca 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>webadmin</artifactId>
<packaging>war</packaging>
diff --git a/frontend/webadmin/pom.xml b/frontend/webadmin/pom.xml
index d875d11..44e7967 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>webadmin-all</artifactId>
<packaging>pom</packaging>
diff --git a/mavenmake/pom.xml b/mavenmake/pom.xml
index 14d75ab..a929ffa 100644
--- a/mavenmake/pom.xml
+++ b/mavenmake/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>root</artifactId>
- <version>3.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>make</artifactId>
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 8a371bb..2cb5d93 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -173,7 +173,7 @@
Group: %{ovirt_product_group}
License: ASL 2.0
URL: http://www.ovirt.org
-Source0:
http://resources.ovirt.org/pub/ovirt-3.5/src/@PACKAGE_NAME@/@PACKAGE_NAME@-@package_vers...@.tar.gz
+Source0:
http://resources.ovirt.org/pub/ovirt-3.5-snapshot/src/@PACKAGE_NAME@/@PACKAGE_NAME@-@package_vers...@.tar.gz
BuildArch: noarch
@@ -544,7 +544,7 @@
%package setup-plugin-allinone
Summary: All-in-one plugin for %{ovirt_product_name_short}'s setup
Group: %{ovirt_product_group}
-Requires: %{name}-sdk-python >= 3.5.0.7
+Requires: %{name}-sdk-python >= 3.5.0.2
Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release}
Requires: openssh-server
Requires: ovirt-host-deploy >= 1.3.0
@@ -1077,9 +1077,6 @@
%endif
%changelog
-* Fri Oct 3 2014 Sandro Bonazzola <sbona...@redhat.com> - 3.5.0-1
-- Bump version to 3.5.0
-
* Thu Jul 10 2014 Sandro Bonazzola <sbona...@redhat.com> - 3.5.0
- Update dependencies and removed legacy provides / requires
diff --git a/pom.xml b/pom.xml
index 549f303..9694883 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.5.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ovirt-root</name>
<description>oVirt Engine Root Project</description>
@@ -73,7 +73,7 @@
<sshd-core.version>0.11.0</sshd-core.version>
<otopi.version>1.2.0</otopi.version>
<ovirt-host-deploy.version>1.3.0</ovirt-host-deploy.version>
-
<org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0</org.ovirt.engine.api.ovirt-engine-extensions-api.version>
+
<org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version>
<vdsm-jsonrpc-java.version>1.0.8</vdsm-jsonrpc-java.version>
<slf4j.version>1.7.5</slf4j.version>
<slf4j-jdk14.version>1.5.6</slf4j-jdk14.version>
diff --git a/version.mak b/version.mak
index 0c26c58..8853d7b 100644
--- a/version.mak
+++ b/version.mak
@@ -21,7 +21,7 @@
# - master
# - <none>
#
-MILESTONE=
+MILESTONE=master
# RPM release is manually specified,
# For pre-release:
@@ -32,4 +32,4 @@
# RPM_RELEASE=N
# while N is incremented each re-release
#
-RPM_RELEASE=1
+RPM_RELEASE=0.0.$(MILESTONE).$(shell date -u +%Y%m%d%H%M%S)
--
To view, visit http://gerrit.ovirt.org/33928
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbb04a9fbfccadcd9eebd049f1ac77946756d76b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5.0
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
