Juan Hernandez has uploaded a new change for review. Change subject: core: Consolidate engine.version ......................................................................
core: Consolidate engine.version Currently there are two properties that contain the version of the engine, and the value is assigned in multiple places. This patch changes the POM files so that this property is defined only once, in the root POM. Change-Id: I1b58568d9106eea0841653e9882f4b19b8aea4ee Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/restapi/interface/common/jaxrs/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/pom.xml M frontend/pom.xml M frontend/webadmin/modules/uicommonweb/pom.xml M frontend/webadmin/modules/uicompat/pom.xml M pom.xml 9 files changed, 14 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/25334/1 diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml index 46a9bf7..fb800c4 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml @@ -17,12 +17,12 @@ <dependency> <groupId>org.ovirt.engine.core</groupId> <artifactId>utils</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-definition</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> diff --git a/backend/manager/modules/restapi/jaxrs/pom.xml b/backend/manager/modules/restapi/jaxrs/pom.xml index 7cb9ae4..7044908 100644 --- a/backend/manager/modules/restapi/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/jaxrs/pom.xml @@ -15,19 +15,19 @@ <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-definition</artifactId> - <version>${engine.api.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>interface-common-jaxrs</artifactId> - <version>${engine.api.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-types</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> @@ -97,7 +97,7 @@ <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-types</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/backend/manager/modules/restapi/pom.xml b/backend/manager/modules/restapi/pom.xml index c82d05e..9f935a7 100644 --- a/backend/manager/modules/restapi/pom.xml +++ b/backend/manager/modules/restapi/pom.xml @@ -20,7 +20,6 @@ </modules> <properties> - <engine.api.version>3.5.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 a296218..43e79605 100644 --- a/backend/manager/modules/restapi/types/pom.xml +++ b/backend/manager/modules/restapi/types/pom.xml @@ -15,13 +15,13 @@ <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>restapi-definition</artifactId> - <version>${engine.api.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>org.ovirt.engine.api</groupId> <artifactId>interface-common-jaxrs</artifactId> - <version>${engine.api.version}</version> + <version>${engine.version}</version> </dependency> <dependency> diff --git a/backend/pom.xml b/backend/pom.xml index 60e3673..69e52e7 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -20,7 +20,6 @@ <properties> <engine.groupId>org.ovirt.engine.core</engine.groupId> - <engine.version>3.5.0-SNAPSHOT</engine.version> </properties> </project> diff --git a/frontend/pom.xml b/frontend/pom.xml index 2fd062c..d4b6700 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -17,7 +17,6 @@ <properties> <engine.groupId>org.ovirt.engine.ui</engine.groupId> <engine.core.groupId>org.ovirt.engine.core</engine.core.groupId> - <engine.version>3.5.0-SNAPSHOT</engine.version> <aspectj.version>1.6.11</aspectj.version> </properties> <build> diff --git a/frontend/webadmin/modules/uicommonweb/pom.xml b/frontend/webadmin/modules/uicommonweb/pom.xml index 74df65f..b889749 100644 --- a/frontend/webadmin/modules/uicommonweb/pom.xml +++ b/frontend/webadmin/modules/uicommonweb/pom.xml @@ -17,7 +17,7 @@ <dependency> <groupId>${engine.core.groupId}</groupId> <artifactId>searchbackend</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>${engine.groupId}</groupId> diff --git a/frontend/webadmin/modules/uicompat/pom.xml b/frontend/webadmin/modules/uicompat/pom.xml index 08750e7..ba1890a 100644 --- a/frontend/webadmin/modules/uicompat/pom.xml +++ b/frontend/webadmin/modules/uicompat/pom.xml @@ -13,25 +13,25 @@ <dependency> <groupId>${engine.core.groupId}</groupId> <artifactId>common</artifactId> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>${engine.core.groupId}</groupId> <artifactId>common</artifactId> <classifier>sources</classifier> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>${engine.core.groupId}</groupId> <artifactId>compat</artifactId> <classifier>sources</classifier> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>${engine.core.groupId}</groupId> <artifactId>searchbackend</artifactId> <classifier>sources</classifier> - <version>${project.version}</version> + <version>${engine.version}</version> </dependency> <dependency> <groupId>com.google.gwt</groupId> diff --git a/pom.xml b/pom.xml index dc7ee38..e16712b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,7 @@ <properties> <application.baseuri>/ovirt-engine/api</application.baseuri> <!-- Version Info --> - <engine.version>3.5.0-SNAPSHOT</engine.version> - <engine.groupId>org.ovirt.engine</engine.groupId> + <engine.version>${project.version}</engine.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.7</maven.compiler.source> -- To view, visit http://gerrit.ovirt.org/25334 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b58568d9106eea0841653e9882f4b19b8aea4ee 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
