From cf7c2b388ca3c6c3c7bc6e10ad7034f1c2248a6b Mon Sep 17 00:00:00 2001
From: Artem Zatsarynnyi <azatsary@redhat.com>
Date: Thu, 19 Oct 2017 13:39:58 +0300
Subject: [PATCH] Use net.ltgt.gwt.maven:gwt-maven-plugin for compiling IDE app
 (#6822)

Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
---
 assembly-multiuser/assembly-ide-war/pom.xml | 40 ++++++---------------
 assembly/assembly-ide-war/pom.xml           | 39 ++++++--------------
 2 files changed, 22 insertions(+), 57 deletions(-)

diff --git a/assembly-multiuser/assembly-ide-war/pom.xml b/assembly-multiuser/assembly-ide-war/pom.xml
index 61642b090a1..9fd114af0cf 100644
--- a/assembly-multiuser/assembly-ide-war/pom.xml
+++ b/assembly-multiuser/assembly-ide-war/pom.xml
@@ -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>
@@ -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>
diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml
index 370320997f9..54a6486dd7d 100644
--- a/assembly/assembly-ide-war/pom.xml
+++ b/assembly/assembly-ide-war/pom.xml
@@ -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>
@@ -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>