From a99aee67d9d84cacec8abc8242d0919c4b10fbf2 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Mon, 6 Feb 2017 16:42:22 +0200 Subject: [PATCH] Upgrade to GWT 2.8 (#3984) --- assembly/assembly-ide-war/pom.xml | 4 +- assembly/assembly-wsagent-war/pom.xml | 7 ++- assembly/assembly-wsmaster-war/pom.xml | 2 +- core/commons/che-core-commons-test/pom.xml | 5 +++ .../test/servlet/MockServletInputStream.java | 44 +++++++++++++++++++ ide/che-core-ide-app/pom.xml | 6 ++- ide/commons-gwt/pom.xml | 4 ++ .../linker/DedicatedWorkerLinker.java | 6 --- .../che-plugin-machine-ssh-client/pom.xml | 2 - .../plugin/maven/server/WorkspaceTest.java | 4 +- .../src/test/resources/EffectivePom/pom.xml | 4 -- .../src/test/resources/EffectivePom/pom.xml | 1 - .../che-plugin-ssh-key-ide/pom.xml | 2 - pom.xml | 5 +++ 14 files changed, 71 insertions(+), 25 deletions(-) create mode 100644 core/commons/che-core-commons-test/src/main/java/org/eclipse/che/commons/test/servlet/MockServletInputStream.java diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index bd097af557..23520e5612 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -23,8 +23,6 @@ Che IDE :: Compiling GWT Application ${project.build.directory}/generated-sources/gen - 1.7 - 1.7 UTF-8 @@ -427,6 +425,7 @@ + true ${gwt.compiler.extraJvmArgs} org.eclipse.che.ide.IDE @@ -434,7 +433,6 @@ ${gwt.compiler.logLevel} - ${gwt.compiler.enableClosureCompiler} diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index 39be203ec6..6fd7b02052 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -284,8 +284,11 @@ org.apache.maven.plugins maven-war-plugin - WEB-INF/lib/*gwt*.jar, - WEB-INF/lib/gin-*.jar + + WEB-INF/lib/*gwt*.jar, + WEB-INF/lib/gin-*.jar, + WEB-INF/lib/jsr305*.jar + diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 6bb26c6d8c..74134dd030 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -285,7 +285,7 @@ org.apache.maven.plugins maven-war-plugin - WEB-INF/lib/**gwt** + WEB-INF/lib/**gwt**, WEB-INF/lib/jsr305*.jar diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml index 2373696fb3..bce7cfeb64 100644 --- a/core/commons/che-core-commons-test/pom.xml +++ b/core/commons/che-core-commons-test/pom.xml @@ -57,6 +57,11 @@ javax.inject provided + + javax.servlet + javax.servlet-api + provided + org.eclipse.persistence javax.persistence diff --git a/core/commons/che-core-commons-test/src/main/java/org/eclipse/che/commons/test/servlet/MockServletInputStream.java b/core/commons/che-core-commons-test/src/main/java/org/eclipse/che/commons/test/servlet/MockServletInputStream.java new file mode 100644 index 0000000000..d3561f5850 --- /dev/null +++ b/core/commons/che-core-commons-test/src/main/java/org/eclipse/che/commons/test/servlet/MockServletInputStream.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.commons.test.servlet; + +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import java.io.IOException; +import java.io.InputStream; + +/** Utility class for mocking {@link ServletInputStream} */ +public class MockServletInputStream extends ServletInputStream { + private final InputStream data; + + public MockServletInputStream(InputStream data) { + this.data = data; + } + + @Override + public int read() throws IOException { + return this.data.read(); + } + + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + } +} diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index 062f1d6d9e..1251c6e247 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -26,12 +26,14 @@ ${project.build.directory}/generated-sources/dto/ false ${project.build.directory}/generated-sources/gen - 1.7 - 1.7 UTF-8 ${project.build.directory}/${project.build.finalName} + + com.google.code.findbugs + jsr305 + com.google.guava guava diff --git a/ide/commons-gwt/pom.xml b/ide/commons-gwt/pom.xml index 5afdfcdae9..18b949f7fc 100644 --- a/ide/commons-gwt/pom.xml +++ b/ide/commons-gwt/pom.xml @@ -25,6 +25,10 @@ ${project.build.directory}/generated-test-sources/dto + + com.google.code.findbugs + jsr305 + com.google.guava guava diff --git a/ide/commons-gwt/src/main/java/com/google/gwt/webworker/linker/DedicatedWorkerLinker.java b/ide/commons-gwt/src/main/java/com/google/gwt/webworker/linker/DedicatedWorkerLinker.java index 19d64305a4..a0d8f39f1f 100644 --- a/ide/commons-gwt/src/main/java/com/google/gwt/webworker/linker/DedicatedWorkerLinker.java +++ b/ide/commons-gwt/src/main/java/com/google/gwt/webworker/linker/DedicatedWorkerLinker.java @@ -45,12 +45,6 @@ public class DedicatedWorkerLinker extends SelectionScriptLinker { return ""; } - @Override - protected String getModuleSuffix(TreeLogger logger, LinkerContext context) - throws UnableToCompleteException { - return ""; - } - @Override protected String getSelectionScriptTemplate(TreeLogger logger, LinkerContext context) throws UnableToCompleteException { diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index a4f09b73b1..301e0b0f0c 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -24,8 +24,6 @@ ${project.build.directory}/generated-sources/dto/ false - 1.7 - 1.7 diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java index 9695e0bcc4..6e2c99918d 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java @@ -728,8 +728,8 @@ public class WorkspaceTest extends BaseTest { " 1.0\n" + " SpringDemo\n" + " \n" + - " 1.6\n" + - " 1.6\n" + + " 1.8\n" + + " 1.8\n" + " \n" + " \n" + " \n" + diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/resources/EffectivePom/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/src/test/resources/EffectivePom/pom.xml index 35810a9915..9b59534944 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/resources/EffectivePom/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/resources/EffectivePom/pom.xml @@ -83,7 +83,6 @@ 2.0 true - true -Xss512m -Xmx2048m INFO - 1.8 3.1.1 https://maven.codenvycorp.com/content/groups/codenvy-public-group/ diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/EffectivePom/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/EffectivePom/pom.xml index e182843c24..064a30fce5 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/EffectivePom/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/EffectivePom/pom.xml @@ -82,7 +82,6 @@ 2.0 true - true -Xss512m -Xmx2048m INFO