Asaf Shakarchi has uploaded a new change for review. Change subject: build: GWT dependencies cleanups ......................................................................
build: GWT dependencies cleanups - Defined GWT maven plugin in root POM plugin management section. - Defined GWT dependencies in root POM dependency management section. - Versioned and scopes are inherited from root pom for all sub modules. - uicommonweb module is self dependent on gwt-user dependency. - Removed POM changes that are in comments for long time. Change-Id: Iffb753cd6fb4f669b82a40fd0da5f37d15d18e5f Signed-off-by: Asaf Shakarchi <[email protected]> --- M frontend/api/genericapi/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/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 pom.xml 9 files changed, 29 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/11227/1 diff --git a/frontend/api/genericapi/pom.xml b/frontend/api/genericapi/pom.xml index a55c906..0be2d01 100644 --- a/frontend/api/genericapi/pom.xml +++ b/frontend/api/genericapi/pom.xml @@ -58,7 +58,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> <configuration> <logLevel>INFO</logLevel> <extraJvmArgs>-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M</extraJvmArgs> diff --git a/frontend/webadmin/modules/frontend/pom.xml b/frontend/webadmin/modules/frontend/pom.xml index 6bbf739..8af5369 100644 --- a/frontend/webadmin/modules/frontend/pom.xml +++ b/frontend/webadmin/modules/frontend/pom.xml @@ -25,12 +25,10 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> @@ -58,7 +56,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> <configuration> <servicePattern>**/gwtservices/*GWTService.java</servicePattern> </configuration> diff --git a/frontend/webadmin/modules/gwt-common/pom.xml b/frontend/webadmin/modules/gwt-common/pom.xml index ba0a0ac..059a623 100644 --- a/frontend/webadmin/modules/gwt-common/pom.xml +++ b/frontend/webadmin/modules/gwt-common/pom.xml @@ -9,23 +9,15 @@ <artifactId>gwt-common</artifactId> <packaging>jar</packaging> <name>oVirt GWT UI common infrastructure</name> - <properties> - <!--TODO: Will be inherited from top module --> - <gwt.version>2.3.0</gwt.version> - </properties> <dependencies> <!-- Google Web Toolkit dependencies --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <!-- GWTP MVP component --> <dependency> @@ -89,7 +81,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> <executions> <!-- GWT version should be detected from dependencyManagement --> <execution> diff --git a/frontend/webadmin/modules/gwt-extension/pom.xml b/frontend/webadmin/modules/gwt-extension/pom.xml index 0fc31e9..71ef0f1 100644 --- a/frontend/webadmin/modules/gwt-extension/pom.xml +++ b/frontend/webadmin/modules/gwt-extension/pom.xml @@ -12,21 +12,15 @@ <properties> <sourceDir>${project.basedir}/src/main/java</sourceDir> <gwt-plugin.extraJvmArgs>-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M</gwt-plugin.extraJvmArgs> - <!-- Versions need to be inherited --> - <gwt.version>2.3.0</gwt.version> </properties> <dependencies> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>${engine.groupId}</groupId> diff --git a/frontend/webadmin/modules/uicommonweb/pom.xml b/frontend/webadmin/modules/uicommonweb/pom.xml index 45b01cc..797edd9 100644 --- a/frontend/webadmin/modules/uicommonweb/pom.xml +++ b/frontend/webadmin/modules/uicommonweb/pom.xml @@ -38,6 +38,11 @@ <version>${engine.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + </dependency> </dependencies> <build> diff --git a/frontend/webadmin/modules/uicompat/pom.xml b/frontend/webadmin/modules/uicompat/pom.xml index ff1176e..945f3fe 100644 --- a/frontend/webadmin/modules/uicompat/pom.xml +++ b/frontend/webadmin/modules/uicompat/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> </dependency> </dependencies> <build> @@ -59,7 +58,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> <executions> <execution> <goals> diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml b/frontend/webadmin/modules/userportal-gwtp/pom.xml index 96e8229..a117405 100644 --- a/frontend/webadmin/modules/userportal-gwtp/pom.xml +++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml @@ -11,9 +11,6 @@ <name>UserPortal</name> <description>oVirt Engine User Portal GUI</description> <properties> - <!--TODO: Will be inherited from top module --> - <gwt.version>2.3.0</gwt.version> - <gwt-maven-plugin.version>2.3.0-1</gwt-maven-plugin.version> <!-- Activate load time weaving of the aspects --> <aspectj.agent>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</aspectj.agent> <!-- Regular expression that matches the types that the GWT compiler shouldn't prune --> @@ -31,20 +28,14 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>runtime</scope> </dependency> <!-- GWTP MVP component --> <dependency> @@ -227,7 +218,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt-maven-plugin.version}</version> <dependencies> <dependency> <groupId>com.google.gwt</groupId> diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml index 0ce5e74..24d76da 100644 --- a/frontend/webadmin/modules/webadmin/pom.xml +++ b/frontend/webadmin/modules/webadmin/pom.xml @@ -11,9 +11,6 @@ <name>WebAdmin</name> <description>oVirt Web based Administration GUI</description> <properties> - <!--TODO: Will be inherited from top module --> - <gwt.version>2.3.0</gwt.version> - <gwt-maven-plugin.version>2.3.0-1</gwt-maven-plugin.version> <!-- Activate load time weaving of the aspects --> <aspectj.agent>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</aspectj.agent> <!-- Regular expression that matches the types that the GWT compiler shouldn't prune --> @@ -25,26 +22,19 @@ <gwt.userAgent>ie6,ie8,ie9,gecko1_8,safari,opera</gwt.userAgent> <gwt.locale>default</gwt.locale> </properties> - <!-- TODO: Define SCM --> <dependencies> <!-- Google Web Toolkit dependencies --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>runtime</scope> </dependency> <!-- GWTP MVP component --> <dependency> @@ -195,22 +185,6 @@ </execution> </executions> </plugin> - <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <executions> <execution> <goals> <goal>compile</goal> <goal>test</goal> </goals> - </execution> </executions> <configuration> <runTarget>webadmin/Application.html</runTarget> - <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs> <debugSuspend>false</debugSuspend> - </configuration> </plugin> --> - <!-- ====================================================================== --> - <!-- It's possible to use the target/web.xml file mergewebxml produces, - by --> - <!-- making the war plugin to use it. It's possible to exclude what --> - <!-- neccessary from the final artifact here. --> - <!-- ====================================================================== --> - <!-- <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <webXml>target/web.xml</webXml> <warSourceExcludes>.gwt-tmp/**</warSourceExcludes> - </configuration> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <configuration> <source>${maven.compiler.source}</source> <target>${maven.compiler.target}</target> - </configuration> </plugin> --> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> @@ -227,7 +201,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt-maven-plugin.version}</version> <dependencies> <dependency> <groupId>com.google.gwt</groupId> diff --git a/pom.xml b/pom.xml index f9eaed6..84bc9d7 100644 --- a/pom.xml +++ b/pom.xml @@ -260,6 +260,25 @@ <artifactId>log4j</artifactId> <version>${log4j.version}</version> </dependency> + <!--GWT dependencies--> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + <scope>runtime</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -453,11 +472,6 @@ <artifactId>build-helper-maven-plugin</artifactId> <version>1.4</version> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> - </plugin> <!-- Create a test jar, so other modules can depend on the test utilities --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -471,6 +485,11 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwt.plugin.version}</version> + </plugin> </plugins> </pluginManagement> <plugins> -- To view, visit http://gerrit.ovirt.org/11227 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffb753cd6fb4f669b82a40fd0da5f37d15d18e5f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
