Merge branch 'master' into spi

6.19.x
Artem Zatsarynnyi 2017-09-04 11:51:57 +03:00
commit 04be689c69
269 changed files with 1078 additions and 329 deletions

View File

@ -9,7 +9,7 @@ Please help us by providing all of the details listed below. A complete and thou
**OS and version:**
**Diagnostics:**
<!-- Provide output of 'docker run <DOCKER_OPTIONS> eclise/che info' -->
<!-- Provide output of 'docker run <DOCKER_OPTIONS> eclipse/che info' -->
<!-- If asked, provide a support bundle with 'docker run <DOCKER_OPTIONS> eclise/che info --bundle' -->
<!-- If asked, provide a support bundle with 'docker run <DOCKER_OPTIONS> eclipse/che info --bundle' -->
<!-- If asked, provide CLI debugging info by adding '--trace' to your commands -->

View File

@ -1,5 +1,130 @@
# Change Log
## [5.17.0](https://github.com/eclipse/che/tree/5.17.0) (2017-08-23)
[Full Changelog](https://github.com/eclipse/che/compare/5.16.0...5.17.0)
**Merged pull requests:**
- RELEASE: Update CHANGELOG [\#6074](https://github.com/eclipse/che/pull/6074) ([riuvshin](https://github.com/riuvshin))
- RELEASE: Set next development version [\#6067](https://github.com/eclipse/che/pull/6067) ([riuvshin](https://github.com/riuvshin))
- CODENVY-2356: Allow exception attributes [\#6053](https://github.com/eclipse/che/pull/6053) ([mmorhun](https://github.com/mmorhun))
- Reverting \#6019: Workaround for ImageStreamTags issue on OpenShift 3.6 [\#6023](https://github.com/eclipse/che/pull/6023) ([ibuziuk](https://github.com/ibuziuk))
- \#5750 fix cursor position after completion proposal inserted [\#6020](https://github.com/eclipse/che/pull/6020) ([evidolob](https://github.com/evidolob))
- Workaround for ImageStreamTags issue on OpenShift 3.6 [\#6019](https://github.com/eclipse/che/pull/6019) ([amisevsk](https://github.com/amisevsk))
- Changing deletion order during deployment cleaup \(routes & services are going to be deleted first\) [\#6018](https://github.com/eclipse/che/pull/6018) ([ibuziuk](https://github.com/ibuziuk))
- Fix OpenShiftConnector.inspectImage\(\) to resolve issue in OS 3.6+ [\#6009](https://github.com/eclipse/che/pull/6009) ([amisevsk](https://github.com/amisevsk))
- Revert "CHE-5174 Improving search results " [\#5988](https://github.com/eclipse/che/pull/5988) ([vparfonov](https://github.com/vparfonov))
- Fix license [\#5984](https://github.com/eclipse/che/pull/5984) ([vinokurig](https://github.com/vinokurig))
- Fix typo - https://github.com/eclipse/che/issues/5980 [\#5983](https://github.com/eclipse/che/pull/5983) ([eivantsov](https://github.com/eivantsov))
- Adding assembly-ide-war `webapp` source folder as sources instead of resources to avoid duplicated files in final war [\#5979](https://github.com/eclipse/che/pull/5979) ([sunix](https://github.com/sunix))
- Adding sources maven artifact for dashboard-war [\#5971](https://github.com/eclipse/che/pull/5971) ([sunix](https://github.com/sunix))
- CHE-3415: Change 'Rebase instead of merge' checkbox title [\#5969](https://github.com/eclipse/che/pull/5969) ([vinokurig](https://github.com/vinokurig))
- Adding missing source folders to assembly-ide-war sources Maven artifact [\#5966](https://github.com/eclipse/che/pull/5966) ([sunix](https://github.com/sunix))
- Update Che Dev Dockerfile [\#5959](https://github.com/eclipse/che/pull/5959) ([JamesDrummond](https://github.com/JamesDrummond))
- Move activity components to plugin-activity [\#5896](https://github.com/eclipse/che/pull/5896) ([mkuznyetsov](https://github.com/mkuznyetsov))
- CHE-5174 Improving search results [\#5874](https://github.com/eclipse/che/pull/5874) ([vparfonov](https://github.com/vparfonov))
- Add selenium tests [\#5759](https://github.com/eclipse/che/pull/5759) ([tolusha](https://github.com/tolusha))
- Rework import operation [\#6065](https://github.com/eclipse/che/pull/6065) ([vzhukovskii](https://github.com/vzhukovskii))
- Synchronize commands with rh-che stacks [\#6050](https://github.com/eclipse/che/pull/6050) ([benoitf](https://github.com/benoitf))
- Fixed some formatting differences [\#6044](https://github.com/eclipse/che/pull/6044) ([skabashnyuk](https://github.com/skabashnyuk))
- Cursor jumps to the top of the file [\#6043](https://github.com/eclipse/che/pull/6043) ([dkuleshov](https://github.com/dkuleshov))
- Allow to proper set webscoket context [\#6038](https://github.com/eclipse/che/pull/6038) ([ashumilova](https://github.com/ashumilova))
- Change license headers copyright owner on remaining files [\#6036](https://github.com/eclipse/che/pull/6036) ([mkuznyetsov](https://github.com/mkuznyetsov))
- Remove UI loader in few places not annoying user in case bad network connection [\#6035](https://github.com/eclipse/che/pull/6035) ([vparfonov](https://github.com/vparfonov))
- Change copyright owner to "Red Hat, Inc" on remaining files [\#6032](https://github.com/eclipse/che/pull/6032) ([mkuznyetsov](https://github.com/mkuznyetsov))
- CHE-6025: Fix bug when Project wizard is not closed after importing m… [\#6031](https://github.com/eclipse/che/pull/6031) ([vinokurig](https://github.com/vinokurig))
- Fix TypeScript DTO Generator for newly float type introduced [\#6029](https://github.com/eclipse/che/pull/6029) ([benoitf](https://github.com/benoitf))
- Do not scale down deployment before resource deletion. Removing watch pod logic \(seems to be also broken after 3.6 osio update\) [\#6017](https://github.com/eclipse/che/pull/6017) ([ibuziuk](https://github.com/ibuziuk))
- The project still present after deletion through terminal or project service [\#6013](https://github.com/eclipse/che/pull/6013) ([dkuleshov](https://github.com/dkuleshov))
- CHE-4509: Fix project name validator for rename action [\#6011](https://github.com/eclipse/che/pull/6011) ([bdshadow](https://github.com/bdshadow))
- CHE-5995: Fix bug with Git repository initialization [\#6010](https://github.com/eclipse/che/pull/6010) ([vinokurig](https://github.com/vinokurig))
- \#1799 implement DidChangeWatchedFiles Notification [\#6007](https://github.com/eclipse/che/pull/6007) ([evidolob](https://github.com/evidolob))
- CHE-5944. Fix editor keybindings displaying [\#6005](https://github.com/eclipse/che/pull/6005) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5829. Fix non-exhaustive switch statements [\#6004](https://github.com/eclipse/che/pull/6004) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5828. Remove extra expression [\#6001](https://github.com/eclipse/che/pull/6001) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5881. Add ability to add a project folder to File watcher excludes [\#5998](https://github.com/eclipse/che/pull/5998) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5174 Improving search results [\#5989](https://github.com/eclipse/che/pull/5989) ([vparfonov](https://github.com/vparfonov))
- CHE-5823. Fix editor tabs displaying at refreshing page [\#5975](https://github.com/eclipse/che/pull/5975) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5875: active editor when Go to line feature was accepted [\#5972](https://github.com/eclipse/che/pull/5972) ([svor](https://github.com/svor))
- CHE-5274. Do not skip setting focus on element when window is displayed [\#5968](https://github.com/eclipse/che/pull/5968) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Changed copyright owner to "Red Hat, Inc." in license headers [\#5964](https://github.com/eclipse/che/pull/5964) ([mkuznyetsov](https://github.com/mkuznyetsov))
- CHE-4783 Initial splash should be smarter [\#5961](https://github.com/eclipse/che/pull/5961) ([vitaliy-guliy](https://github.com/vitaliy-guliy))
- CHE-5737: run custom set of tests [\#5956](https://github.com/eclipse/che/pull/5956) ([svor](https://github.com/svor))
- CHE-5890: add Test group menu to the editor context menu [\#5953](https://github.com/eclipse/che/pull/5953) ([svor](https://github.com/svor))
- Rework dashboard to work through JSON RPC protocol [\#5952](https://github.com/eclipse/che/pull/5952) ([ashumilova](https://github.com/ashumilova))
- Migrate to .NET 2.0 [\#5942](https://github.com/eclipse/che/pull/5942) ([eivantsov](https://github.com/eivantsov))
- Used Google Java Codestyle [\#5851](https://github.com/eclipse/che/pull/5851) ([skabashnyuk](https://github.com/skabashnyuk))
- CHE-5792: Add ability to adjust viewing 'maven module artifact id' in preferences window [\#5849](https://github.com/eclipse/che/pull/5849) ([vinokurig](https://github.com/vinokurig))
- CHE-5335: Add Git branch/revision link to project name [\#5817](https://github.com/eclipse/che/pull/5817) ([vinokurig](https://github.com/vinokurig))
- CHE-5339: Mark with color Git changed files in project explorer [\#5722](https://github.com/eclipse/che/pull/5722) ([vinokurig](https://github.com/vinokurig))
## [5.16.0](https://github.com/eclipse/che/tree/5.16.0) (2017-08-09)
[Full Changelog](https://github.com/eclipse/che/compare/5.15.0...5.16.0)
**Merged pull requests:**
- Rework dashboard to work through JSON RPC protocol [\#5952](https://github.com/eclipse/che/pull/5952) ([ashumilova](https://github.com/ashumilova))
- RELEASE: Set next development version [\#5949](https://github.com/eclipse/che/pull/5949) ([riuvshin](https://github.com/riuvshin))
- Adding debug commands for vertx & spring-boot stacks [\#5938](https://github.com/eclipse/che/pull/5938) ([ibuziuk](https://github.com/ibuziuk))
- CHE-3221: Fix git compare on submodules. [\#5799](https://github.com/eclipse/che/pull/5799) ([mmorhun](https://github.com/mmorhun))
- Implement mechanism for providing unique ids for JSON-RPC clients [\#5775](https://github.com/eclipse/che/pull/5775) ([dkuleshov](https://github.com/dkuleshov))
- CHE-249: Setting workspace Pod terminationGracePeriodSeconds to zero [\#5773](https://github.com/eclipse/che/pull/5773) ([ibuziuk](https://github.com/ibuziuk))
- CHE-220: Improving 'removeContainer' API. Refactoring [\#5766](https://github.com/eclipse/che/pull/5766) ([ibuziuk](https://github.com/ibuziuk))
- Fix DtoServer error messages [\#5764](https://github.com/eclipse/che/pull/5764) ([dmytro-ndp](https://github.com/dmytro-ndp))
- Small formatting fix [\#5755](https://github.com/eclipse/che/pull/5755) ([dkuleshov](https://github.com/dkuleshov))
- set actual parent version [\#5749](https://github.com/eclipse/che/pull/5749) ([riuvshin](https://github.com/riuvshin))
- RELEASE: Update CHANGELOG [\#5744](https://github.com/eclipse/che/pull/5744) ([riuvshin](https://github.com/riuvshin))
- CHE-5601: fix the bug with RAM spinner [\#5732](https://github.com/eclipse/che/pull/5732) ([akurinnoy](https://github.com/akurinnoy))
- CHE-5152: Apply pagination in Git Reset window [\#5726](https://github.com/eclipse/che/pull/5726) ([mmorhun](https://github.com/mmorhun))
- Fix LSP didChange parameters \#4978 [\#5002](https://github.com/eclipse/che/pull/5002) ([tsmaeder](https://github.com/tsmaeder))
- Update OpenJDK notification file [\#5939](https://github.com/eclipse/che/pull/5939) ([riuvshin](https://github.com/riuvshin))
- Fix an erroneous change of vertx and spring boot stacks [\#5937](https://github.com/eclipse/che/pull/5937) ([davidfestal](https://github.com/davidfestal))
- CHE-5718 Progress of the importing project is not displayed [\#5934](https://github.com/eclipse/che/pull/5934) ([vitaliy-guliy](https://github.com/vitaliy-guliy))
- CHE-5840. Do not do extra updating of editor content [\#5929](https://github.com/eclipse/che/pull/5929) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Revert Avoid NPE at using MutableProjectConfig [\#5909](https://github.com/eclipse/che/pull/5909) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5334. Fix hover state [\#5899](https://github.com/eclipse/che/pull/5899) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Fixed typo in workspace list [\#5895](https://github.com/eclipse/che/pull/5895) ([hkolvenbach](https://github.com/hkolvenbach))
- CHE-5862: Set right handler on double click in Git Compare window [\#5885](https://github.com/eclipse/che/pull/5885) ([mmorhun](https://github.com/mmorhun))
- Sequential restore of the persistence components [\#5882](https://github.com/eclipse/che/pull/5882) ([vzhukovskii](https://github.com/vzhukovskii))
- Create routes in openshift with the same pattern than the urls provided by naming strategy [\#5879](https://github.com/eclipse/che/pull/5879) ([benoitf](https://github.com/benoitf))
- CHE-5725: fixes for test running [\#5877](https://github.com/eclipse/che/pull/5877) ([svor](https://github.com/svor))
- CHE-5379: fix wrong cursor placement for auto completion [\#5873](https://github.com/eclipse/che/pull/5873) ([svor](https://github.com/svor))
- Avoid NPE at using MutableProjectConfig [\#5869](https://github.com/eclipse/che/pull/5869) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5415. Do not display importer in the list of import dialog if no appropriate wizard was provided [\#5868](https://github.com/eclipse/che/pull/5868) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Fix launchers to call to set\_sudo\_command [\#5866](https://github.com/eclipse/che/pull/5866) ([l0rd](https://github.com/l0rd))
- set correct license header [\#5861](https://github.com/eclipse/che/pull/5861) ([riuvshin](https://github.com/riuvshin))
- CHE-4678: Add all/local/remote filter in Git branches dialog [\#5858](https://github.com/eclipse/che/pull/5858) ([vinokurig](https://github.com/vinokurig))
- Use docker to build dashboard app. \(as alternative\) [\#5848](https://github.com/eclipse/che/pull/5848) ([benoitf](https://github.com/benoitf))
- Ceylon stack [\#5844](https://github.com/eclipse/che/pull/5844) ([davidfestal](https://github.com/davidfestal))
- CHE-5654. Activate java reconciling when classpath is changed [\#5837](https://github.com/eclipse/che/pull/5837) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Avoid using `sudo` in agent launchers when the current user is not a sudoer [\#5835](https://github.com/eclipse/che/pull/5835) ([l0rd](https://github.com/l0rd))
- Replace method implementation [\#5833](https://github.com/eclipse/che/pull/5833) ([vzhukovskii](https://github.com/vzhukovskii))
- Fix for the code validation is not available for language servers [\#5827](https://github.com/eclipse/che/pull/5827) ([dkuleshov](https://github.com/dkuleshov))
- CHE-5645. Fix resources synchronization [\#5825](https://github.com/eclipse/che/pull/5825) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Use try-with-resources statement for reading File Watcher ignore file [\#5811](https://github.com/eclipse/che/pull/5811) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Fix spring-boot stack run command [\#5809](https://github.com/eclipse/che/pull/5809) ([l0rd](https://github.com/l0rd))
- CHE-5236 Java debugger didn't highlight line in decompiled class [\#5808](https://github.com/eclipse/che/pull/5808) ([tolusha](https://github.com/tolusha))
- CHE-5777. Fix editor initialization [\#5807](https://github.com/eclipse/che/pull/5807) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Fix construct command actions after workspace restart [\#5806](https://github.com/eclipse/che/pull/5806) ([vzhukovskii](https://github.com/vzhukovskii))
- CHE-5725: Run all java tests from the project or package [\#5804](https://github.com/eclipse/che/pull/5804) ([svor](https://github.com/svor))
- Add compile to vertx run command [\#5803](https://github.com/eclipse/che/pull/5803) ([l0rd](https://github.com/l0rd))
- CHE-5633: improve experience when adding projects to a workspace [\#5795](https://github.com/eclipse/che/pull/5795) ([akurinnoy](https://github.com/akurinnoy))
- CHE-3415: Add ability to perform Git pull with rebase [\#5787](https://github.com/eclipse/che/pull/5787) ([vinokurig](https://github.com/vinokurig))
- CHE-5692. Fix editor errors clearing [\#5778](https://github.com/eclipse/che/pull/5778) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5130 Unexpected resetting of the scroll to bottom automatically button [\#5769](https://github.com/eclipse/che/pull/5769) ([vitaliy-guliy](https://github.com/vitaliy-guliy))
- CHE-5235: Fix step into when source cannot be obtained [\#5768](https://github.com/eclipse/che/pull/5768) ([mmorhun](https://github.com/mmorhun))
- CHE-5643. Add ability to select items in the quick fix window using keyboard [\#5761](https://github.com/eclipse/che/pull/5761) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Add url encoding [\#5758](https://github.com/eclipse/che/pull/5758) ([vparfonov](https://github.com/vparfonov))
- CHE-5599: add improvements for Filters widget [\#5756](https://github.com/eclipse/che/pull/5756) ([akurinnoy](https://github.com/akurinnoy))
- CHE-5615. Fix NPE at detecting tests by java test runner [\#5748](https://github.com/eclipse/che/pull/5748) ([RomanNikitenko](https://github.com/RomanNikitenko))
- CHE-5617. Set editor as active part when this one has initialized [\#5747](https://github.com/eclipse/che/pull/5747) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Fix run command for Eclipse Vert.x stack [\#5746](https://github.com/eclipse/che/pull/5746) ([l0rd](https://github.com/l0rd))
- Deprecate WsConnectionListener [\#5740](https://github.com/eclipse/che/pull/5740) ([RomanNikitenko](https://github.com/RomanNikitenko))
- RELEASE: Set next development version [\#5734](https://github.com/eclipse/che/pull/5734) ([riuvshin](https://github.com/riuvshin))
- Adapt JUnit4 runner according new API [\#5710](https://github.com/eclipse/che/pull/5710) ([svor](https://github.com/svor))
## [5.15.0](https://github.com/eclipse/che/tree/5.15.0) (2017-07-19)
[Full Changelog](https://github.com/eclipse/che/compare/5.14.0...5.15.0)

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>bootstrapper</artifactId>
<name>Agents :: Bootstrapper</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>

View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: DB :: Vendor H2</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: DB :: Vendor PostgreSQL</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: DB</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-xml</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-parent</artifactId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Core Parent</name>
<modules>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.dashboard</groupId>
<artifactId>che-dashboard-war</artifactId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Che Dashboard :: Web App</name>
<inceptionYear>2015</inceptionYear>

View File

@ -0,0 +1,319 @@
#!/bin/bash
# Copyright (c) 2012-2017 Red Hat, Inc
# 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
#
# This script is meant for quick & easy install of Che on OpenShift via:
#
# ``` bash
# DEPLOY_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/deploy_che.sh
# curl -fsSL ${DEPLOY_SCRIPT_URL} -o get-che.sh
# WAIT_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/wait_until_che_is_available.sh
# curl -fsSL ${WAIT_SCRIPT_URL} -o wait-che.sh
# STACKS_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/replace_stacks.sh
# curl -fsSL ${STACKS_SCRIPT_URL} -o stacks-che.sh
# bash get-che.sh && wait-che.sh && stacks-che.sh
# ```
#
# For more deployment options: https://www.eclipse.org/che/docs/setup/openshift/index.html
set -e
# --------------
# Print Che logo
# --------------
echo
cat <<EOF
                10100000               
            0110011001101101           
       01001001001001011011010110      
   1100110101010001000001011101000001  
0111001001111010111011111000111100010001
1110111011010111000001100000111001110  
101010011001001001    10011101000      
1011000101000              0           
100101011                           0110
10100001                        11011111
111101111011                111011110001
10111001000110101      00000111111011111
0110111111011100000001011001010101111111
1101000001101001000010010111101011011011
    00000001111001000001110111100000   
        000110101101000100011110       
            1101011100001001           
                 000101                

EOF
echo
# --------------------------------------------------------
# Check pre-requisites
# --------------------------------------------------------
command -v oc >/dev/null 2>&1 || { echo >&2 "[CHE] [ERROR] Command line tool oc (https://docs.openshift.org/latest/cli_reference/get_started_cli.html) is required but it's not installed. Aborting."; exit 1; }
# --------------------------------------------------------
# Parse options
# --------------------------------------------------------
while [[ $# -gt 1 ]]
do
key="$1"
case $key in
-c | --command)
COMMAND="$2"
shift
;;
*)
# unknown option
;;
esac
shift
done
# --------------------------------------------------------
# Set configuration common to both minishift and openshift
# --------------------------------------------------------
DEFAULT_COMMAND="deploy"
COMMAND=${COMMAND:-${DEFAULT_COMMAND}}
DEFAULT_CHE_IMAGE_REPO="docker.io/eclipse/che-server"
CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}}
DEFAULT_CHE_IMAGE_TAG="nightly-centos"
CHE_IMAGE_TAG=${CHE_IMAGE_TAG:-${DEFAULT_CHE_IMAGE_TAG}}
DEFAULT_CHE_LOG_LEVEL="INFO"
CHE_LOG_LEVEL=${CHE_LOG_LEVEL:-${DEFAULT_CHE_LOG_LEVEL}}
# Keycloak production endpoints are used by default
DEFAULT_KEYCLOAK_OSO_ENDPOINT="https://sso.openshift.io/auth/realms/fabric8/broker/openshift-v3/token"
KEYCLOAK_OSO_ENDPOINT=${KEYCLOAK_OSO_ENDPOINT:-${DEFAULT_KEYCLOAK_OSO_ENDPOINT}}
DEFAULT_KEYCLOAK_GITHUB_ENDPOINT="https://sso.openshift.io/auth/realms/fabric8/broker/github/token"
KEYCLOAK_GITHUB_ENDPOINT=${KEYCLOAK_GITHUB_ENDPOINT:-${DEFAULT_KEYCLOAK_GITHUB_ENDPOINT}}
# OPENSHIFT_FLAVOR can be minishift or openshift
# TODO Set flavour via a parameter
DEFAULT_OPENSHIFT_FLAVOR=minishift
OPENSHIFT_FLAVOR=${OPENSHIFT_FLAVOR:-${DEFAULT_OPENSHIFT_FLAVOR}}
if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
# ---------------------------
# Set minishift configuration
# ---------------------------
echo -n "[CHE] Checking if minishift is running..."
minishift status | grep -q "Running" ||(echo "Minishift is not running. Aborting"; exit 1)
echo "done!"
DEFAULT_OPENSHIFT_ENDPOINT="https://$(minishift ip):8443/"
OPENSHIFT_ENDPOINT=${OPENSHIFT_ENDPOINT:-${DEFAULT_OPENSHIFT_ENDPOINT}}
DEFAULT_OPENSHIFT_USERNAME="developer"
OPENSHIFT_USERNAME=${OPENSHIFT_USERNAME:-${DEFAULT_OPENSHIFT_USERNAME}}
DEFAULT_OPENSHIFT_PASSWORD="developer"
OPENSHIFT_PASSWORD=${OPENSHIFT_PASSWORD:-${DEFAULT_OPENSHIFT_PASSWORD}}
DEFAULT_CHE_OPENSHIFT_PROJECT="eclipse-che"
CHE_OPENSHIFT_PROJECT=${CHE_OPENSHIFT_PROJECT:-${DEFAULT_CHE_OPENSHIFT_PROJECT}}
DEFAULT_OPENSHIFT_NAMESPACE_URL="${CHE_OPENSHIFT_PROJECT}.$(minishift ip).nip.io"
OPENSHIFT_NAMESPACE_URL=${OPENSHIFT_NAMESPACE_URL:-${DEFAULT_OPENSHIFT_NAMESPACE_URL}}
DEFAULT_CHE_KEYCLOAK_DISABLED="true"
CHE_KEYCLOAK_DISABLED=${CHE_KEYCLOAK_DISABLED:-${DEFAULT_CHE_KEYCLOAK_DISABLED}}
DEFAULT_CHE_DEBUGGING_ENABLED="true"
CHE_DEBUGGING_ENABLED=${CHE_DEBUGGING_ENABLED:-${DEFAULT_CHE_DEBUGGING_ENABLED}}
elif [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then
# ----------------------
# Set osio configuration
# ----------------------
if [ -z "${OPENSHIFT_TOKEN+x}" ]; then echo "[CHE] **ERROR** Env var OPENSHIFT_TOKEN is unset. You need to set it with your OSO token to continue. To retrieve your token: https://console.starter-us-east-2.openshift.com/console/command-line. Aborting"; exit 1; fi
DEFAULT_OPENSHIFT_ENDPOINT="https://api.starter-us-east-2.openshift.com"
OPENSHIFT_ENDPOINT=${OPENSHIFT_ENDPOINT:-${DEFAULT_OPENSHIFT_ENDPOINT}}
DEFAULT_CHE_OPENSHIFT_PROJECT="$(oc get projects -o=custom-columns=NAME:.metadata.name --no-headers | grep "\-che$")"
CHE_OPENSHIFT_PROJECT=${CHE_OPENSHIFT_PROJECT:-${DEFAULT_CHE_OPENSHIFT_PROJECT}}
DEFAULT_OPENSHIFT_NAMESPACE_URL="${CHE_OPENSHIFT_PROJECT}.8a09.starter-us-east-2.openshiftapps.com"
OPENSHIFT_NAMESPACE_URL=${OPENSHIFT_NAMESPACE_URL:-${DEFAULT_OPENSHIFT_NAMESPACE_URL}}
DEFAULT_CHE_KEYCLOAK_DISABLED="false"
CHE_KEYCLOAK_DISABLED=${CHE_KEYCLOAK_DISABLED:-${DEFAULT_CHE_KEYCLOAK_DISABLED}}
DEFAULT_CHE_DEBUGGING_ENABLED="false"
CHE_DEBUGGING_ENABLED=${CHE_DEBUGGING_ENABLED:-${DEFAULT_CHE_DEBUGGING_ENABLED}}
elif [ "${OPENSHIFT_FLAVOR}" == "ocp" ]; then
# ----------------------
# Set ocp configuration
# ----------------------
DEFAULT_CHE_OPENSHIFT_PROJECT="eclipse-che"
CHE_OPENSHIFT_PROJECT=${CHE_OPENSHIFT_PROJECT:-${DEFAULT_CHE_OPENSHIFT_PROJECT}}
DEFAULT_CHE_KEYCLOAK_DISABLED="true"
CHE_KEYCLOAK_DISABLED=${CHE_KEYCLOAK_DISABLED:-${DEFAULT_CHE_KEYCLOAK_DISABLED}}
DEFAULT_CHE_DEBUGGING_ENABLED="false"
CHE_DEBUGGING_ENABLED=${CHE_DEBUGGING_ENABLED:-${DEFAULT_CHE_DEBUGGING_ENABLED}}
fi
# ---------------------------------------
# Verify that we have all env var are set
# ---------------------------------------
if ([ -z "${OPENSHIFT_USERNAME+x}" ] ||
[ -z "${OPENSHIFT_PASSWORD+x}" ]) &&
[ -z "${OPENSHIFT_TOKEN+x}" ]; then echo "[CHE] **ERROR** Env var OPENSHIFT_USERNAME, OPENSHIFT_PASSWORD and OPENSHIFT_TOKEN are unset. You need to set username/password or token to continue. Aborting"; exit 1; fi
if [ -z "${OPENSHIFT_ENDPOINT+x}" ]; then echo "[CHE] **ERROR**Env var OPENSHIFT_ENDPOINT is unset. You need to set it to continue. Aborting"; exit 1; fi
if [ -z "${OPENSHIFT_NAMESPACE_URL+x}" ]; then echo "[CHE] **ERROR**Env var OPENSHIFT_NAMESPACE_URL is unset. You need to set it to continue. Aborting"; exit 1; fi
# -----------------------------------
# Logging on to the OpenShift cluster
# -----------------------------------
echo -n "[CHE] Logging on using OpenShift endpoint \"${OPENSHIFT_ENDPOINT}\"..."
if [ -z "${OPENSHIFT_TOKEN+x}" ]; then
oc login "${OPENSHIFT_ENDPOINT}" --insecure-skip-tls-verify=false -u "${OPENSHIFT_USERNAME}" -p "${OPENSHIFT_PASSWORD}" > /dev/null
OPENSHIFT_TOKEN=$(oc whoami -t)
else
oc login "${OPENSHIFT_ENDPOINT}" --insecure-skip-tls-verify=false --token="${OPENSHIFT_TOKEN}" > /dev/null
fi
echo "done!"
# --------------------------
# Create project (if needed)
# --------------------------
echo -n "[CHE] Checking if project \"${CHE_OPENSHIFT_PROJECT}\" exists..."
if ! oc get project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null; then
if [ "${COMMAND}" == "cleanup" ] || [ "${COMMAND}" == "rollupdate" ]; then echo "**ERROR** project doesn't exist. Aborting"; exit 1; fi
if [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then echo "**ERROR** project doesn't exist on OSIO. Aborting"; exit 1; fi
echo -n "no creating it..."
oc new-project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null
## TODO we should consider oc apply the latest http://central.maven.org/maven2/io/fabric8/online/packages/fabric8-online-che-quotas-oso/
fi
echo "done!"
echo -n "[CHE] Switching to \"${CHE_OPENSHIFT_PROJECT}\"..."
oc project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null
echo "done!"
# -------------------------------------------------------------
# If command == clean up then delete all openshift objects
# -------------------------------------------------------------
if [ "${COMMAND}" == "cleanup" ]; then
echo "[CHE] Deleting all OpenShift objects..."
oc delete all --all
echo "[CHE] Cleanup successfully started. Use \"oc get all\" to verify that all resources have been deleted."
exit 0
# -------------------------------------------------------------
# If command == clean up then delete all openshift objects
# -------------------------------------------------------------
elif [ "${COMMAND}" == "rollupdate" ]; then
echo "[CHE] Rollout latest version of Che..."
oc rollout latest che
echo "[CHE] Rollaout successfully started"
exit 0
# ----------------------------------------------------------------
# At this point command should be "deploy" otherwise it's an error
# ----------------------------------------------------------------
elif [ "${COMMAND}" != "deploy" ]; then
echo "[CHE] **ERROR**: Command \"${COMMAND}\" is not a valid command. Aborting."
exit 1
fi
# -------------------------------------------------------------
# Verify that Che ServiceAccount has admin rights at project level
# -------------------------------------------------------------
## TODO we should create Che SA if it doesn't exist
## TODO we should check if che has admin rights before creating the role biding
## TODO if we are not in minishift we should fail if che SA doesn't have admin rights
if [[ "${OPENSHIFT_FLAVOR}" =~ ^(minishift|ocp)$ ]]; then
echo -n "[CHE] Setting admin role to \"che\" service account..."
echo "apiVersion: v1
kind: RoleBinding
metadata:
name: che
roleRef:
name: admin
subjects:
- kind: ServiceAccount
name: che" | oc apply -f -
fi
# ----------------------------------------------
# Get latest version of fabric8-online templates
# ----------------------------------------------
# TODO make it possible to use a local Che template instead of always downloading it from maven central
echo -n "[CHE] Retrieving latest version of fabric8 online Che template..."
OSIO_VERSION=$(curl -sSL http://central.maven.org/maven2/io/fabric8/online/apps/che/maven-metadata.xml | grep latest | sed -e 's,.*<latest>\([^<]*\)</latest>.*,\1,g')
echo "done! (v.${OSIO_VERSION})"
# ----------------------------------------------
# Start the deployment
# ----------------------------------------------
CHE_IMAGE="${CHE_IMAGE_REPO}:${CHE_IMAGE_TAG}"
# Escape slashes in CHE_IMAGE to use it with sed later
# e.g. docker.io/rhchestage => docker.io\/rhchestage
CHE_IMAGE_SANITIZED=$(echo "${CHE_IMAGE}" | sed 's/\//\\\//g')
echo
if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
echo "[CHE] Deploying Che on minishift (image ${CHE_IMAGE})"
curl -sSL http://central.maven.org/maven2/io/fabric8/online/apps/che/"${OSIO_VERSION}"/che-"${OSIO_VERSION}"-openshift.yml | \
if [ ! -z "${OPENSHIFT_NAMESPACE_URL+x}" ]; then sed "s/ hostname-http:.*/ hostname-http: ${OPENSHIFT_NAMESPACE_URL}/" ; else cat -; fi | \
sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \
sed "s/ workspaces-memory-limit: 2300Mi/ workspaces-memory-limit: 1300Mi/" | \
sed "s/ workspaces-memory-request: 1500Mi/ workspaces-memory-request: 500Mi/" | \
sed "s/ che-openshift-secure-routes: \"true\"/ che-openshift-secure-routes: \"false\"/" | \
sed "s/ che-secure-external-urls: \"true\"/ che-secure-external-urls: \"false\"/" | \
sed "s/ che.docker.server_evaluation_strategy.custom.external.protocol: https/ che.docker.server_evaluation_strategy.custom.external.protocol: http/" | \
sed "s/ che-openshift-precreate-subpaths: \"false\"/ che-openshift-precreate-subpaths: \"true\"/" | \
sed "s/ che.predefined.stacks.reload_on_start: \"true\"/ che.predefined.stacks.reload_on_start: \"false\"/" | \
sed "s| keycloak-oso-endpoint:.*| keycloak-oso-endpoint: ${KEYCLOAK_OSO_ENDPOINT}|" | \
sed "s| keycloak-github-endpoint:.*| keycloak-github-endpoint: ${KEYCLOAK_GITHUB_ENDPOINT}|" | \
grep -v -e "tls:" -e "insecureEdgeTerminationPolicy: Redirect" -e "termination: edge" | \
if [ "${CHE_KEYCLOAK_DISABLED}" == "true" ]; then sed "s/ keycloak-disabled: \"false\"/ keycloak-disabled: \"true\"/" ; else cat -; fi | \
oc apply --force=true -f -
elif [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then
echo "[CHE] Deploying Che on OSIO (image ${CHE_IMAGE})"
curl -sSL http://central.maven.org/maven2/io/fabric8/online/apps/che/"${OSIO_VERSION}"/che-"${OSIO_VERSION}"-openshift.yml | \
if [ ! -z "${OPENSHIFT_NAMESPACE_URL+x}" ]; then sed "s/ hostname-http:.*/ hostname-http: ${OPENSHIFT_NAMESPACE_URL}/" ; else cat -; fi | \
sed "s| keycloak-oso-endpoint:.*| keycloak-oso-endpoint: ${KEYCLOAK_OSO_ENDPOINT}|" | \
sed "s| keycloak-github-endpoint:.*| keycloak-github-endpoint: ${KEYCLOAK_GITHUB_ENDPOINT}|" | \
sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \
if [ "${CHE_KEYCLOAK_DISABLED}" == "true" ]; then sed "s/ keycloak-disabled: \"false\"/ keycloak-disabled: \"true\"/" ; else cat -; fi | \
oc apply --force=true -f -
else
echo "[CHE] Deploying Che on OpenShift Container Platform (image ${CHE_IMAGE})"
curl -sSL http://central.maven.org/maven2/io/fabric8/online/apps/che/"${OSIO_VERSION}"/che-"${OSIO_VERSION}"-openshift.yml | \
if [ ! -z "${OPENSHIFT_NAMESPACE_URL+x}" ]; then sed "s/ hostname-http:.*/ hostname-http: ${OPENSHIFT_NAMESPACE_URL}/" ; else cat -; fi | \
sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \
sed "s| keycloak-oso-endpoint:.*| keycloak-oso-endpoint: ${KEYCLOAK_OSO_ENDPOINT}|" | \
sed "s| keycloak-github-endpoint:.*| keycloak-github-endpoint: ${KEYCLOAK_GITHUB_ENDPOINT}|" | \
sed "s/ keycloak-disabled:.*/ keycloak-disabled: \"${CHE_KEYCLOAK_DISABLED}\"/" | \
if [ "${CHE_LOG_LEVEL}" == "DEBUG" ]; then sed "s/ log-level: \"INFO\"/ log-level: \"DEBUG\"/" ; else cat -; fi | \
oc apply --force=true -f -
fi
echo
# --------------------------------
# Setup debugging routes if needed
# --------------------------------
if [ "${CHE_DEBUGGING_ENABLED}" == "true" ]; then
if oc get svc che-debug &> /dev/null; then
echo -n "[CHE] Deleting old che-debug service..."
oc delete svc che-debug
echo "done"
fi
echo -n "[CHE] Creating an OS route to debug Che wsmaster..."
oc expose dc che --name=che-debug --target-port=http-debug --port=8000 --type=NodePort
NodePort=$(oc get service che-debug -o jsonpath='{.spec.ports[0].nodePort}')
echo "[CHE] Remote wsmaster debugging URL: $(minishift ip):${NodePort}"
fi
che_route=$(oc get route che -o jsonpath='{.spec.host}')
echo
echo "[CHE] Che deployment has been successufully bootstrapped"
echo "[CHE] -> To check OpenShift deployment logs: 'oc get events -w'"
echo "[CHE] -> To check Che server logs: 'oc logs -f dc/che'"
echo "[CHE] -> Once the deployment is completed Che will be available at: "
echo "[CHE] http://${che_route}"
echo
echo

View File

@ -0,0 +1,59 @@
#!/bin/bash
# Copyright (c) 2012-2017 Red Hat, Inc
# 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
#
echo "[CHE] This script is going to replace Che stacks for current Che instance"
command -v oc >/dev/null 2>&1 || { echo >&2 "[CHE] [ERROR] Command line tool oc (https://docs.openshift.org/latest/cli_reference/get_started_cli.html) is required but it's not installed. Aborting."; exit 1; }
command -v jq >/dev/null 2>&1 || { echo >&2 "[CHE] [ERROR] Command line tool jq (https://stedolan.github.io/jq) is required but it's not installed. Aborting."; exit 1; }
if [ -z "${CHE_API_ENDPOINT+x}" ]; then
echo -n "[CHE] Inferring \$CHE_API_ENDPOINT..."
che_host=$(oc get route che -o jsonpath='{.spec.host}')
if [ -z "${che_host}" ]; then echo >&2 "[CHE] [ERROR] Failed to infer environment variable \$CHE_API_ENDPOINT. Aborting. Please set it and run ${0} script again."; exit 1; fi
if [[ $(oc get route che -o jsonpath='{.spec.tls}') ]]; then protocol="https" ; else protocol="http"; fi
CHE_API_ENDPOINT="${protocol}://${che_host}/api"
echo "done (${CHE_API_ENDPOINT})"
fi
DEFAULT_NEW_STACKS_URL="https://raw.githubusercontent.com/redhat-developer/rh-che/master/builds/fabric8-che/assembly/fabric8-stacks/src/main/resources/stacks.json"
NEW_STACKS_URL=${NEW_STACKS_URL:-${DEFAULT_NEW_STACKS_URL}}
echo -n "[CHE] Fetching the list of current Che stacks..."
original_stacks_json=$(curl -X GET -s --header 'Accept: application/json' "${CHE_API_ENDPOINT}/stack?skipCount=0&maxItems=100")
IFS=$'\n' original_stacks_ids=($(echo "${original_stacks_json}" | jq '.[].id'))
echo "done (${#original_stacks_ids[@]} stacks found)."
echo "[CHE] These stacks are going to be deleted."
for stack_id in "${original_stacks_ids[@]}"; do
stack_id_no_quotes="${stack_id%\"}"
stack_id_no_quotes="${stack_id_no_quotes#\"}"
stack_id_no_spaces=${stack_id_no_quotes// /+}
echo -n "[CHE] Deleting stack ${stack_id_no_spaces}..."
http_code=$(curl -w '%{http_code}' -s --output /dev/null -X DELETE --header 'Accept: application/json' "${CHE_API_ENDPOINT}/stack/${stack_id_no_spaces}")
echo "done (HTTP code ${http_code})."
done
echo ""
echo -n "[CHE] Fetching the list of new Che stacks..."
#new_stacks_json=$(curl -X GET -s --header 'Accept: application/json' "${NEW_STACKS_URL}" | sed 's/\\\"//g' | sed 's/\"com\.redhat\.bayesian\.lsp\"//g' | sed 's/ws-agent\",/ws-agent\"/g')
new_stacks_json=$(curl -X GET -s --header 'Accept: application/json' "${NEW_STACKS_URL}" | sed 's/\"com\.redhat\.bayesian\.lsp\"//g' | sed 's/ws-agent\",/ws-agent\"/g')
echo "done."
echo "[CHE] These stacks will be added."
echo "${new_stacks_json}" | jq -c '.[]' | while read -r stack; do
stack_id=$(echo "${stack}" | jq '.id')
stack_id_no_quotes="${stack_id%\"}"
stack_id_no_quotes="${stack_id_no_quotes#\"}"
echo -n "[CHE] Adding stack ${stack_id_no_quotes}..."
http_code=$(curl -w '%{http_code}' -s --output /dev/null -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d "${stack}" "${CHE_API_ENDPOINT}/stack")
echo "done (HTTP code ${http_code})"
done
echo
echo

View File

@ -0,0 +1,56 @@
#!/bin/bash
# Copyright (c) 2012-2017 Red Hat, Inc
# 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
#
echo "[CHE] This script is going to wait until Che is deployed and available"
command -v oc >/dev/null 2>&1 || { echo >&2 "[CHE] [ERROR] Command line tool oc (https://docs.openshift.org/latest/cli_reference/get_started_cli.html) is required but it's not installed. Aborting."; exit 1; }
command -v jq >/dev/null 2>&1 || { echo >&2 "[CHE] [ERROR] Command line tool jq (https://stedolan.github.io/jq) is required but it's not installed. Aborting."; exit 1; }
if [ -z "${CHE_API_ENDPOINT+x}" ]; then
echo -n "[CHE] Inferring \$CHE_API_ENDPOINT..."
che_host=$(oc get route che -o jsonpath='{.spec.host}')
if [ -z "${che_host}" ]; then echo >&2 "[CHE] [ERROR] Failed to infer environment variable \$CHE_API_ENDPOINT. Aborting. Please set it and run ${0} script again."; exit 1; fi
if [[ $(oc get route che -o jsonpath='{.spec.tls}') ]]; then protocol="https" ; else protocol="http"; fi
CHE_API_ENDPOINT="${protocol}://${che_host}/api"
echo "done (${CHE_API_ENDPOINT})"
fi
available=$(oc get dc che -o json | jq '.status.conditions[] | select(.type == "Available") | .status')
progressing=$(oc get dc che -o json | jq '.status.conditions[] | select(.type == "Progressing") | .status')
DEPLOYMENT_TIMEOUT_SEC=120
POLLING_INTERVAL_SEC=5
end=$((SECONDS+DEPLOYMENT_TIMEOUT_SEC))
while [ "${available}" != "\"True\"" ] && [ ${SECONDS} -lt ${end} ]; do
available=$(oc get dc che -o json | jq '.status.conditions[] | select(.type == "Available") | .status')
progressing=$(oc get dc che -o json | jq '.status.conditions[] | select(.type == "Progressing") | .status')
timeout_in=$((end-SECONDS))
echo "[CHE] Deployment is in progress...(Available.status=${available}, Progressing.status=${progressing}, Timeout in ${timeout_in}s)"
sleep ${POLLING_INTERVAL_SEC}
done
if [ "${progressing}" == "\"True\"" ] && [ "${available}" == "\"True\"" ]; then
echo "[CHE] Che deployed successfully"
elif [ "${progressing}" == "False" ]; then
echo "[CHE] [ERROR] Che deployment failed. Aborting. Run command 'oc rollout status che' to get more details."
exit 1
elif [ ${SECONDS} -lt ${end} ]; then
echo "[CHE] [ERROR] Deployment timeout. Aborting."
exit 1
fi
che_http_status=$(curl -s -o /dev/null -I -w "%{http_code}" "${CHE_API_ENDPOINT}/system/state")
if [ "${che_http_status}" == "200" ]; then
echo "[CHE] Che is up and running"
else
echo "[CHE] [ERROR] Che is not reponding (HTTP status= ${che_http_status})"
exit 1
fi
echo
echo

View File

@ -0,0 +1,4 @@
IMAGE_INIT=eclipse/che-init:5.18.0
IMAGE_CHE=eclipse/che-server:5.18.0
IMAGE_COMPOSE=docker/compose:1.8.1
IMAGE_TRAEFIK=traefik:v1.3.0-rc3

View File

@ -0,0 +1,24 @@
eclipse/alpine_jdk8
eclipse/aspnet
eclipse/centos_jdk8
eclipse/cpp_gcc
eclipse/debian_jdk8
eclipse/debian_jdk8_node
eclipse/debian_jre
eclipse/dotnet_core
eclipse/hadoop-dev
eclipse/meteor
eclipse/node
eclipse/php
eclipse/platformio
eclipse/ruby_rails
eclipse/selenium
eclipse/ubuntu_android
eclipse/ubuntu_go
eclipse/ubuntu_gradle
eclipse/ubuntu_jdk8
eclipse/ubuntu_jre
eclipse/ubuntu_python
eclipse/ubuntu_wildfly8
registry.centos.org/che-stacks/vertx

View File

@ -1 +1 @@
5.16.0
5.17.0

View File

@ -17,13 +17,13 @@
<parent>
<artifactId>maven-depmgt-pom</artifactId>
<groupId>org.eclipse.che.depmgt</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>dto-typescript</artifactId>
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>5.17.0-SNAPSHOT</che.version>
<che.version>5.18.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-api</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-app</artifactId>
<packaging>jar</packaging>

View File

@ -10,60 +10,86 @@
*/
package org.eclipse.che.ide.factory.utils;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.collect.Lists.newArrayList;
import static java.lang.Boolean.parseBoolean;
import static java.util.Collections.emptyMap;
import static org.eclipse.che.api.core.ErrorCodes.FAILED_CHECKOUT;
import static org.eclipse.che.api.core.ErrorCodes.FAILED_CHECKOUT_WITH_START_POINT;
import static org.eclipse.che.api.core.ErrorCodes.UNABLE_GET_PRIVATE_SSH_KEY;
import static org.eclipse.che.api.core.ErrorCodes.UNAUTHORIZED_GIT_OPERATION;
import static org.eclipse.che.api.core.ErrorCodes.UNAUTHORIZED_SVN_OPERATION;
import static org.eclipse.che.api.git.shared.ProviderInfo.AUTHENTICATE_URL;
import static org.eclipse.che.api.git.shared.ProviderInfo.PROVIDER_NAME;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.PROGRESS;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
import static org.eclipse.che.ide.util.ExceptionUtils.getAttributes;
import static org.eclipse.che.ide.util.StringUtils.isNullOrEmpty;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.*;
import org.eclipse.che.api.promises.client.*;
import org.eclipse.che.api.promises.client.js.Promises;
import java.util.List;
import java.util.Map;
import org.eclipse.che.api.core.model.workspace.config.SourceStorage;
import org.eclipse.che.api.promises.client.Promise;
import org.eclipse.che.api.promises.client.PromiseProvider;
import org.eclipse.che.ide.CoreLocalizationConstant;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.notification.StatusNotification;
import org.eclipse.che.ide.api.oauth.OAuth2Authenticator;
import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorRegistry;
import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorUrlProvider;
import org.eclipse.che.ide.api.project.MutableProjectConfig;
import org.eclipse.che.ide.api.project.wizard.ImportProjectNotificationSubscriberFactory;
import org.eclipse.che.ide.api.project.wizard.ProjectNotificationSubscriber;
import org.eclipse.che.ide.api.resources.Project;
import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter;
import org.eclipse.che.ide.projectimport.AbstractImporter;
import org.eclipse.che.ide.projectimport.wizard.ProjectImportOutputJsonRpcNotifier;
import org.eclipse.che.ide.projectimport.wizard.ProjectImporter;
import org.eclipse.che.ide.projectimport.wizard.ProjectResolver;
import org.eclipse.che.ide.resource.Path;
import org.eclipse.che.ide.ui.dialogs.DialogFactory;
import org.eclipse.che.ide.ui.dialogs.askcredentials.AskCredentialsDialog;
import org.eclipse.che.ide.util.ExceptionUtils;
import org.eclipse.che.security.oauth.OAuthStatus;
/** Imports projects on file system. */
@Singleton
public class InitialProjectImporter extends ProjectImporter {
public class InitialProjectImporter extends AbstractImporter {
private final OAuth2AuthenticatorRegistry oAuth2AuthenticatorRegistry;
private final ProjectImportOutputJsonRpcNotifier subscriber;
private final NotificationManager notificationManager;
private final CoreLocalizationConstant locale;
private final AskCredentialsDialog askCredentialsDialog;
private final DialogFactory dialogFactory;
private final PromiseProvider promises;
private AsyncCallback<Void> callback;
@Inject
public InitialProjectImporter(
CoreLocalizationConstant localizationConstant,
ImportProjectNotificationSubscriberFactory subscriberFactory,
AppContext appContext,
ProjectResolver projectResolver,
AskCredentialsDialog credentialsDialog,
OAuth2AuthenticatorRegistry oAuth2AuthenticatorRegistry,
ProjectImportOutputJsonRpcNotifier subscriber,
NotificationManager notificationManager,
CoreLocalizationConstant locale,
ProjectExplorerPresenter projectExplorerPresenter) {
AskCredentialsDialog askCredentialsDialog,
DialogFactory dialogFactory,
PromiseProvider promises) {
super(
localizationConstant,
subscriberFactory,
appContext,
projectResolver,
credentialsDialog,
oAuth2AuthenticatorRegistry);
super(appContext, subscriberFactory);
this.oAuth2AuthenticatorRegistry = oAuth2AuthenticatorRegistry;
this.subscriber = subscriber;
this.notificationManager = notificationManager;
this.locale = locale;
this.askCredentialsDialog = askCredentialsDialog;
this.dialogFactory = dialogFactory;
this.promises = promises;
}
/**
@ -72,43 +98,179 @@ public class InitialProjectImporter extends ProjectImporter {
* @param projects list of projects that already exist in workspace and will be imported on file
* system
*/
public void importProjects(final List<Project> projects) {
public void importProjects(List<Project> projects, AsyncCallback<Void> callback) {
this.callback = callback;
if (projects.isEmpty()) {
if (callback != null) {
callback.onSuccess(null);
}
return;
}
final Project importProject = projects.remove(0);
final StatusNotification notification =
notificationManager.notify(
locale.cloningSource(importProject.getName()), null, PROGRESS, FLOAT_MODE);
subscriber.subscribe(importProject.getName(), notification);
List<Promise<Project>> imports = newArrayList();
appContext
.getWorkspaceRoot()
.importProject()
.withBody(importProject)
.send()
for (Project projectConfig : projects) {
imports.add(
startImport(Path.valueOf(projectConfig.getPath()), projectConfig.getSource())
.thenPromise(project -> project.update().withBody(projectConfig).send()));
}
promises
.all2(imports.toArray(new Promise<?>[imports.size()]))
.then(
new Operation<Project>() {
@Override
public void apply(Project project) throws OperationException {
subscriber.onSuccess();
appContext.getWorkspaceRoot().synchronize();
importProjects(projects);
ignored -> {
if (callback != null) {
callback.onSuccess(null);
}
})
.catchErrorPromise(
new Function<PromiseError, Promise<Project>>() {
@Override
public Promise<Project> apply(PromiseError err) throws FunctionException {
subscriber.onFailure(err.getMessage());
notification.setTitle(locale.cloningSourceFailedTitle(importProject.getName()));
notification.setStatus(FAIL);
return Promises.resolve(null);
.catchError(
error -> {
if (callback != null) {
callback.onFailure(error.getCause());
}
});
}
@Override
protected Promise<Project> importProject(Path path, SourceStorage sourceStorage) {
return doImport(path, sourceStorage);
}
private Promise<Project> doImport(Path pathToProject, SourceStorage sourceStorage) {
String projectName = pathToProject.lastSegment();
StatusNotification notification =
notificationManager.notify(locale.cloningSource(projectName), null, PROGRESS, FLOAT_MODE);
subscriber.subscribe(projectName, notification);
String location = sourceStorage.getLocation();
// it's needed for extract repository name from repository url e.g https://github.com/a/b.git
// lastIndexOf('/') + 1 for not to capture slash and length - 4 for trim .git
String repository = location.substring(location.lastIndexOf('/') + 1).replace(".git", "");
Map<String, String> parameters = firstNonNull(sourceStorage.getParameters(), emptyMap());
String branch = parameters.get("branch");
String startPoint = parameters.get("startPoint");
MutableProjectConfig importConfig = new MutableProjectConfig();
importConfig.setPath(pathToProject.toString());
importConfig.setSource(sourceStorage);
return appContext
.getWorkspaceRoot()
.importProject()
.withBody(importConfig)
.send()
.thenPromise(
project -> {
subscriber.onSuccess();
notification.setContent(locale.clonedSource(projectName));
notification.setStatus(SUCCESS);
return promises.resolve(project);
})
.catchErrorPromise(
caught -> {
int errorCode = ExceptionUtils.getErrorCode(caught.getCause());
switch (errorCode) {
case UNAUTHORIZED_GIT_OPERATION:
subscriber.onFailure(caught.getMessage());
Map<String, String> attributes = getAttributes(caught.getCause());
String providerName = attributes.get(PROVIDER_NAME);
String authenticateUrl = attributes.get(AUTHENTICATE_URL);
boolean authenticated = parseBoolean(attributes.get("authenticated"));
if (!(isNullOrEmpty(providerName) || isNullOrEmpty(authenticateUrl))) {
if (!authenticated) {
return tryAuthenticateAndRepeatImport(
providerName, authenticateUrl, pathToProject, sourceStorage, subscriber);
} else {
dialogFactory
.createMessageDialog(
locale.cloningSourceSshKeyUploadFailedTitle(),
locale.cloningSourcesSshKeyUploadFailedText(),
null)
.show();
}
} else {
dialogFactory
.createMessageDialog(
locale.oauthFailedToGetAuthenticatorTitle(),
locale.oauthFailedToGetAuthenticatorText(),
null)
.show();
}
break;
case UNAUTHORIZED_SVN_OPERATION:
subscriber.onFailure(caught.getMessage());
return recallSubversionImportWithCredentials(pathToProject, sourceStorage);
case UNABLE_GET_PRIVATE_SSH_KEY:
subscriber.onFailure(locale.acceptSshNotFoundText());
break;
case FAILED_CHECKOUT:
subscriber.onFailure(locale.cloningSourceWithCheckoutFailed(branch, repository));
notification.setTitle(locale.cloningSourceFailedTitle(projectName));
break;
case FAILED_CHECKOUT_WITH_START_POINT:
subscriber.onFailure(locale.cloningSourceCheckoutFailed(branch, startPoint));
notification.setTitle(locale.cloningSourceFailedTitle(projectName));
break;
default:
subscriber.onFailure(caught.getMessage());
notification.setTitle(locale.cloningSourceFailedTitle(projectName));
notification.setStatus(FAIL);
}
return promises.resolve(null);
});
}
private Promise<Project> tryAuthenticateAndRepeatImport(
String providerName,
String authenticateUrl,
Path pathToProject,
SourceStorage sourceStorage,
ProjectNotificationSubscriber subscriber) {
OAuth2Authenticator authenticator = oAuth2AuthenticatorRegistry.getAuthenticator(providerName);
if (authenticator == null) {
authenticator = oAuth2AuthenticatorRegistry.getAuthenticator("default");
}
return authenticator
.authenticate(
OAuth2AuthenticatorUrlProvider.get(appContext.getMasterApiEndpoint(), authenticateUrl))
.thenPromise(
result -> {
if (!result.equals(OAuthStatus.NOT_PERFORMED)) {
return doImport(pathToProject, sourceStorage);
} else {
subscriber.onFailure("Authentication cancelled");
callback.onSuccess(null);
}
return promises.resolve(null);
})
.catchError(
caught -> {
callback.onFailure(caught.getCause());
});
}
private Promise<Project> recallSubversionImportWithCredentials(
Path path, SourceStorage sourceStorage) {
return askCredentialsDialog
.askCredentials()
.thenPromise(
credentials -> {
sourceStorage.getParameters().put("username", credentials.getUsername());
sourceStorage.getParameters().put("password", credentials.getPassword());
return doImport(path, sourceStorage);
})
.catchError(
caught -> {
callback.onFailure(caught.getCause());
});
}
}

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-generators</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-stacks</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-templates</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-ui</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-orion-editor</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-gwt</artifactId>
<name>Che Core :: Commons :: GWT</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-gwt-logger</artifactId>
<name>Che Core :: Commons :: GWT Logger</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infrastructure-docker</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infrastructure-openshift</artifactId>

View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-infrastructures-parent</artifactId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Infrastructures Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-ide</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-server</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-shared</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-wsmaster</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-server</artifactId>
<name>Che Plugin :: Composer :: Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-shared</artifactId>
<name>Che Plugin :: Composer :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-composer-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-server</artifactId>
<name>Che Plugin :: C/C++ :: Extension Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-shared</artifactId>
<name>Che Plugin :: C/C++ :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-cpp-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-server</artifactId>
<name>Che Plugin :: C# :: Extension Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-shared</artifactId>
<name>Che Plugin :: C# :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-csharp-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-dashboard-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-ext-dashboard-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-dashboard-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-debugger-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-debugger-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-debugger-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-docker-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-openshift-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-docker-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-server</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<packaging>pom</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-git-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-git-ext-git</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-git-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-factory-resolver</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-oauth2</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-provider-github</artifactId>
<name>Che Plugin :: Github :: Credential provider</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-pullrequest</artifactId>
<name>Che Plugin :: Github :: Pull request</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-server</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-shared</artifactId>
<name>Che Plugin :: Github :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.17.0-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-github-parent</artifactId>

Some files were not shown because too many files have changed in this diff Show More