Skip to content

Commit

Permalink
Use net.ltgt.gwt.maven:gwt-maven-plugin for compiling IDE app (#6822)
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Zatsarynnyi <[email protected]>
  • Loading branch information
azatsarynnyy authored Oct 19, 2017
1 parent aac30d2 commit cf7c2b3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 57 deletions.
40 changes: 11 additions & 29 deletions assembly-multiuser/assembly-ide-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-machine-authentication-ide</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -144,45 +149,22 @@
<outputDirectory>${generated.sources.directory}</outputDirectory>
</configuration>
</plugin>
<!-- GWT Maven Plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>net.ltgt.gwt.maven</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>compile</goal>
<!--<goal>test</goal> -->
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-codeserver</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
</dependencies>
<configuration>
<gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath>
<extraJvmArgs>${gwt.compiler.extraJvmArgs}</extraJvmArgs>
<modules>
<module>org.eclipse.che.ide.IDE</module>
</modules>
<!-- don' remove it we will use it then need to found
bug in compiled JS -->
<!--style>DETAILED</style -->
<logLevel>${gwt.compiler.logLevel}</logLevel>
<moduleName>org.eclipse.che.ide.IDE</moduleName>
<jvmArgs>
<arg>${gwt.compiler.jvmArgs.Xss}</arg>
<arg>${gwt.compiler.jvmArgs.Xmx}</arg>
</jvmArgs>
</configuration>
</plugin>
<plugin>
Expand Down
39 changes: 11 additions & 28 deletions assembly/assembly-ide-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-zend-debugger-ide</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -336,44 +341,22 @@
<outputDirectory>${generated.sources.directory}</outputDirectory>
</configuration>
</plugin>
<!-- GWT Maven Plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>net.ltgt.gwt.maven</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>compile</goal>
<!--<goal>test</goal>-->
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-codeserver</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${com.google.gwt.version}</version>
</dependency>
</dependencies>
<configuration>
<gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath>
<extraJvmArgs>${gwt.compiler.extraJvmArgs}</extraJvmArgs>
<modules>
<module>org.eclipse.che.ide.IDE</module>
</modules>
<!-- don' remove it we will use it then need to found bug in compiled JS -->
<!--style>DETAILED</style-->
<logLevel>${gwt.compiler.logLevel}</logLevel>
<moduleName>org.eclipse.che.ide.IDE</moduleName>
<jvmArgs>
<arg>${gwt.compiler.jvmArgs.Xss}</arg>
<arg>${gwt.compiler.jvmArgs.Xmx}</arg>
</jvmArgs>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit cf7c2b3

Please sign in to comment.