Skip to content

Commit

Permalink
Merge branch 'master' into CLDIDE-2693
Browse files Browse the repository at this point in the history
  • Loading branch information
mshaposhnik committed Feb 19, 2016
2 parents 840e8d5 + 3baea92 commit f6c5730
Show file tree
Hide file tree
Showing 138 changed files with 548 additions and 1,132 deletions.
2 changes: 1 addition & 1 deletion assembly/assembly-ide-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-machine-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>assembly-machine-server</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-machine-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>assembly-machine-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-api-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-git-impl-native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-git-impl-native</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-vfs-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-vfs-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-env/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-env</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-gwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-gwt</artifactId>
<name>Che Core :: Commons :: GWT</name>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-inject/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-schedule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-xml</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-app</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-generators/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-generators</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-jseditor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-jseditor</artifactId>
<name>Che Core :: IDE :: JsEditor</name>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-stacks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-stacks</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-templates/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-templates</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/che-core-ide-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-ui</artifactId>
<name>Che Core :: IDE :: UI</name>
Expand Down
2 changes: 1 addition & 1 deletion core/ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-ide-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-account</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-analytics</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-auth</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-core</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-factory</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-git</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-machine</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-project</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-ssh</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-user</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-vfs</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-client-gwt-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-client-gwt-workspace</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/platform-api-client-gwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-client-gwt-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/platform-api/che-core-api-account/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-api-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-account</artifactId>
<name>Che Core :: API :: Account</name>
Expand Down
2 changes: 1 addition & 1 deletion core/platform-api/che-core-api-analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-api-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-analytics</artifactId>
<packaging>jar</packaging>
Expand Down
6 changes: 1 addition & 5 deletions core/platform-api/che-core-api-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-api-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>4.0.0-RC5-SNAPSHOT</version>
<version>4.0.0-RC6-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -59,10 +59,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-core</artifactId>
Expand Down
Loading

0 comments on commit f6c5730

Please sign in to comment.