Skip to content

Commit

Permalink
Merge pull request eclipse-che#9 in CLD/slx.cloud-che from eature/ST-…
Browse files Browse the repository at this point in the history 
…3613 to master

* commit 'd800fb816af6ed6f2d67702ac55ff5f8a8be3630': (34 commits)
  fixed version
  added new aws run script
  Prevents displaying installers with empty names and descriptions (eclipse-che#8536)
  adapt selenium tests according to changes with workspace config updating (eclipse-che#8561)
  Fix docs link. Dash instead underscore (eclipse-che#8548)
  fix aws
  ST-3613 custom keycloak image
  Dashboard: allow to update workspace config without workpace restarting (eclipse-che#8505)
  eclipse-che#8509 handle keybinding inside FileStructure Window (eclipse-che#8528)
  RELEASE: Set next development version (eclipse-che#8496)
  Add extra steps in the 'prepare()' to increase stability
  Renew URLs of CI servers to compare local selenium testing results (eclipse-che#8541)
  Selenium: Add ability to catch Chrome browser`s console logs (eclipse-che#8502)
  CHE-6923: Provide more space for committer fields in Preferences dialog. (eclipse-che#8480)
  Restore support of single-port Che mode (on docker infra)
  Factories links (eclipse-che#8530)
  CHE-7555 fix resolve factory flow
  Update policy of installers update (eclipse-che#8406)
  Improves debug panel, fixes UI of configure breakpoints popup (eclipse-che#8520)
  Update ProjectExplorerPresenter.java
  ...
  • Loading branch information
@chakraborty-slx
chakraborty-slx committed Feb 2, 2018
2 parents 135a26f + d800fb8 commit 1914efe
Show file tree
Hide file tree
Showing 406 changed files with 3,723 additions and 1,340 deletions.
2 changes: 1 addition & 1 deletion agents/bootstrapper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>bootstrapper</artifactId>
<name>Agents :: Bootstrapper</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/exec/che-exec-agent-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>exec-agent-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-exec-agent-client</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion agents/exec/che-exec-agent-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>exec-agent-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-exec-agent-shared</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion agents/exec/installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>exec-agent-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/exec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion agents/git-credentials/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/go-agents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-csharp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-php/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-python/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-typescript/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-yaml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ls-yaml-agent</artifactId>
<name>Language Server Yaml Agent</name>
Expand Down
4 changes: 2 additions & 2 deletions agents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion agents/ssh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/terminal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/test-ls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>test-ls-agent</artifactId>
<name>Test Language Server Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/unison/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-ide-war/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-main/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-wsagent-server/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-wsagent-war/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-wsmaster-war/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>
Expand Down
7 changes: 7 additions & 0 deletions assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ che.infra.docker.bootstrapper.installer_timeout_sec=180
# Once servers for one installer available - checks stopped.
che.infra.docker.bootstrapper.server_check_period_sec=3

# URL rewriter. May be overriden in case of single-port mode e.t.c
che.infra.docker.url_rewriter=default

# Enable to perform migration of workpace projects at Che startup.
# Projects, which are stored in directories named after their workspace name,
# will be stored by workspace id instead.
Expand Down Expand Up @@ -379,3 +382,7 @@ che.infra.openshift.pvc.access_mode=ReadWriteOnce
# then OpenShift infrastructure will reconfigure installer to use first available from this range
che.infra.openshift.installer_server_min_port=10000
che.infra.openshift.installer_server_max_port=20000

# Single port mode wildcard domain host & port. nip.io is used by default
che.singleport.wildcard_domain.host=NULL
che.singleport.wildcard_domain.port=NULL
4 changes: 2 additions & 2 deletions assembly/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-api-core/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-api-dto-maven-plugin/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-api-dto/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-api-model/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-db-vendor-h2/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: DB :: Vendor H2</name>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-db-vendor-postgresql/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: DB :: Vendor PostgreSQL</name>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-db/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: DB</name>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-dynamodule-maven-plugin/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-dynamodule-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-gwt-maven-plugin/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-gwt-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/che-core-typescript-dto-maven-plugin/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-annotations/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-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-auth/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-auth</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-inject/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-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-j2ee/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/commons/che-core-commons-json/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-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
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-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-logback/pom.xml
View file
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>6.0.0-M5-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-logback</artifactId>
<packaging>jar</packaging>
Expand Down
Loading

0 comments on commit 1914efe

Please sign in to comment.