seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to GWT 2.8 (#3984)

6.19.x
Valeriy Svydenko 2017-02-06 16:42:22 +02:00 committed by GitHub
parent bee9890e4e
commit a99aee67d9
14 changed files with 71 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assembly/assembly-ide-war/pom.xml
View File

@ -23,8 +23,6 @@
<name>Che IDE :: Compiling GWT Application</name>
<properties>
<generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@ -427,6 +425,7 @@
</dependency>
</dependencies>
<configuration>
<gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath>
<extraJvmArgs>${gwt.compiler.extraJvmArgs}</extraJvmArgs>
<modules>
<module>org.eclipse.che.ide.IDE</module>
@ -434,7 +433,6 @@
<!-- don' remove it we will use it then need to found bug in compiled JS -->
<!--style>DETAILED</style-->
<logLevel>${gwt.compiler.logLevel}</logLevel>
<enableClosureCompiler>${gwt.compiler.enableClosureCompiler}</enableClosureCompiler>
</configuration>
</plugin>
<plugin>

7
assembly/assembly-wsagent-war/pom.xml
View File

@ -284,8 +284,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>WEB-INF/lib/*gwt*.jar,
WEB-INF/lib/gin-*.jar</packagingExcludes>
<packagingExcludes>
WEB-INF/lib/*gwt*.jar,
WEB-INF/lib/gin-*.jar,
WEB-INF/lib/jsr305*.jar
</packagingExcludes>
</configuration>
</plugin>
</plugins>

2
assembly/assembly-wsmaster-war/pom.xml
View File

@ -285,7 +285,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>WEB-INF/lib/**gwt**</packagingExcludes>
<packagingExcludes>WEB-INF/lib/**gwt**, WEB-INF/lib/jsr305*.jar</packagingExcludes>
</configuration>
</plugin>
<!-- Source Generator invocation -->

5
core/commons/che-core-commons-test/pom.xml
View File

@ -57,6 +57,11 @@
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>

44
core/commons/che-core-commons-test/src/main/java/org/eclipse/che/commons/test/servlet/MockServletInputStream.java Normal file
View File

@ -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) {
}
}

6
ide/che-core-ide-app/pom.xml
View File

@ -26,12 +26,14 @@
<dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
<findbugs.failonerror>false</findbugs.failonerror>
<generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
</properties>
<dependencies>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>

4
ide/commons-gwt/pom.xml
View File

@ -25,6 +25,10 @@
<generated.test.sources.directory>${project.build.directory}/generated-test-sources/dto</generated.test.sources.directory>
</properties>
<dependencies>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>

6
ide/commons-gwt/src/main/java/com/google/gwt/webworker/linker/DedicatedWorkerLinker.java
View File

@ -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 {

2
plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml
View File

@ -24,8 +24,6 @@
<properties>
<dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
<findbugs.failonerror>false</findbugs.failonerror>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>

4
plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java
View File

@ -728,8 +728,8 @@ public class WorkspaceTest extends BaseTest {
" <version>1.0</version>\n" +
" <name>SpringDemo</name>\n" +
" <properties>\n" +
" <maven.compiler.source>1.6</maven.compiler.source>\n" +
" <maven.compiler.target>1.6</maven.compiler.target>\n" +
" <maven.compiler.source>1.8</maven.compiler.source>\n" +
" <maven.compiler.target>1.8</maven.compiler.target>\n" +
" </properties>\n" +
" <dependencies>\n" +
" <dependency>\n" +

4
plugins/plugin-maven/che-plugin-maven-server/src/test/resources/EffectivePom/pom.xml
View File

@ -83,7 +83,6 @@
<gmaven-plugin.providerSelection>2.0</gmaven-plugin.providerSelection>
<!-- maven-gpg-plugin -->
<gpg.useagent>true</gpg.useagent>
<gwt.compiler.enableClosureCompiler>true</gwt.compiler.enableClosureCompiler>
<gwt.compiler.extraJvmArgs>-Xss512m -Xmx2048m</gwt.compiler.extraJvmArgs>
<gwt.compiler.logLevel>INFO</gwt.compiler.logLevel>
<!-- The system property jacoco.outputDir needs to be override on the command line
@ -114,9 +113,6 @@
<maven.compiler.optimize>true</maven.compiler.optimize>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.source>1.8</maven.compiler.source>
<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
<!-- maven-enforcer-plugin -->
<maven.min.version>3.1.1</maven.min.version>
<maven.private.repo.url>https://maven.codenvycorp.com/content/groups/codenvy-public-group/</maven.private.repo.url>

1
plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/EffectivePom/pom.xml
View File

@ -82,7 +82,6 @@
<gmaven-plugin.providerSelection>2.0</gmaven-plugin.providerSelection>
<!-- maven-gpg-plugin -->
<gpg.useagent>true</gpg.useagent>
<gwt.compiler.enableClosureCompiler>true</gwt.compiler.enableClosureCompiler>
<gwt.compiler.extraJvmArgs>-Xss512m -Xmx2048m</gwt.compiler.extraJvmArgs>
<gwt.compiler.logLevel>INFO</gwt.compiler.logLevel>
<!-- The system property jacoco.outputDir needs to be override on the command line

2
plugins/plugin-ssh-key/che-plugin-ssh-key-ide/pom.xml
View File

@ -24,8 +24,6 @@
<properties>
<dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
<findbugs.failonerror>false</findbugs.failonerror>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>

5
pom.xml
View File

@ -48,6 +48,11 @@
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${version.jsr305.plugin}</version>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>assembly-ide-war</artifactId>