Skip to content
Snippets Groups Projects
Commit 182350d8 authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-7342: Dependencies needed by the GWT compiler should never be triggered...

XWIKI-7342: Dependencies needed by the GWT compiler should never be triggered as transitive dependencies
* Made smartgwt a "provided" dependency
parent 0ea8176f
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<description>XWiki Platform - Core - Parent POM</description> <description>XWiki Platform - Core - Parent POM</description>
<properties> <properties>
<!-- We use our custom version of GWT because some dependencies are missing from the gwt-user 2.3.0 POM. -->
<gwt.version>2.4.0</gwt.version> <gwt.version>2.4.0</gwt.version>
<gwt.maven.plugin.version>2.4.0</gwt.maven.plugin.version> <gwt.maven.plugin.version>2.4.0</gwt.maven.plugin.version>
<smartgwt.version>3.0</smartgwt.version> <smartgwt.version>3.0</smartgwt.version>
...@@ -107,23 +106,22 @@ ...@@ -107,23 +106,22 @@
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
<version>${gwt.version}</version> <version>${gwt.version}</version>
<!-- Only needed at build time -->
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId> <artifactId>gwt-servlet</artifactId>
<version>${gwt.version}</version> <version>${gwt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwt.version}</version>
</dependency>
<dependency> <dependency>
<!-- SmartGWT is used only for its tree widget. --> <!-- SmartGWT is used only for its tree widget. -->
<!-- If you remove or move this dependency don't forget to update the repository section at the bottom. --> <!-- If you remove or move this dependency don't forget to update the repository section at the bottom. -->
<groupId>com.smartgwt</groupId> <groupId>com.smartgwt</groupId>
<artifactId>smartgwt</artifactId> <artifactId>smartgwt</artifactId>
<version>${smartgwt.version}</version> <version>${smartgwt.version}</version>
<!-- Only needed at build time -->
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -150,8 +148,9 @@ ...@@ -150,8 +148,9 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId> <artifactId>gwt-maven-plugin</artifactId>
<version>${gwt.maven.plugin.version}</version> <version>${gwt.maven.plugin.version}</version>
<!-- We need to declare these dependencies because we use a newer version of GWT. <!-- We declare these dependencies here in case we use different value for ${gwt.version} and
See http://mojo.codehaus.org/gwt-maven-plugin/user-guide/using-different-gwt-sdk-version.html --> ${gwt.maven.plugin.version} variables.
See http://mojo.codehaus.org/gwt-maven-plugin/user-guide/using-different-gwt-sdk-version.html -->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
......
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
<!-- Only needed at build time -->
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -36,12 +36,6 @@ ...@@ -36,12 +36,6 @@
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId> <artifactId>gwt-servlet</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<!-- Overwrite the scope from the parent POM to prevent gwt-user jar from being included in the distribution war. -->
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.xwiki.platform</groupId> <groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-oldcore</artifactId> <artifactId>xwiki-platform-oldcore</artifactId>
......
...@@ -33,9 +33,10 @@ ...@@ -33,9 +33,10 @@
<description>An extension of the GWT DOM API, providing W3C Range and Selection support, depth-first pre-order iterator and lots of DOM utility methods</description> <description>An extension of the GWT DOM API, providing W3C Range and Selection support, depth-first pre-order iterator and lots of DOM utility methods</description>
<dependencies> <dependencies>
<dependency> <dependency>
<!-- This dependency is required for the custom linker. --> <!-- This dependency is required for the custom linker (StandardsModeIFrameLinker.kava). -->
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId> <artifactId>gwt-dev</artifactId>
<version>${gwt.version}</version>
<!-- Only needed at build time --> <!-- Only needed at build time -->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
<!-- Only needed at build time -->
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.xwiki.platform</groupId> <groupId>org.xwiki.platform</groupId>
......
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
<!-- Only needed at build time -->
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.xwiki.platform</groupId> <groupId>org.xwiki.platform</groupId>
......
...@@ -51,6 +51,11 @@ ...@@ -51,6 +51,11 @@
<artifactId>xwiki-platform-wysiwyg-server</artifactId> <artifactId>xwiki-platform-wysiwyg-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<!-- SmartGWT is used only for its tree widget. -->
<groupId>com.smartgwt</groupId>
<artifactId>smartgwt</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment