diff --git a/CHANGELOG.md b/CHANGELOG.md index 4200eca361..29e2291d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,76 @@ # Change Log +## [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) + +**Merged pull requests:** + +- Rework Composer plugin to avoid using Everrest based Websocket calls [\#5629](https://github.com/eclipse/che/pull/5629) ([kaloyan-raev](https://github.com/kaloyan-raev)) +- C/CPP compilation error/warning messages support \#5565 [\#5604](https://github.com/eclipse/che/pull/5604) ([vrubezhny](https://github.com/vrubezhny)) +- Move mvn and svn tests execution to integration profile [\#5596](https://github.com/eclipse/che/pull/5596) ([garagatyi](https://github.com/garagatyi)) +- Fix dependencies [\#5590](https://github.com/eclipse/che/pull/5590) ([vparfonov](https://github.com/vparfonov)) +- Try to fix occasionally failing tests on CI [\#5585](https://github.com/eclipse/che/pull/5585) ([garagatyi](https://github.com/garagatyi)) +- Handle no-content response in DefaultHttpJsonRequest [\#5577](https://github.com/eclipse/che/pull/5577) ([dmytro-ndp](https://github.com/dmytro-ndp)) +- Maven Server tests execution on integration phase [\#5574](https://github.com/eclipse/che/pull/5574) ([vparfonov](https://github.com/vparfonov)) +- Rework Navigate to File feature to avoid using Everrest based Websocket calls [\#5561](https://github.com/eclipse/che/pull/5561) ([dkuleshov](https://github.com/dkuleshov)) +- Rework Find Usages feature to avoid using Everrest based Websocket calls [\#5550](https://github.com/eclipse/che/pull/5550) ([dkuleshov](https://github.com/dkuleshov)) +- Use Orion annotation model instead 'showProblems' method [\#5518](https://github.com/eclipse/che/pull/5518) ([evidolob](https://github.com/evidolob)) +- Improve idling implementation [\#5512](https://github.com/eclipse/che/pull/5512) ([mkuznyetsov](https://github.com/mkuznyetsov)) +- Normalize agent names [\#5479](https://github.com/eclipse/che/pull/5479) ([vinokurig](https://github.com/vinokurig)) +- Update lsp4J lib to newer version. [\#5292](https://github.com/eclipse/che/pull/5292) ([AndrienkoAleksandr](https://github.com/AndrienkoAleksandr)) +- Openshift connector improvements [\#5052](https://github.com/eclipse/che/pull/5052) ([sunix](https://github.com/sunix)) +- Move file header under imports [\#5727](https://github.com/eclipse/che/pull/5727) ([akorneta](https://github.com/akorneta)) +- Show notification when the creation of workspace failed [\#5723](https://github.com/eclipse/che/pull/5723) ([akurinnoy](https://github.com/akurinnoy)) +- Refresh commands list in project's context menu in IDE [\#5717](https://github.com/eclipse/che/pull/5717) ([akurinnoy](https://github.com/akurinnoy)) +- Fixed displaying of Preview URL at refreshing page [\#5709](https://github.com/eclipse/che/pull/5709) ([RomanNikitenko](https://github.com/RomanNikitenko)) +- Openshift: add mounted volume for logs [\#5708](https://github.com/eclipse/che/pull/5708) ([benoitf](https://github.com/benoitf)) +- Display notifications about external delete operation in Events panel [\#5707](https://github.com/eclipse/che/pull/5707) ([RomanNikitenko](https://github.com/RomanNikitenko)) +- Auto-detect recipe format and fix Git url pattern [\#5677](https://github.com/eclipse/che/pull/5677) ([ashumilova](https://github.com/ashumilova)) +- Fixed focus position at editor state restoring [\#5665](https://github.com/eclipse/che/pull/5665) ([RomanNikitenko](https://github.com/RomanNikitenko)) +- Use LSP for pom editor [\#5641](https://github.com/eclipse/che/pull/5641) ([tsmaeder](https://github.com/tsmaeder)) +- Avoid using ProjectManager just for taking project root dir [\#5636](https://github.com/eclipse/che/pull/5636) ([vparfonov](https://github.com/vparfonov)) +- Show 'Quick Start' tab by default and consider stacks priority order [\#5632](https://github.com/eclipse/che/pull/5632) ([ashumilova](https://github.com/ashumilova)) +- Fixed using project path and fileUri [\#5625](https://github.com/eclipse/che/pull/5625) ([vparfonov](https://github.com/vparfonov)) +- Fixed machine's default docker image [\#5619](https://github.com/eclipse/che/pull/5619) ([ashumilova](https://github.com/ashumilova)) +- Fixed Kotlin stack and dashboard reaction on missing workspace config in stack [\#5618](https://github.com/eclipse/che/pull/5618) ([ashumilova](https://github.com/ashumilova)) +- Replaced Window.open\(\) with JS native call [\#5584](https://github.com/eclipse/che/pull/5584) ([vparfonov](https://github.com/vparfonov)) +- Fix possible NullPointerException [\#5582](https://github.com/eclipse/che/pull/5582) ([vparfonov](https://github.com/vparfonov)) +- Run sync container in an interactive mode [\#5576](https://github.com/eclipse/che/pull/5576) ([eivantsov](https://github.com/eivantsov)) +- Save button in Workspace config tab appears only after adding second symbol to config [\#5566](https://github.com/eclipse/che/pull/5566) ([bdshadow](https://github.com/bdshadow)) +- Sort imports/ fix indent in openshift connector [\#5552](https://github.com/eclipse/che/pull/5552) ([benoitf](https://github.com/benoitf)) +- Change names of methods for WebSocket communication [\#5543](https://github.com/eclipse/che/pull/5543) ([svor](https://github.com/svor)) +- Move binding ServerIdleDetctor to the assembly module [\#5541](https://github.com/eclipse/che/pull/5541) ([vparfonov](https://github.com/vparfonov)) +- .NET C\# stacktrace support \#5489 [\#5534](https://github.com/eclipse/che/pull/5534) ([vrubezhny](https://github.com/vrubezhny)) +- Fixed broken links to che-docs [\#5531](https://github.com/eclipse/che/pull/5531) ([jonahkichwacoders](https://github.com/jonahkichwacoders)) +- Register refresh method for ProjectExplorer native object [\#5530](https://github.com/eclipse/che/pull/5530) ([vzhukovskii](https://github.com/vzhukovskii)) +- Rework Maven plugin to avoid using Everrest Websocket [\#5527](https://github.com/eclipse/che/pull/5527) ([svor](https://github.com/svor)) +- Avoid possible NPE [\#5526](https://github.com/eclipse/che/pull/5526) ([vparfonov](https://github.com/vparfonov)) +- Added Kotlin runtime stack [\#5520](https://github.com/eclipse/che/pull/5520) ([eivantsov](https://github.com/eivantsov)) +- Ability to handle import logs from multiple projects [\#5511](https://github.com/eclipse/che/pull/5511) ([vzhukovskii](https://github.com/vzhukovskii)) +- Fixed NPE in DockerConnector [\#5510](https://github.com/eclipse/che/pull/5510) ([mmorhun](https://github.com/mmorhun)) +- Fixed for DefaultOutputCustomizerTest.java - wrong API is used in place… [\#5509](https://github.com/eclipse/che/pull/5509) ([vrubezhny](https://github.com/vrubezhny)) +- Fixed entrypoint to respect CHE\_DOCKER\_IP [\#5507](https://github.com/eclipse/che/pull/5507) ([eivantsov](https://github.com/eivantsov)) +- Remove unnecessary stack trace [\#5506](https://github.com/eclipse/che/pull/5506) ([mmorhun](https://github.com/mmorhun)) +- Fixed group by folders view in commit dialog [\#5504](https://github.com/eclipse/che/pull/5504) ([vinokurig](https://github.com/vinokurig)) +- Updated Bitnami stacks to latest versions [\#5501](https://github.com/eclipse/che/pull/5501) ([amrecio](https://github.com/amrecio)) +- Add repository and registry host in log on snapshot deletion failure [\#5500](https://github.com/eclipse/che/pull/5500) ([mmorhun](https://github.com/mmorhun)) +- Make gwt-logger project m2e-compatible [\#5496](https://github.com/eclipse/che/pull/5496) ([tsmaeder](https://github.com/tsmaeder)) +- CHE-5215. Add ability to exclude tracking files by file watcher [\#5495](https://github.com/eclipse/che/pull/5495) ([RomanNikitenko](https://github.com/RomanNikitenko)) +- Reworked importing a project while consuming Factory to avoid using Everrest based Websocket calls [\#5493](https://github.com/eclipse/che/pull/5493) ([dkuleshov](https://github.com/dkuleshov)) +- Removed deprecated single descriptor and move to multi descriptors which is the replacement [\#5490](https://github.com/eclipse/che/pull/5490) ([benoitf](https://github.com/benoitf)) +- Rework git client-service and other git client classes [\#5476](https://github.com/eclipse/che/pull/5476) ([vinokurig](https://github.com/vinokurig)) +- New runner for TestNG tests [\#5472](https://github.com/eclipse/che/pull/5472) ([svor](https://github.com/svor)) +- Let users to use .Chefile in addition to Chefile [\#5471](https://github.com/eclipse/che/pull/5471) ([benoitf](https://github.com/benoitf)) +- Added new workspace creation flow [\#5447](https://github.com/eclipse/che/pull/5447) ([akurinnoy](https://github.com/akurinnoy)) +- Added support for using multiple language servers to be registered for the same files \#4609 [\#5442](https://github.com/eclipse/che/pull/5442) ([tsmaeder](https://github.com/tsmaeder)) +- Java stacktrace support \(From Platform to Che Workspace\) [\#5396](https://github.com/eclipse/che/pull/5396) ([vrubezhny](https://github.com/vrubezhny)) +- Updated modification stamp on open and on update document. [\#5391](https://github.com/eclipse/che/pull/5391) ([AndrienkoAleksandr](https://github.com/AndrienkoAleksandr)) +- Added CentOS based Golang stack to default assembly [\#5282](https://github.com/eclipse/che/pull/5282) ([dharmit](https://github.com/dharmit)) +- Ability to register language servers for file names instead of extensions \#5107 [\#5156](https://github.com/eclipse/che/pull/5156) ([tsmaeder](https://github.com/tsmaeder)) +- Support for multiple highlights [\#5038](https://github.com/eclipse/che/pull/5038) ([tsmaeder](https://github.com/tsmaeder)) +- Added CentOS based minimal stack with only git to default assembly [\#4847](https://github.com/eclipse/che/pull/4847) ([dharmit](https://github.com/dharmit)) + + ## [5.14.0](https://github.com/eclipse/che/tree/5.14.0) (2017-06-29) [Full Changelog](https://github.com/eclipse/che/compare/5.13.0...5.14.0) diff --git a/agents/bootstrapper/pom.xml b/agents/bootstrapper/pom.xml index a4c95ef12a..78a490fe7c 100644 --- a/agents/bootstrapper/pom.xml +++ b/agents/bootstrapper/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT bootstrapper Agents :: Bootstrapper diff --git a/agents/exec/pom.xml b/agents/exec/pom.xml index 23705c484d..629b510274 100644 --- a/agents/exec/pom.xml +++ b/agents/exec/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT exec-agent Agent :: Exec diff --git a/agents/git-credentials/pom.xml b/agents/git-credentials/pom.xml index 227f3e9e58..77489e16cc 100644 --- a/agents/git-credentials/pom.xml +++ b/agents/git-credentials/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT git-credentials-agent Git Credentials Agent diff --git a/agents/go-agents/pom.xml b/agents/go-agents/pom.xml index 0811b53cba..5c8a7831f3 100644 --- a/agents/go-agents/pom.xml +++ b/agents/go-agents/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT go-agents Agent :: Golang agents diff --git a/agents/ls-csharp/pom.xml b/agents/ls-csharp/pom.xml index ddc46adc91..de2a15ce2e 100644 --- a/agents/ls-csharp/pom.xml +++ b/agents/ls-csharp/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ls-csharp-agent Language Server C# Agent diff --git a/agents/ls-json/pom.xml b/agents/ls-json/pom.xml index 466650ceb1..7e166c4c63 100644 --- a/agents/ls-json/pom.xml +++ b/agents/ls-json/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ls-json-agent Language Server Json Agent diff --git a/agents/ls-php/pom.xml b/agents/ls-php/pom.xml index ac5da03fe3..ec4a519525 100644 --- a/agents/ls-php/pom.xml +++ b/agents/ls-php/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ls-php-agent Language Server PHP Agent diff --git a/agents/ls-python/pom.xml b/agents/ls-python/pom.xml index e905f6f316..3c9be86bd4 100644 --- a/agents/ls-python/pom.xml +++ b/agents/ls-python/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ls-python-agent Language Server python Agent diff --git a/agents/ls-typescript/pom.xml b/agents/ls-typescript/pom.xml index 5728ec166c..73e215e039 100644 --- a/agents/ls-typescript/pom.xml +++ b/agents/ls-typescript/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ls-typescript-agent Language Server typescript Agent diff --git a/agents/pom.xml b/agents/pom.xml index 14c61e2dde..6f76088402 100644 --- a/agents/pom.xml +++ b/agents/pom.xml @@ -16,11 +16,11 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-agents-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Agents Parent diff --git a/agents/ssh/pom.xml b/agents/ssh/pom.xml index 653a388f3e..3f903e2ba9 100644 --- a/agents/ssh/pom.xml +++ b/agents/ssh/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ssh-agent SSH Agent diff --git a/agents/terminal/pom.xml b/agents/terminal/pom.xml index 3a599c4558..5ae89b31ce 100644 --- a/agents/terminal/pom.xml +++ b/agents/terminal/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT terminal-agent Agent :: Terminal diff --git a/agents/unison/pom.xml b/agents/unison/pom.xml index e681f886ec..9c6749c948 100644 --- a/agents/unison/pom.xml +++ b/agents/unison/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT unison-agent Unison Agent diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index c882df678a..fa8f0b8efc 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT assembly-ide-war war @@ -191,18 +191,10 @@ org.eclipse.che.plugin che-plugin-testing-ide - - org.eclipse.che.plugin - che-plugin-testing-junit-ide - org.eclipse.che.plugin che-plugin-testing-phpunit-ide - - org.eclipse.che.plugin - che-plugin-testing-testng-ide - org.eclipse.che.plugin che-plugin-web-ext-web diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml index 389e2aba52..b3183305b7 100644 --- a/assembly/assembly-main/pom.xml +++ b/assembly/assembly-main/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT assembly-main pom diff --git a/assembly/assembly-wsagent-server/pom.xml b/assembly/assembly-wsagent-server/pom.xml index 448aaaa935..f18d602b0d 100644 --- a/assembly/assembly-wsagent-server/pom.xml +++ b/assembly/assembly-wsagent-server/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT assembly-wsagent-server pom diff --git a/assembly/assembly-wsagent-war/overlays/org.eclipse.che.core.che-wsagent-core-5.15.0-SNAPSHOT.info b/assembly/assembly-wsagent-war/overlays/org.eclipse.che.core.che-wsagent-core-5.15.0-SNAPSHOT.info new file mode 100644 index 0000000000..5d36f4096c --- /dev/null +++ b/assembly/assembly-wsagent-war/overlays/org.eclipse.che.core.che-wsagent-core-5.15.0-SNAPSHOT.info @@ -0,0 +1,3 @@ +1500540484000 +(?:[^/]+/)*?[^/]*? +META-INF(?:$|/.+) \ No newline at end of file diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index 0f4abc976e..c5c4a2ce9d 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT assembly-wsagent-war war @@ -107,6 +107,10 @@ org.eclipse.che.plugin che-plugin-testing-classpath + + org.eclipse.che.plugin + che-plugin-testing-junit-runtime + org.eclipse.che.plugin che-plugin-testing-junit-server diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index d65597323b..a0353a8457 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT assembly-wsmaster-war war diff --git a/assembly/pom.xml b/assembly/pom.xml index c7c5a39261..f22644cc7a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che che-assembly-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che IDE :: Parent diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index 2cabd3299a..fcf33d6e6b 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-core jar diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml index 076bf4bbde..50408b6b52 100644 --- a/core/che-core-api-dto-maven-plugin/pom.xml +++ b/core/che-core-api-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-dto-maven-plugin maven-plugin diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml index c20a4dd881..51df3d27d2 100644 --- a/core/che-core-api-dto/pom.xml +++ b/core/che-core-api-dto/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-dto jar diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml index 8f074dc69a..3a3fd91b48 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-model jar diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml index b387655bd7..bdebb9f4af 100644 --- a/core/che-core-db-vendor-h2/pom.xml +++ b/core/che-core-db-vendor-h2/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-db-vendor-h2 Che Core :: DB :: Vendor H2 diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml index 5a4d62ee29..4d81599c19 100644 --- a/core/che-core-db-vendor-postgresql/pom.xml +++ b/core/che-core-db-vendor-postgresql/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-db-vendor-postgresql Che Core :: DB :: Vendor PostgreSQL diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml index 6dc60d24be..ef20b5ce3e 100644 --- a/core/che-core-db/pom.xml +++ b/core/che-core-db/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-db Che Core :: DB diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml index 2545e2bb82..8a92a7de77 100644 --- a/core/che-core-typescript-dto-maven-plugin/pom.xml +++ b/core/che-core-typescript-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-typescript-dto-maven-plugin diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml index 835dcba675..9da0bc0064 100644 --- a/core/commons/che-core-commons-annotations/pom.xml +++ b/core/commons/che-core-commons-annotations/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-annotations jar diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml index 6f2eec1a6b..c6b563b0bc 100644 --- a/core/commons/che-core-commons-inject/pom.xml +++ b/core/commons/che-core-commons-inject/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-inject jar diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml index 1f499866e5..a4e7974d99 100644 --- a/core/commons/che-core-commons-j2ee/pom.xml +++ b/core/commons/che-core-commons-j2ee/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-j2ee jar diff --git a/core/commons/che-core-commons-json/pom.xml b/core/commons/che-core-commons-json/pom.xml index 93b3dcd8a6..45c3b92b9b 100644 --- a/core/commons/che-core-commons-json/pom.xml +++ b/core/commons/che-core-commons-json/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-json jar diff --git a/core/commons/che-core-commons-lang/pom.xml b/core/commons/che-core-commons-lang/pom.xml index 51dc794ff7..60328e61f2 100644 --- a/core/commons/che-core-commons-lang/pom.xml +++ b/core/commons/che-core-commons-lang/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-lang jar diff --git a/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ParametersList.java b/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ParametersList.java index e96f84c77c..58dc461292 100644 --- a/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ParametersList.java +++ b/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ParametersList.java @@ -26,6 +26,16 @@ public class ParametersList { parameters.add(value); } + /** + * Adds a parameter without name. + * + * @param value + * value of the parameter + */ + public void add(String value) { + parameters.add(value); + } + public List getParameters() { return unmodifiableList(parameters); } diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml index d97e6b0d5a..46e4d2483c 100644 --- a/core/commons/che-core-commons-schedule/pom.xml +++ b/core/commons/che-core-commons-schedule/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-schedule jar diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml index 46809059af..82b69bdcd9 100644 --- a/core/commons/che-core-commons-test/pom.xml +++ b/core/commons/che-core-commons-test/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-test jar diff --git a/core/commons/che-core-commons-xml/pom.xml b/core/commons/che-core-commons-xml/pom.xml index fffa0ed0ad..30bfc2fcb0 100644 --- a/core/commons/che-core-commons-xml/pom.xml +++ b/core/commons/che-core-commons-xml/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-xml jar diff --git a/core/commons/pom.xml b/core/commons/pom.xml index 474eae5e37..cd252d61fb 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-core-commons-parent diff --git a/core/pom.xml b/core/pom.xml index 96825a388d..e363f0e801 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che.core che-core-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Core Parent diff --git a/dashboard/pom.xml b/dashboard/pom.xml index 3a2d6e00b6..fd2ae48a84 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che.dashboard che-dashboard-war - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT war Che Dashboard :: Web App 2015 diff --git a/dockerfiles/cli/version/5.16.0/images b/dockerfiles/cli/version/5.16.0/images new file mode 100644 index 0000000000..10be720a10 --- /dev/null +++ b/dockerfiles/cli/version/5.16.0/images @@ -0,0 +1,4 @@ +IMAGE_INIT=eclipse/che-init:5.16.0 +IMAGE_CHE=eclipse/che-server:5.16.0 +IMAGE_COMPOSE=docker/compose:1.8.1 +IMAGE_TRAEFIK=traefik:v1.3.0-rc3 diff --git a/dockerfiles/cli/version/5.16.0/images-stacks b/dockerfiles/cli/version/5.16.0/images-stacks new file mode 100644 index 0000000000..4630f02af6 --- /dev/null +++ b/dockerfiles/cli/version/5.16.0/images-stacks @@ -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 + diff --git a/dockerfiles/cli/version/latest.ver b/dockerfiles/cli/version/latest.ver index 5d4f567eb6..e0cb00460a 100644 --- a/dockerfiles/cli/version/latest.ver +++ b/dockerfiles/cli/version/latest.ver @@ -1 +1 @@ -5.14.0 \ No newline at end of file +5.15.0 \ No newline at end of file diff --git a/dockerfiles/lib/dto-pom.xml b/dockerfiles/lib/dto-pom.xml index ca3f211216..cb36db4dde 100644 --- a/dockerfiles/lib/dto-pom.xml +++ b/dockerfiles/lib/dto-pom.xml @@ -17,13 +17,13 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT dto-typescript pom Che TypeScript DTO - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT diff --git a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml index 000cbdbc3d..c4549c7d0f 100644 --- a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml +++ b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-dyna-provider-generator-maven-plugin maven-plugin diff --git a/ide/che-core-ide-api/pom.xml b/ide/che-core-ide-api/pom.xml index d573cd5678..cbe15d35cf 100644 --- a/ide/che-core-ide-api/pom.xml +++ b/ide/che-core-ide-api/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-ide-api diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index 3572aa1837..0e46290050 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-ide-app jar diff --git a/ide/che-core-ide-generators/pom.xml b/ide/che-core-ide-generators/pom.xml index 12ca35f236..37158b8d1e 100644 --- a/ide/che-core-ide-generators/pom.xml +++ b/ide/che-core-ide-generators/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-ide-generators diff --git a/ide/che-core-ide-stacks/pom.xml b/ide/che-core-ide-stacks/pom.xml index 8c523e2fcf..1bfe283a0c 100644 --- a/ide/che-core-ide-stacks/pom.xml +++ b/ide/che-core-ide-stacks/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-ide-stacks diff --git a/ide/che-core-ide-templates/pom.xml b/ide/che-core-ide-templates/pom.xml index 8f1c70e59b..5edc5c251d 100644 --- a/ide/che-core-ide-templates/pom.xml +++ b/ide/che-core-ide-templates/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-ide-templates diff --git a/ide/che-core-ide-ui/pom.xml b/ide/che-core-ide-ui/pom.xml index 7b7d38e194..62f97d5520 100644 --- a/ide/che-core-ide-ui/pom.xml +++ b/ide/che-core-ide-ui/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core che-core-ide-ui diff --git a/ide/che-core-orion-editor/pom.xml b/ide/che-core-orion-editor/pom.xml index 92e34bb93a..32c8e344af 100644 --- a/ide/che-core-orion-editor/pom.xml +++ b/ide/che-core-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-orion-editor jar diff --git a/ide/che-ide-core/pom.xml b/ide/che-ide-core/pom.xml index 4fa224d3e6..3c72cf5095 100644 --- a/ide/che-ide-core/pom.xml +++ b/ide/che-ide-core/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../../pom.xml org.eclipse.che.core diff --git a/ide/commons-gwt/pom.xml b/ide/commons-gwt/pom.xml index 6a891ba426..0f5535ba7d 100644 --- a/ide/commons-gwt/pom.xml +++ b/ide/commons-gwt/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-commons-gwt Che Core :: Commons :: GWT diff --git a/ide/gwt-logger/pom.xml b/ide/gwt-logger/pom.xml index 9cea2d0ae8..b1783cce3e 100644 --- a/ide/gwt-logger/pom.xml +++ b/ide/gwt-logger/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-gwt-logger Che Core :: Commons :: GWT Logger diff --git a/ide/pom.xml b/ide/pom.xml index df18041bec..5070bf146a 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che.core diff --git a/infrastructures/docker/pom.xml b/infrastructures/docker/pom.xml index 80b8ba6a08..f685a88539 100644 --- a/infrastructures/docker/pom.xml +++ b/infrastructures/docker/pom.xml @@ -16,7 +16,7 @@ che-infrastructures-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml infrastructure-docker diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml index 4407c1ccf1..772db7a8e3 100644 --- a/infrastructures/pom.xml +++ b/infrastructures/pom.xml @@ -16,11 +16,11 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-infrastructures-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Infrastructures Parent diff --git a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml index 8abe4958b2..873de1b541 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-composer-ide jar diff --git a/plugins/plugin-composer/che-plugin-composer-ide/src/main/java/org/eclipse/che/plugin/composer/ide/communication/ComposerOutputHandler.java b/plugins/plugin-composer/che-plugin-composer-ide/src/main/java/org/eclipse/che/plugin/composer/ide/communication/ComposerOutputHandler.java index dd97c10ad8..d785e192cf 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/src/main/java/org/eclipse/che/plugin/composer/ide/communication/ComposerOutputHandler.java +++ b/plugins/plugin-composer/che-plugin-composer-ide/src/main/java/org/eclipse/che/plugin/composer/ide/communication/ComposerOutputHandler.java @@ -13,7 +13,6 @@ package org.eclipse.che.plugin.composer.ide.communication; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.console.CommandConsoleFactory; import org.eclipse.che.ide.console.DefaultOutputConsole; import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter; @@ -29,17 +28,14 @@ import org.eclipse.che.plugin.composer.shared.dto.ComposerOutput; public class ComposerOutputHandler { private final ProcessesPanelPresenter processesPanelPresenter; - private final AppContext appContext; private DefaultOutputConsole outputConsole; @Inject public ComposerOutputHandler(ComposerJsonRpcHandler composerJsonRpcHandler, ProcessesPanelPresenter processesPanelPresenter, - CommandConsoleFactory commandConsoleFactory, - AppContext appContext) { + CommandConsoleFactory commandConsoleFactory) { this.processesPanelPresenter = processesPanelPresenter; - this.appContext = appContext; composerJsonRpcHandler.addComposerOutputHandler(this::onComposerOutput); @@ -50,7 +46,7 @@ public class ComposerOutputHandler { String message = output.getOutput(); switch (output.getState()) { case START: - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), outputConsole); + processesPanelPresenter.addCommandOutput(outputConsole); outputConsole.clearOutputsButtonClicked(); outputConsole.printText(message, "green"); break; diff --git a/plugins/plugin-composer/che-plugin-composer-server/pom.xml b/plugins/plugin-composer/che-plugin-composer-server/pom.xml index 33a5e70df4..41c51d78e0 100644 --- a/plugins/plugin-composer/che-plugin-composer-server/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-composer-server Che Plugin :: Composer :: Server diff --git a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml index e32c03c040..ca2ecd736b 100644 --- a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-composer-shared Che Plugin :: Composer :: Shared diff --git a/plugins/plugin-composer/pom.xml b/plugins/plugin-composer/pom.xml index 2505e32a98..d5a141814f 100644 --- a/plugins/plugin-composer/pom.xml +++ b/plugins/plugin-composer/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-composer-parent diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml index 93c05b3496..d6a4b97fd5 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-cpp-lang-ide jar diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml index fbc9ca3f92..677ef3c228 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-cpp-lang-server Che Plugin :: C/C++ :: Extension Server diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml index 3cbe7648da..b39ff01264 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-cpp-lang-shared Che Plugin :: C/C++ :: Shared diff --git a/plugins/plugin-cpp/pom.xml b/plugins/plugin-cpp/pom.xml index 806f39b8d0..2fe4a239cb 100644 --- a/plugins/plugin-cpp/pom.xml +++ b/plugins/plugin-cpp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-cpp-parent diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml index 7aa1169a51..992df4fd65 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-csharp-lang-ide jar diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml index e33d00d022..531574eee6 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-csharp-lang-server Che Plugin :: C# :: Extension Server diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml index 5db0366676..f619a6d510 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-csharp-lang-shared Che Plugin :: C# :: Shared diff --git a/plugins/plugin-csharp/pom.xml b/plugins/plugin-csharp/pom.xml index b6c60c7855..a328f2ec1c 100644 --- a/plugins/plugin-csharp/pom.xml +++ b/plugins/plugin-csharp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-csharp-parent diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml index a7caa18aac..99cdc9e376 100644 --- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml +++ b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-dashboard-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-ext-dashboard-client jar diff --git a/plugins/plugin-dashboard/pom.xml b/plugins/plugin-dashboard/pom.xml index 34cc68912a..f35da51402 100644 --- a/plugins/plugin-dashboard/pom.xml +++ b/plugins/plugin-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-dashboard-parent diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml index 432c69c6ce..a458c10a3f 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-debugger-ide jar diff --git a/plugins/plugin-debugger/pom.xml b/plugins/plugin-debugger/pom.xml index 8fa65632db..09458bbffe 100644 --- a/plugins/plugin-debugger/pom.xml +++ b/plugins/plugin-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-debugger-parent diff --git a/plugins/plugin-docker/che-plugin-docker-client/pom.xml b/plugins/plugin-docker/che-plugin-docker-client/pom.xml index 73d2f28b2f..c68ab4a0a2 100644 --- a/plugins/plugin-docker/che-plugin-docker-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-docker-client jar diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml index 29ea7465c0..5830c3be11 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-openshift-client jar diff --git a/plugins/plugin-docker/pom.xml b/plugins/plugin-docker/pom.xml index 1cb2085dd4..c33704c9ab 100644 --- a/plugins/plugin-docker/pom.xml +++ b/plugins/plugin-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-docker-parent diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml index db2e056875..af39199bc5 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-gdb-ide jar diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml index 5d7ebfccda..23d2bd20e8 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-gdb-server jar diff --git a/plugins/plugin-gdb/pom.xml b/plugins/plugin-gdb/pom.xml index b54a9d99fe..08fde99839 100644 --- a/plugins/plugin-gdb/pom.xml +++ b/plugins/plugin-gdb/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-gdb-parent pom diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml index 285f2afc49..0cc5a52495 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-git-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-git-ext-git jar diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java index a7ffe82412..b0b87d46c9 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java @@ -107,7 +107,7 @@ public class FetchPresenter implements FetchView.ActionDelegate { .catchError(error -> { GitOutputConsole console = gitOutputConsoleFactory.create(FETCH_COMMAND_NAME); console.printError(constant.remoteListFailed()); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE); view.setEnableFetchButton(false); }); @@ -139,7 +139,7 @@ public class FetchPresenter implements FetchView.ActionDelegate { final String errorMessage = error.getMessage() != null ? error.getMessage() : constant.branchesListFailed(); GitOutputConsole console = gitOutputConsoleFactory.create(FETCH_COMMAND_NAME); console.printError(errorMessage); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE); view.setEnableFetchButton(false); }); @@ -156,13 +156,13 @@ public class FetchPresenter implements FetchView.ActionDelegate { service.fetch(project.getLocation(), view.getRepositoryName(), getRefs(), view.isRemoveDeletedRefs()) .then(ignored -> { console.print(constant.fetchSuccess(remoteUrl)); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notification.setStatus(SUCCESS); notification.setTitle(constant.fetchSuccess(remoteUrl)); }) .catchError(error -> { handleError(error.getCause(), remoteUrl, notification, console); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); }); view.close(); } diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryViewImpl.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryViewImpl.java index d8b64170ac..60261d5bba 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryViewImpl.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryViewImpl.java @@ -208,7 +208,9 @@ public class HistoryViewImpl extends Window implements HistoryView { @UiHandler("revisionsPanel") public void onPanelScrolled(ScrollEvent ignored) { - if (revisionsPanel.getVerticalScrollPosition() == revisionsPanel.getMaximumVerticalScrollPosition()) { + // We cannot rely on exact equality of scroll positions because GWT sometimes round such values + // and it is possible that the actual max scroll position is a pixel less then declared. + if (revisionsPanel.getMaximumVerticalScrollPosition() - revisionsPanel.getVerticalScrollPosition() <= 1) { // to avoid autoscrolling to selected item revisionsPanel.getElement().focus(); diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java index 1b4819f6cb..ec3c5b46e1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java @@ -113,7 +113,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { String errorMessage = error.getMessage() != null ? error.getMessage() : constant.remoteListFailed(); GitOutputConsole console = gitOutputConsoleFactory.create(REMOTE_REPO_COMMAND_NAME); console.printError(errorMessage); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE); view.setEnablePushButton(false); }); @@ -146,7 +146,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { String errorMessage = exception.getMessage() != null ? exception.getMessage() : constant.localBranchesListFailed(); GitOutputConsole console = gitOutputConsoleFactory.create(BRANCH_LIST_COMMAND_NAME); console.printError(errorMessage); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.localBranchesListFailed(), FAIL, FLOAT_MODE); view.setEnablePushButton(false); } @@ -196,7 +196,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { public void onFailure(Throwable caught) { GitOutputConsole console = gitOutputConsoleFactory.create(CONFIG_COMMAND_NAME); console.printError(constant.failedGettingConfig()); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.failedGettingConfig(), FAIL, FLOAT_MODE); } }); @@ -207,7 +207,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { String errorMessage = exception.getMessage() != null ? exception.getMessage() : constant.remoteBranchesListFailed(); GitOutputConsole console = gitOutputConsoleFactory.create(BRANCH_LIST_COMMAND_NAME); console.printError(errorMessage); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notificationManager.notify(constant.remoteBranchesListFailed(), FAIL, FLOAT_MODE); view.setEnablePushButton(false); } @@ -270,7 +270,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { service.push(project.getLocation(), getRefs(), repository, view.isForcePushSelected()) .then(response -> { console.print(response.getCommandOutput()); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); notification.setStatus(SUCCESS); if (response.getCommandOutput().contains("Everything up-to-date")) { notification.setTitle(constant.pushUpToDate()); @@ -280,7 +280,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate { }) .catchError(error -> { handleError(error.getCause(), notification, console); - processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console); + processesPanelPresenter.addCommandOutput(console); }); view.close(); } diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java index 57ed1d3397..50c2f6b0d2 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java @@ -18,16 +18,20 @@ import org.eclipse.che.api.git.shared.ResetRequest; import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.dialogs.DialogFactory; -import org.eclipse.che.ide.ext.git.client.GitServiceClient; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.resources.Project; import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; +import org.eclipse.che.ide.ext.git.client.GitServiceClient; import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsole; import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsoleFactory; import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter; import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +import static org.eclipse.che.api.git.shared.Constants.DEFAULT_PAGE_SIZE; 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.util.ExceptionUtils.getErrorCode; @@ -52,8 +56,10 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate private final GitLocalizationConstant constant; private final NotificationManager notificationManager; - private Revision selectedRevision; - private Project project; + private Revision selectedRevision; + private List revisions; + private Project project; + private int skip; @Inject public ResetToCommitPresenter(ResetToCommitView view, @@ -77,29 +83,12 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate public void showDialog(final Project project) { this.project = project; + this.skip = 0; + this.revisions = new ArrayList<>(); + this.selectedRevision = null; + this.view.resetRevisionSelection(); - service.log(project.getLocation(), null, -1, -1, false) - .then(log -> { - view.setRevisions(log.getCommits()); - view.setMixMode(true); - view.setEnableResetButton(selectedRevision != null); - view.showDialog(); - - project.synchronize(); - }) - .catchError(error -> { - if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) { - dialogFactory.createMessageDialog(constant.resetCommitViewTitle(), - constant.initCommitWasNotPerformed(), - null).show(); - return; - } - String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed(); - GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME); - console.printError(errorMessage); - consolesPanelPresenter.addCommandOutput(console); - notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE); - }); + fetchAndAddNextRevisions(); } /** @@ -128,6 +117,41 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate view.setEnableResetButton(selectedRevision != null); } + @Override + public void onScrolledToBottom() { + fetchAndAddNextRevisions(); + } + + private void fetchAndAddNextRevisions() { + service.log(project.getLocation(), null, skip, DEFAULT_PAGE_SIZE, false) + .then(log -> { + List commits = log.getCommits(); + if (!commits.isEmpty()) { + skip += commits.size(); + revisions.addAll(commits); + view.setEnableResetButton(selectedRevision != null); + view.setRevisions(revisions); + view.setMixMode(true); + view.showDialog(); + + project.synchronize(); + } + }) + .catchError(error -> { + if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) { + dialogFactory.createMessageDialog(constant.resetCommitViewTitle(), + constant.initCommitWasNotPerformed(), + null).show(); + return; + } + String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed(); + GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME); + console.printError(errorMessage); + consolesPanelPresenter.addCommandOutput(console); + notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE); + }); + } + /** * Reset current HEAD to the specified state and refresh project in the success case. */ diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitView.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitView.java index 19056c0444..f3042cb5a8 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitView.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitView.java @@ -37,6 +37,11 @@ public interface ResetToCommitView extends View revisions); + /** + * Deselect active revision in the table of available revisions. + */ + void resetRevisionSelection(); + /** @return true if soft mode is chosen, and false otherwise */ boolean isSoftMode(); @@ -80,28 +90,6 @@ public interface ResetToCommitView extends Viewtrue if keep mode is chosen, and false otherwise */ -// boolean isKeepMode(); -// -// /** -// * Select keep mode. -// * -// * @param isKeep -// * true to select keep mode, false not to select -// */ -// void setKeepMode(boolean isKeep); -// -// /** @return true if merge mode is chosen, and false otherwise */ -// boolean isMergeMode(); -// -// /** -// * Select merge mode. -// * -// * @param isMerge -// * true to select merge mode, false not to select -// */ -// void setMergeMode(boolean isMerge); - /**IDEUI-166 No cursor in terminal diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.java index b1de1db43b..3611ed9cef 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.git.client.reset.commit; +import com.google.gwt.view.client.SelectionModel; import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.ide.ext.git.client.GitResources; @@ -22,10 +23,12 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.ScrollEvent; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.client.DOM; @@ -59,12 +62,10 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView { RadioButton mixed; @UiField RadioButton hard; - // @UiField -// RadioButton keep; -// @UiField -// RadioButton merge; Button btnReset; Button btnCancel; + @UiField + ScrollPanel revisionsPanel; @UiField(provided = true) CellTable commits; @UiField(provided = true) @@ -130,8 +131,6 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView { addDescription(soft, locale.resetSoftTypeDescription()); addDescription(mixed, locale.resetMixedTypeDescription()); addDescription(hard, locale.resetHardTypeDescription()); -// addDescription(keep, locale.resetKeepTypeDescription()); -// addDescription(merge, locale.resetMergeTypeDescription()); } /** @@ -214,14 +213,17 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView { @Override public void setRevisions(@NotNull List revisions) { // Wraps Array in java.util.List - List list = new ArrayList(); - for (int i = 0; i < revisions.size(); i++) { - list.add(revisions.get(i)); - } + List list = new ArrayList<>(); + list.addAll(revisions); this.commits.setRowData(list); } + @Override + public void resetRevisionSelection() { + ((SingleSelectionModel) commits.getSelectionModel()).clear(); + } + /** {@inheritDoc} */ @Override public boolean isSoftMode() { @@ -258,30 +260,6 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView { hard.setValue(isHard); } -// /** {@inheritDoc} */ -// @Override -// public boolean isKeepMode() { -// return keep.getValue(); -// } -// -// /** {@inheritDoc} */ -// @Override -// public void setKeepMode(boolean isKeep) { -// keep.setValue(isKeep); -// } -// -// /** {@inheritDoc} */ -// @Override -// public boolean isMergeMode() { -// return merge.getValue(); -// } -// -// /** {@inheritDoc} */ -// @Override -// public void setMergeMode(boolean isMerge) { -// merge.setValue(isMerge); -// } - /** {@inheritDoc} */ @Override public void setEnableResetButton(final boolean enabled) { @@ -312,4 +290,15 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView { this.delegate = delegate; } + @UiHandler("revisionsPanel") + public void onPanelScrolled(ScrollEvent ignored) { + // We cannot rely on exact equality of scroll positions because GWT sometimes round such values + // and it is possible that the actual max scroll position is a pixel less then declared. + if (revisionsPanel.getMaximumVerticalScrollPosition() - revisionsPanel.getVerticalScrollPosition() <= 1) { + // to avoid autoscrolling to selected item + revisionsPanel.getElement().focus(); + + delegate.onScrolledToBottom(); + } + } } diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.ui.xml b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.ui.xml index 47df3c3cf8..a72e753ca6 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.ui.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitViewImpl.ui.xml @@ -47,18 +47,10 @@ - - - - - - - - - + diff --git a/plugins/plugin-git/pom.xml b/plugins/plugin-git/pom.xml index b00898b7b2..cc886b9d3e 100644 --- a/plugins/plugin-git/pom.xml +++ b/plugins/plugin-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-git-parent diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml index 6182677b97..ecfbd5a17a 100644 --- a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml +++ b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-factory-resolver jar diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index 74bc63a348..ce7d42c36d 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-ide jar diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml index 3b0648bca8..cb0f468c20 100644 --- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml +++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-oauth2 jar diff --git a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml index cfe760e331..31838a84b7 100644 --- a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml +++ b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-provider-github Che Plugin :: Github :: Credential provider diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml index 4bfbf1daf2..8055cbf98a 100644 --- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml +++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-pullrequest Che Plugin :: Github :: Pull request diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml index faf75a628d..89623b5573 100644 --- a/plugins/plugin-github/che-plugin-github-server/pom.xml +++ b/plugins/plugin-github/che-plugin-github-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-server jar diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml index b38722cc1d..a800bc341c 100644 --- a/plugins/plugin-github/che-plugin-github-shared/pom.xml +++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-github-shared Che Plugin :: Github :: Shared diff --git a/plugins/plugin-github/pom.xml b/plugins/plugin-github/pom.xml index 3ba0e8547b..61a40e7e62 100644 --- a/plugins/plugin-github/pom.xml +++ b/plugins/plugin-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-github-parent diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml index 3d04b13a5e..b2cf809cda 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-gwt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-gwt-ext-gwt jar diff --git a/plugins/plugin-gwt/pom.xml b/plugins/plugin-gwt/pom.xml index 58e6636363..496761d7b0 100644 --- a/plugins/plugin-gwt/pom.xml +++ b/plugins/plugin-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-gwt-parent diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml index cc52f239c8..441a2388a6 100644 --- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml +++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-help-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-help-ext-client jar diff --git a/plugins/plugin-help/pom.xml b/plugins/plugin-help/pom.xml index 50bec470a5..9a12b7dba9 100644 --- a/plugins/plugin-help/pom.xml +++ b/plugins/plugin-help/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-help-parent diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml index eb2475919a..e33e942bf5 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-debugger-ide jar diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml index 0e21a4bbd6..e29b66bfd2 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-debugger-server jar diff --git a/plugins/plugin-java-debugger/pom.xml b/plugins/plugin-java-debugger/pom.xml index bf12c3bb6f..c483fa2fde 100644 --- a/plugins/plugin-java-debugger/pom.xml +++ b/plugins/plugin-java-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-debugger-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml index 438ca3c967..c84b5d4d41 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.core.filebuffers jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml index e67879f7b1..d905f64327 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.core.filesystem jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml index 60bc425e2c..fd7d696f5f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.core.resources jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml index af375b1822..bf24254f44 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.jdt.ui jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml index 6e80970cd9..b3136d2383 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.jface.text jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml index b3de95288c..774fc47db5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.jface jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml index 9ef153a429..ee578d4a9c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.ltk.core.refactoring jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml index d92f8c613d..bc944cf5bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.search jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml index 8784f03017..6d0e8d5ebc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.ui.ide jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml index 8ab8027b40..7f430b4546 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-ext-jdt-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml index 9f0d565aa4..025ae86f14 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-ext-lang-client jar diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml index 70b5a28e22..780562a06d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-ext-lang-server Che Plugin :: Java :: Extension Java Server diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml index 68eaddf706..32fde1d457 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-ext-lang-shared Che Plugin :: Java :: Extension Java Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml index e6bf1403ba..2a15954d16 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-plain-ide jar diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml index 0c71eee6c5..6903fe4a1d 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-plain-server Che Plugin :: Java :: Plain :: Server diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml index 3ec8b8fdc6..2954c62183 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-plain-shared Che Plugin :: Java :: Plain :: Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/pom.xml b/plugins/plugin-java/che-plugin-java-plain/pom.xml index b79969b416..f5adaa9cd6 100644 --- a/plugins/plugin-java/che-plugin-java-plain/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-java-plain diff --git a/plugins/plugin-java/pom.xml b/plugins/plugin-java/pom.xml index 57cd2986a4..90e4bfd86e 100644 --- a/plugins/plugin-java/pom.xml +++ b/plugins/plugin-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-java-parent diff --git a/plugins/plugin-json/che-plugin-json-server/pom.xml b/plugins/plugin-json/che-plugin-json-server/pom.xml index 5b3715a1c3..5770cf8487 100644 --- a/plugins/plugin-json/che-plugin-json-server/pom.xml +++ b/plugins/plugin-json/che-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-json-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-json-server Che Plugin :: JSON :: Extension Server diff --git a/plugins/plugin-json/pom.xml b/plugins/plugin-json/pom.xml index 42024acea4..f048881abe 100644 --- a/plugins/plugin-json/pom.xml +++ b/plugins/plugin-json/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-json-parent diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml index 348d836731..c32e14d46f 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-keybinding-eclipse-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-ide @@ -47,10 +47,6 @@ org.eclipse.che.plugin che-plugin-java-ext-lang-client - - org.eclipse.che.plugin - che-plugin-testing-junit-ide - diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java index 6519f01d8d..aceb7c4239 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java @@ -49,8 +49,6 @@ import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.RESUME_EXECU import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.STEP_INTO_ID; import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.STEP_OUT_ID; import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.STEP_OVER_ID; -import static org.eclipse.che.plugin.testing.junit.ide.JUnitTestAction.TEST_ACTION_RUN_ALL; -import static org.eclipse.che.plugin.testing.junit.ide.JUnitTestAction.TEST_ACTION_RUN_CLASS; @Extension(title = "Key Binding Eclipse") public class EclipseKeyBinding { @@ -100,15 +98,6 @@ public class EclipseKeyBinding { keys.put(JAVA_MOVE_REFACTORING, new KeyBuilder().alt().charCode('V').build()); } - // JUnit Keys - if (UserAgent.isMac()) { - keys.put(TEST_ACTION_RUN_ALL, new KeyBuilder().control().alt().charCode('z').build()); - keys.put(TEST_ACTION_RUN_CLASS, new KeyBuilder().control().shift().charCode('z').build()); - } else { - keys.put(TEST_ACTION_RUN_ALL, new KeyBuilder().action().alt().charCode('z').build()); - keys.put(TEST_ACTION_RUN_CLASS, new KeyBuilder().action().shift().charCode('z').build()); - } - // Git keys keys.put(GIT_COMPARE_WITH_LATEST, new KeyBuilder().action().alt().charCode('d').build()); diff --git a/plugins/plugin-keybinding-eclipse/pom.xml b/plugins/plugin-keybinding-eclipse/pom.xml index 1e8e5cf188..0f4b80e5f2 100644 --- a/plugins/plugin-keybinding-eclipse/pom.xml +++ b/plugins/plugin-keybinding-eclipse/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-parent diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml index 1f3e765fbe..9de50941c3 100644 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-languageserver-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT .. che-plugin-languageserver-ide diff --git a/plugins/plugin-languageserver/pom.xml b/plugins/plugin-languageserver/pom.xml index 8f46d1c786..06b92060c8 100644 --- a/plugins/plugin-languageserver/pom.xml +++ b/plugins/plugin-languageserver/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-languageserver-parent diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml index d6df6a6e81..a4105fbd84 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-machine-ext-server diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index 60767b518a..f0c6e16725 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-machine-ssh-client jar diff --git a/plugins/plugin-machine/pom.xml b/plugins/plugin-machine/pom.xml index bedffb2304..32ce397240 100644 --- a/plugins/plugin-machine/pom.xml +++ b/plugins/plugin-machine/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-machine-parent diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml index babf7bf85b..4bd084b732 100644 --- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-maven-generator-archetype jar diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index a805f84ac3..bc54100bf5 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-maven-ide Che Plugin :: Maven :: Extension Maven Client diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml index 5b4e9ec86b..bc4c5a5f39 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-maven-server jar diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml index fa2ebc36e6..d9a75bd01c 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-maven-shared Che Plugin :: Maven :: Extension Maven Shared diff --git a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml index f0b67f62d4..06b8c3bece 100644 --- a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-java-maven-tools jar diff --git a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml index 3a05fe3fd8..dc737a202f 100644 --- a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-maven-wsmaster jar diff --git a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml index 234a9a11e2..755bbf41cf 100644 --- a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT maven-server-api jar diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml index 26d23daeba..b16284d22b 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT maven-server-impl jar diff --git a/plugins/plugin-maven/maven-server/pom.xml b/plugins/plugin-maven/maven-server/pom.xml index ad50d5b269..e868706e99 100644 --- a/plugins/plugin-maven/maven-server/pom.xml +++ b/plugins/plugin-maven/maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-maven-server pom diff --git a/plugins/plugin-maven/pom.xml b/plugins/plugin-maven/pom.xml index 8248d4b0fb..1a5eac66ed 100644 --- a/plugins/plugin-maven/pom.xml +++ b/plugins/plugin-maven/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-maven-parent diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml index 0eae142184..51a1fe024f 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-debugger-ide jar diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml index 9985817d77..9bf6ad7712 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-debugger-server jar diff --git a/plugins/plugin-nodejs-debugger/pom.xml b/plugins/plugin-nodejs-debugger/pom.xml index 2995bb9838..54ef0b8d2c 100644 --- a/plugins/plugin-nodejs-debugger/pom.xml +++ b/plugins/plugin-nodejs-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-debugger-parent pom diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml index 5085c6b091..b195ce1578 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-lang-ide jar diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml index afc4e6beb9..a768936e26 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-lang-server Che Plugin :: NodeJs :: Extension Server diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml index b22da0e6e9..fd23f6c356 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-nodejs-lang-shared Che Plugin :: NodeJs :: Extension Shared diff --git a/plugins/plugin-nodejs/pom.xml b/plugins/plugin-nodejs/pom.xml index 9e2f15a0ad..fb5a6b566f 100644 --- a/plugins/plugin-nodejs/pom.xml +++ b/plugins/plugin-nodejs/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-nodejs-parent diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml index 5ea6ca5221..3574870af4 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-orion-compare jar diff --git a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml index 57206f2823..052bf28bee 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-orion-editor diff --git a/plugins/plugin-orion/pom.xml b/plugins/plugin-orion/pom.xml index 45d4db84ff..c5c7d3963d 100644 --- a/plugins/plugin-orion/pom.xml +++ b/plugins/plugin-orion/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-orion-parent diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml index 801e8eaa2e..f0c36566d5 100644 --- a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-php-lang-ide jar diff --git a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml index e2d30c5fa1..9f2dfc54ee 100644 --- a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-php-lang-server Che Plugin :: PHP :: Extension Server diff --git a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml index e1ad0bdb75..ecf5c2f750 100644 --- a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-php-lang-shared Che Plugin :: PHP :: Shared diff --git a/plugins/plugin-php/pom.xml b/plugins/plugin-php/pom.xml index 406467c84d..1edb70625e 100644 --- a/plugins/plugin-php/pom.xml +++ b/plugins/plugin-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-php-parent diff --git a/plugins/plugin-product-info/pom.xml b/plugins/plugin-product-info/pom.xml index 4b361e64c6..099e254f2a 100644 --- a/plugins/plugin-product-info/pom.xml +++ b/plugins/plugin-product-info/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-product-info diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml index 2f347b36be..9fa3ed4280 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-pullrequest-ide Che Plugin :: Pull request :: IDE diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml index 9e2057c8be..9603313113 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-pullrequest-server Che Plugin :: Pull request :: Server diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml index 569e9409f9..960cb4b8eb 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-pullrequest-shared Che Plugin :: Pull request :: Shared diff --git a/plugins/plugin-pullrequest-parent/pom.xml b/plugins/plugin-pullrequest-parent/pom.xml index 09883cab0c..5d56b441e3 100644 --- a/plugins/plugin-pullrequest-parent/pom.xml +++ b/plugins/plugin-pullrequest-parent/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-pullrequest-parent pom diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml index 3e5dd3813e..65c5fcbd58 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-python-lang-ide jar diff --git a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml index f9593c690c..0ce7a22b58 100644 --- a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-python-lang-server Che Plugin :: Python :: Extension Server diff --git a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml index 87fd8236ad..281a91911c 100644 --- a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-python-lang-shared che-plugin-python-lang-shared diff --git a/plugins/plugin-python/pom.xml b/plugins/plugin-python/pom.xml index 9fee0e8324..0ed186b056 100644 --- a/plugins/plugin-python/pom.xml +++ b/plugins/plugin-python/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-python-parent diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml index fe21a6127c..3ea917b21b 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-sdk-ext-plugins jar diff --git a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml index e3899dc7a1..ba344a642e 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-sdk-tools jar diff --git a/plugins/plugin-sdk/pom.xml b/plugins/plugin-sdk/pom.xml index f42697a61f..725368bd80 100644 --- a/plugins/plugin-sdk/pom.xml +++ b/plugins/plugin-sdk/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-sdk-parent diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml index 6ffae4733a..660c54e7ec 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-svn-ext-ide jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml index 7cf8d451fe..c2908acf9c 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-svn-ext-server jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml index c1454b3700..c360fbf3f0 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-svn-ext-shared jar diff --git a/plugins/plugin-svn/pom.xml b/plugins/plugin-svn/pom.xml index eef41b9aa1..45189b260e 100644 --- a/plugins/plugin-svn/pom.xml +++ b/plugins/plugin-svn/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-svn-parent diff --git a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml index 0f701a84fc..7c383092bb 100644 --- a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-classpath Che Plugin :: Java Testing :: Classpath diff --git a/plugins/plugin-testing-java/plugin-testing-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java b/plugins/plugin-testing-java/plugin-testing-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java index 0723fb0e83..bd2100da10 100644 --- a/plugins/plugin-testing-java/plugin-testing-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java +++ b/plugins/plugin-testing-java/plugin-testing-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java @@ -30,17 +30,29 @@ import org.eclipse.jdt.internal.core.JavaModelManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.net.Socket; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Random; /** * Abstract java test runner. * Can recognize test methods, find java project and compilation unit by path. */ public abstract class AbstractJavaTestRunner implements TestRunner { + private static final Logger LOG = LoggerFactory.getLogger(AbstractJavaTestRunner.class); + private static final String TEST_OUTPUT_FOLDER = "/test-output"; - private static final Logger LOG = LoggerFactory.getLogger(AbstractJavaTestRunner.class); + protected static final String JAVA_EXECUTABLE = "java"; + + private int debugPort = -1; + private String workspacePath; + + public AbstractJavaTestRunner(String workspacePath) { + this.workspacePath = workspacePath; + } @Override public List detectTests(TestDetectionContext context) { @@ -100,6 +112,25 @@ public abstract class AbstractJavaTestRunner implements TestRunner { return JavaModelManager.getJavaModelManager().getJavaModel().getJavaProject(project); } + protected String getOutputDirectory(IJavaProject javaProject) { + String path = workspacePath + javaProject.getPath() + TEST_OUTPUT_FOLDER; + try { + IClasspathEntry[] resolvedClasspath = javaProject.getResolvedClasspath(true); + for (IClasspathEntry iClasspathEntry : resolvedClasspath) { + if (iClasspathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) { + IPath outputLocation = iClasspathEntry.getOutputLocation(); + if (outputLocation == null) { + continue; + } + return workspacePath + outputLocation.removeLastSegments(1).append(TEST_OUTPUT_FOLDER); + } + } + } catch (JavaModelException e) { + return path; + } + return path; + } + protected ICompilationUnit findCompilationUnitByPath(IJavaProject javaProject, String filePath) { try { IClasspathEntry[] resolvedClasspath = javaProject.getResolvedClasspath(false); @@ -134,7 +165,25 @@ public abstract class AbstractJavaTestRunner implements TestRunner { @Override public int getDebugPort() { - return -1; + return debugPort; + } + + protected void generateDebuggerPort() { + Random random = new Random(); + int port = random.nextInt(65535); + if (isPortAvailable(port)) { + debugPort = port; + } else { + generateDebuggerPort(); + } + } + + private static boolean isPortAvailable(int port) { + try (Socket ignored = new Socket("localhost", port)) { + return false; + } catch (IOException ignored) { + return true; + } } private RuntimeException getRuntimeException(String filePath) { diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml deleted file mode 100644 index 6e214796e2..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - che-plugin-testing-junit - org.eclipse.che.plugin - 5.15.0-SNAPSHOT - - che-plugin-testing-junit-ide - Che Plugin :: Java Testing :: JUnit IDE - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-commons-gwt - - - org.eclipse.che.core - che-core-ide-api - - - org.eclipse.che.plugin - che-plugin-java-ext-lang-client - - - org.eclipse.che.plugin - che-plugin-testing-ide - - - org.vectomatic - lib-gwt-svg - - - com.google.gwt - gwt-user - provided - - - com.google.gwt.inject - gin - provided - - - - - - src/main/java - - **/*.java - - - - src/main/resources - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestAction.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestAction.java deleted file mode 100644 index 5e126469e9..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestAction.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide; - -import org.eclipse.che.ide.api.action.Action; -import org.eclipse.che.ide.api.action.ActionManager; -import org.eclipse.che.ide.api.action.DefaultActionGroup; -import org.eclipse.che.ide.api.keybinding.KeyBindingAgent; -import org.eclipse.che.ide.api.keybinding.KeyBuilder; -import org.eclipse.che.ide.util.browser.UserAgent; -import org.eclipse.che.plugin.testing.ide.TestAction; -import org.eclipse.che.plugin.testing.junit.ide.action.RunAllTestAction; -import org.eclipse.che.plugin.testing.junit.ide.action.RunClassTestAction; - -import com.google.inject.Inject; - -/** - * JUnit 3.x and 4.x ide implementation. - * - * @author Mirage Abeysekara - */ -public class JUnitTestAction implements TestAction { - public static final String TEST_ACTION_RUN_CLASS = "TestJUnitActionRunClassContext"; - public static final String TEST_ACTION_RUN_ALL = "TestJUnitActionRunAllContext"; - private final Action runClassContextTestAction; - private final Action runAllContextTestAction; - - @Inject - public JUnitTestAction(ActionManager actionManager, - RunClassTestAction runClassContextTestAction, - RunAllTestAction runAllContextTestAction, - KeyBindingAgent keyBinding) { - actionManager.registerAction(TEST_ACTION_RUN_CLASS, runClassContextTestAction); - actionManager.registerAction(TEST_ACTION_RUN_ALL, runAllContextTestAction); - - if (UserAgent.isMac()) { - keyBinding.getGlobal().addKey(new KeyBuilder().control().alt().charCode('z').build(), TEST_ACTION_RUN_ALL); - keyBinding.getGlobal().addKey(new KeyBuilder().control().shift().charCode('z').build(), TEST_ACTION_RUN_CLASS); - } else { - keyBinding.getGlobal().addKey(new KeyBuilder().action().alt().charCode('z').build(), TEST_ACTION_RUN_ALL); - keyBinding.getGlobal().addKey(new KeyBuilder().action().shift().charCode('z').build(), TEST_ACTION_RUN_CLASS); - } - - this.runClassContextTestAction = runClassContextTestAction; - this.runAllContextTestAction = runAllContextTestAction; - } - - - @Override - public void addMainMenuItems(DefaultActionGroup testMainMenu) { - testMainMenu.add(runClassContextTestAction); - testMainMenu.add(runAllContextTestAction); - } - - @Override - public void addContextMenuItems(DefaultActionGroup testContextMenu) { - testContextMenu.add(runClassContextTestAction); - testContextMenu.add(runAllContextTestAction); - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.java deleted file mode 100644 index f1be10505b..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide; - -import com.google.gwt.i18n.client.Messages; - -/** - * Localization constants. Interface to represent the constants defined in resource bundle: - * 'JUnitTestLocalizationConstant.properties'. - * - * @author Mirage Abeysekara - */ -public interface JUnitTestLocalizationConstant extends Messages { - - @Key("action.runClass.title") - String actionRunClassTitle(); - - @Key("action.runClass.description") - String actionRunClassDescription(); - - @Key("action.runAll.title") - String actionRunAllTitle(); - - @Key("action.runAll.description") - String actionRunAllDescription(); -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestResources.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestResources.java deleted file mode 100644 index e629035a92..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/JUnitTestResources.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide; - -import org.vectomatic.dom.svg.ui.SVGResource; - -import com.google.gwt.resources.client.ClientBundle; -/** - * - * @author Mirage Abeysekara - */ -public interface JUnitTestResources extends ClientBundle { - - @Source("org/eclipse/che/plugin/testing/junit/ide/svg/test.svg") - SVGResource testIcon(); - - @Source("org/eclipse/che/plugin/testing/junit/ide/svg/test_all.svg") - SVGResource testAllIcon(); - -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java deleted file mode 100644 index 224b05c9b6..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide.action; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; -import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.resources.Project; -import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.plugin.testing.ide.TestServiceClient; -import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate; -import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter; -import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant; -import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources; - -import javax.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Collections.singletonList; -import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; - -/** - * @author Mirage Abeysekara - * @author David Festal - */ -public class RunAllTestAction extends AbstractPerspectiveAction - implements RunTestActionDelegate.Source { - - private final NotificationManager notificationManager; - private final TestResultPresenter presenter; - private final TestServiceClient service; - private final AppContext appContext; - private final RunTestActionDelegate delegate; - - @Inject - public RunAllTestAction(JUnitTestResources resources, - NotificationManager notificationManager, - AppContext appContext, - TestResultPresenter presenter, - TestServiceClient service, - JUnitTestLocalizationConstant localization) { - super(singletonList(PROJECT_PERSPECTIVE_ID), localization.actionRunAllTitle(), - localization.actionRunAllDescription(), null, resources.testAllIcon()); - this.notificationManager = notificationManager; - this.presenter = presenter; - this.service = service; - this.appContext = appContext; - this.delegate = new RunTestActionDelegate(this); - } - - @Override - public void actionPerformed(ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource != null) { - Project project = resource.getProject(); - if (project != null) { - Map parameters = new HashMap<>(); - delegate.doRunTests(e, parameters); - } - } - } - - @Override - public void updateInPerspective(@NotNull ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource == null || resource.getProject() == null) { - e.getPresentation().setEnabledAndVisible(false); - return; - } - - e.getPresentation().setVisible(true); - - String projectType = resource.getProject().getType(); - boolean enable = "maven".equals(projectType); - e.getPresentation().setEnabled(enable); - } - - @Override - public NotificationManager getNotificationManager() { - return notificationManager; - } - - @Override - public AppContext getAppContext() { - return appContext; - } - - @Override - public TestServiceClient getService() { - return service; - } - - @Override - public TestResultPresenter getPresenter() { - return presenter; - } - - @Override - public String getTestingFramework() { - return "junit"; - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java deleted file mode 100644 index d078bd2a67..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide.action; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; -import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.resources.File; -import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.ide.api.resources.VirtualFile; -import org.eclipse.che.ide.ext.java.client.util.JavaUtil; -import org.eclipse.che.plugin.testing.ide.TestServiceClient; -import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate; -import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter; -import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant; -import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources; - -import javax.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Collections.singletonList; -import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; - -/** - * @author Mirage Abeysekara - * @author David Festal - */ -public class RunClassTestAction extends AbstractPerspectiveAction - implements RunTestActionDelegate.Source { - - private final NotificationManager notificationManager; - private final TestResultPresenter presenter; - private final TestServiceClient service; - private final AppContext appContext; - private final RunTestActionDelegate delegate; - - @Inject - public RunClassTestAction(JUnitTestResources resources, - NotificationManager notificationManager, - AppContext appContext, - TestResultPresenter presenter, - TestServiceClient service, - JUnitTestLocalizationConstant localization) { - super(singletonList(PROJECT_PERSPECTIVE_ID), localization.actionRunClassTitle(), - localization.actionRunClassDescription(), null, resources.testIcon()); - this.notificationManager = notificationManager; - this.presenter = presenter; - this.service = service; - this.appContext = appContext; - this.delegate = new RunTestActionDelegate(this); - } - - @Override - public void actionPerformed(ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource instanceof File) { - File file = ((File)resource); - String fqn = JavaUtil.resolveFQN((VirtualFile)file); - Map parameters = new HashMap<>(); - parameters.put("fqn", fqn); - parameters.put("runClass", "true"); - delegate.doRunTests(e, parameters); - } - } - - @Override - public void updateInPerspective(@NotNull ActionEvent e) { - Resource resource = appContext.getResource(); - if (!(resource instanceof File) || resource.getProject() == null) { - e.getPresentation().setEnabledAndVisible(false); - return; - } - - e.getPresentation().setVisible(true); - - String projectType = resource.getProject().getType(); - if (!"maven".equals(projectType)) { - e.getPresentation().setEnabled(false); - } - - boolean enable = "java".equals(((File)resource).getExtension()); - e.getPresentation().setEnabled(enable); - } - - @Override - public NotificationManager getNotificationManager() { - return notificationManager; - } - - @Override - public AppContext getAppContext() { - return appContext; - } - - @Override - public TestServiceClient getService() { - return service; - } - - @Override - public TestResultPresenter getPresenter() { - return presenter; - } - - - @Override - public String getTestingFramework() { - return "junit"; - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/inject/JUnitGinModule.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/inject/JUnitGinModule.java deleted file mode 100644 index a84f1dd80d..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/inject/JUnitGinModule.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.junit.ide.inject; - -import org.eclipse.che.ide.api.extension.ExtensionGinModule; -import org.eclipse.che.plugin.testing.ide.TestAction; -import org.eclipse.che.plugin.testing.junit.ide.JUnitTestAction; - -import com.google.gwt.inject.client.AbstractGinModule; -import com.google.gwt.inject.client.multibindings.GinMultibinder; - -/** - * - * @author Mirage Abeysekara - */ -@ExtensionGinModule -public class JUnitGinModule extends AbstractGinModule { - @Override - protected void configure() { - GinMultibinder.newSetBinder(binder(), TestAction.class).addBinding().to(JUnitTestAction.class); - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml deleted file mode 100644 index f838358478..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/JUnit.gwt.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.properties b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.properties deleted file mode 100644 index ffb99f1647..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/JUnitTestLocalizationConstant.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2012-2017 Codenvy, S.A. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Codenvy, S.A. - initial API and implementation -# - - - -##### Actions ##### -action.runClass.title = JUnit Class -action.runClass.description = Run the JUnit test cases - -action.runAll.title = JUnit Project -action.runAll.description = Run all JUnit test cases - diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test.svg b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test.svg deleted file mode 100644 index 79b385d2dd..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test_all.svg b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test_all.svg deleted file mode 100644 index 42353ffae0..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/resources/org/eclipse/che/plugin/testing/junit/ide/svg/test_all.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml new file mode 100644 index 0000000000..b6e7bbfb4a --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml @@ -0,0 +1,28 @@ + + + + 4.0.0 + + che-plugin-testing-junit + org.eclipse.che.plugin + 5.16.0-SNAPSHOT + + che-plugin-testing-junit-runtime + + + junit + junit + + + diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/TestingMessageHelper.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/TestingMessageHelper.java new file mode 100644 index 0000000000..d0ba251172 --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/TestingMessageHelper.java @@ -0,0 +1,316 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit; + + +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.StringJoiner; + +/** + * Class annalise an output information from test runner and redirect it to the special stream. + */ +public class TestingMessageHelper { + private static final char ESCAPE_SEPARATOR = '!'; + private static final String TEST_REPORTER_ATTACHED = "testReporterAttached"; + private static final String ROOT_NAME = "rootName"; + private static final String NAME = "name"; + private static final String LOCATION = "location"; + private static final String TEST_STARTED = "testStarted"; + private static final String TEST_IGNORED = "testIgnored"; + private static final String TEST_FINISHED = "testFinished"; + private static final String DURATION = "duration"; + private static final String SUITE_TREE_NODE = "suiteTreeNode"; + private static final String TEST_SUITE_FINISHED = "testSuiteFinished"; + private static final String TEST_SUITE_STARTED = "testSuiteStarted"; + private static final String SUITE_TREE_STARTED = "suiteTreeStarted"; + private static final String SUITE_TREE_ENDED = "suiteTreeEnded"; + private static final String MESSAGE = "message"; + private static final String DETAILS = "details"; + private static final String TEST_FAILED = "testFailed"; + + /** + * Prints a message when the test reported was attached. + * + * @param out + * output stream + */ + public static void reporterAttached(PrintStream out) { + out.println(create(TEST_REPORTER_ATTACHED, (List)null)); + } + + /** + * Prints an information about the root test execution. + * + * @param out + * output stream + * @param description + * information about test cass + */ + public static void rootPresentation(PrintStream out, Description description) { + out.println(create(ROOT_NAME, + new Pair(NAME, "Default Suite"), + new Pair(LOCATION, "file://" + description.getClassName()))); + } + + /** + * Prints an information when an atomic test is about to be started. + * + * @param description + * information about test + * @param out + * output stream + */ + public static void testStarted(PrintStream out, Description description) { + String location = description.getClassName() + "." + description.getMethodName(); + out.println(create(TEST_STARTED, + new Pair(NAME, escape(description.getMethodName())), + new Pair(LOCATION, "java:test://" + escape(location)))); + } + + /** + * Prints an information when a test will not be run. + * + * @param name + * method name + * @param out + * output stream + */ + public static void testIgnored(PrintStream out, String name) { + out.println(create(TEST_IGNORED, new Pair(NAME, escape(name)))); + } + + /** + * Prints an information when an atomic test has finished. + * + * @param description + * information about test method + * @param out + * output stream + * @param duration + * time of test running + */ + public static void testFinished(PrintStream out, Description description, long duration) { + out.println(create(TEST_FINISHED, + new Pair(NAME, escape(description.getMethodName())), + new Pair(DURATION, String.valueOf(duration)))); + } + + /** + * Prints an information when an test node has added. + * + * @param description + * information about test node + * @param out + * output stream + */ + public static void treeNode(PrintStream out, Description description) { + String location = description.getClassName() + "." + description.getMethodName(); + out.println(create(SUITE_TREE_NODE, + new Pair(NAME, escape(description.getMethodName())), + new Pair(LOCATION, "java:test://" + escape(location)))); + } + + /** + * Prints an information when running of test suite started. + * + * @param currentSuite + * name of test suite + * @param out + * output stream + */ + public static void testSuiteFinished(PrintStream out, String currentSuite) { + out.println(create(TEST_SUITE_FINISHED, new Pair(NAME, escape(currentSuite)))); + } + + /** + * Prints an information when running of test suite started. + * + * @param description + * information about suite + * @param out + * output stream + */ + public static void testSuiteStarted(PrintStream out, Description description) { + out.println(create(TEST_SUITE_STARTED, + new Pair(NAME, escape(description.getClassName())), + new Pair(LOCATION, escape(description.getClassName())))); + } + + /** + * Prints an information when building of test tree started. + * + * @param description + * information about suite + * @param out + * output stream + */ + public static void suiteTreeNodeStarted(PrintStream out, Description description) { + out.println(create(SUITE_TREE_STARTED, + new Pair(NAME, escape(description.getClassName())), + new Pair(LOCATION, "java:test://" + escape(description.getClassName())))); + } + + /** + * Prints an information when building of test tree ended. + * + * @param description + * information about suite + * @param out + * output stream + */ + public static void suiteTreeNodeEnded(PrintStream out, Description description) { + out.println(create(SUITE_TREE_ENDED, + new Pair(NAME, escape(description.getClassName())), + new Pair(LOCATION, "java:test://" + escape(description.getClassName())))); + } + + /** + * Prints an information when a test fails. + * + * @param out + * output stream + * @param failure + * describes the test that failed and the exception that was thrown + * @param duration + * time of test running + */ + public static void testFailed(PrintStream out, Failure failure, long duration) { + List attributes = new ArrayList<>(); + attributes.add(new Pair(NAME, escape(failure.getDescription().getMethodName()))); + Throwable exception = failure.getException(); + if (exception != null) { + String failMessage = failure.getMessage(); + StringWriter writer = new StringWriter(); + PrintWriter printWriter = new PrintWriter(writer); + exception.printStackTrace(printWriter); + String stackTrace = writer.getBuffer().toString(); + attributes.add(new Pair(MESSAGE, escape(failMessage))); + attributes.add(new Pair(DETAILS, escape(stackTrace))); + } else { + attributes.add(new Pair(MESSAGE, "")); + } + attributes.add(new Pair(DURATION, String.valueOf(duration))); + + out.println(create(TEST_FAILED, attributes)); + } + + /** + * Prints an information about result of the test running. + * + * @param out + * output stream + * @param result + * the summary of the test run, including all the tests that failed + */ + public static void testRunFinished(PrintStream out, Result result) { + out.printf("Total tests run: %d, Failures: %d, Skips: %d", result.getRunCount(), result.getFailureCount(), result.getIgnoreCount()); + } + + private static String create(String name, Pair... attributes) { + List pairList = null; + if (attributes != null) { + pairList = Arrays.asList(attributes); + } + return create(name, pairList); + } + + private static String create(String name, List attributes) { + StringBuilder builder = new StringBuilder("@@<{\"name\":"); + builder.append('"').append(name).append('"'); + if (attributes != null) { + builder.append(", \"attributes\":{"); + StringJoiner joiner = new StringJoiner(", "); + for (Pair attribute : attributes) { + joiner.add("\"" + attribute.first + "\":\"" + attribute.second + "\""); + } + builder.append(joiner.toString()); + builder.append("}"); + } + + builder.append("}>"); + return builder.toString(); + } + + private static String escape(String str) { + if (str == null) { + return null; + } + + int escapeLength = calculateEscapedStringLength(str); + if (escapeLength == str.length()) { + return str; + } + + char[] chars = new char[escapeLength]; + int currentOffset = 0; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + char escape = escapeChar(c); + if (escape != 0) { + chars[currentOffset++] = ESCAPE_SEPARATOR; + chars[currentOffset++] = escape; + } else { + chars[currentOffset++] = c; + } + } + + return new String(chars); + } + + private static int calculateEscapedStringLength(String string) { + int result = 0; + for (int i = 0; i < string.length(); i++) { + char c = string.charAt(i); + if (escapeChar(c) != 0) { + result += 2; + } else { + result++; + } + } + return result; + } + + private static char escapeChar(char c) { + switch (c) { + case '\n': + return 'n'; + case '\r': + return 'r'; + case '\u0085': + return 'x'; + case '\u2028': + return 'l'; + case '\u2029': + return 'p'; + default: + return 0; + } + } + + private static class Pair { + final String first; + final String second; + + Pair(String first, String second) { + this.first = first; + this.second = second; + } + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitCoreRunner.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitCoreRunner.java new file mode 100644 index 0000000000..067ceb18b2 --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitCoreRunner.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit.junit4; + +import org.eclipse.che.junit.TestingMessageHelper; +import org.eclipse.che.junit.junit4.listeners.CheJUnitTestListener; +import org.eclipse.che.junit.junit4.listeners.JUnitExecutionListener; +import org.junit.runner.Description; +import org.junit.runner.JUnitCore; +import org.junit.runner.Request; +import org.junit.runner.Runner; + +/** + * Custom JUnit4 runner that reports results visa {@link CheJUnitTestListener}. + */ +public class CheJUnitCoreRunner extends JUnitCore { + private CheJUnitTestListener cheJUnitTestListener; + + /** + * Create a request where all tests are described and run it. + * + * @param suites + * the name of the test classes to be executed. + * If array has one element - it is an information about test method to be executed + * (for example full.qualified.ClassName#methodName) + */ + public void run(String[] suites) { + Request request = TestRunnerUtil.buildRequest(suites); + if (request == null) { + TestingMessageHelper.reporterAttached(System.out); + System.err.print("No test found to run."); + } else { + Runner runner = request.getRunner(); + Description description = runner.getDescription(); + + if (cheJUnitTestListener != null) { + cheJUnitTestListener.suiteTreeStarted(description); + cheJUnitTestListener.suiteSendTree(description); + cheJUnitTestListener.suiteTreeEnded(description); + } + + super.run(request); + } + } + + /** + * Creates custom listener {@link CheJUnitTestListener} and adds it to + */ + public void createListener() { + cheJUnitTestListener = new CheJUnitTestListener(); + this.addListener(new JUnitExecutionListener(cheJUnitTestListener)); + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitLauncher.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitLauncher.java new file mode 100644 index 0000000000..79589a4263 --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/CheJUnitLauncher.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit.junit4; + +import org.eclipse.che.junit.TestingMessageHelper; + +/** + * Main JUnit4 test runner. + */ +public class CheJUnitLauncher { + /** + * Main method which creates an instance of {@link org.junit.runner.JUnitCore}, adds custom listener and runs all tests. + * + * @param args + * arrays of tests to be executed + */ + public static void main(String[] args) { + CheJUnitCoreRunner jUnitCore = new CheJUnitCoreRunner(); + jUnitCore.createListener(); + if (args.length == 0) { + TestingMessageHelper.reporterAttached(System.out); + System.err.print("No test found to run."); + } else { + jUnitCore.run(args); + } + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/TestRunnerUtil.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/TestRunnerUtil.java new file mode 100644 index 0000000000..6d7c31de9a --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/TestRunnerUtil.java @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit.junit4; + +import org.junit.runner.Request; + +import java.util.LinkedList; +import java.util.List; + +/** + * Utility class for building test executing request. + */ +public class TestRunnerUtil { + /** + * Creates a request which contains all tests to be executed. + * + * @param args + * array of test classes or test method (if args.length == 1) to be executed + * @return an abstract description of tests to be run + */ + public static Request buildRequest(String[] args) { + if (args.length == 0) { + return null; + } + if (args.length == 1) { + String suite = args[0]; + int separatorIndex = suite.indexOf('#'); + return separatorIndex == -1 ? getRequestForClass(suite) : getRequestForOneMethod(suite, separatorIndex); + } + + return getRequestForClasses(args); + } + + private static Request getRequestForOneMethod(String suite, int separatorIndex) { + try { + Class suiteClass = Class.forName(suite.substring(0, separatorIndex)); + String method = suite.substring(separatorIndex + 1); + return Request.method(suiteClass, method); + } catch (ClassNotFoundException e) { + System.err.print("No test found to run. Args is 0"); + return null; + } + } + + private static Request getRequestForClass(String suite) { + try { + return Request.aClass(Class.forName(suite)); + } catch (ClassNotFoundException e) { + System.err.print("No test found to run. Args is 0"); + return null; + } + } + + private static Request getRequestForClasses(String[] args) { + List> suites = new LinkedList<>(); + for (String classFqn : args) { + try { + Class aClass = Class.forName(classFqn); + suites.add(aClass); + } catch (ClassNotFoundException ignored) { + } + } + if (suites.isEmpty()) { + return null; + } + return Request.classes(suites.toArray(new Class[suites.size()])); + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/CheJUnitTestListener.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/CheJUnitTestListener.java new file mode 100644 index 0000000000..115d2c46f9 --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/CheJUnitTestListener.java @@ -0,0 +1,158 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit.junit4.listeners; + +import org.eclipse.che.junit.TestingMessageHelper; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; + +import java.io.PrintStream; + +/** + * Listener for whole life cycle of the JUnit test run. + */ +public class CheJUnitTestListener { + private final PrintStream out; + + private long myCurrentTestStart; + + public CheJUnitTestListener() { + this.out = System.out; + TestingMessageHelper.reporterAttached(out); + } + + /** + * Called before any tests have been run. + * + * @param description + * describes the tests to be run + */ + public void testRunStarted(Description description) { + TestingMessageHelper.rootPresentation(out, description); + } + + /** + * Called when an atomic test is about to be started. + * + * @param description + * the description of the test that is about to be run + * (generally a class and method name) + */ + public void testStarted(Description description) { + myCurrentTestStart = System.currentTimeMillis(); + + TestingMessageHelper.testStarted(out, description); + } + + /** + * Called when an atomic test has finished, whether the test succeeds or fails. + * + * @param description + * the description of the test that just ran + */ + public void testFinished(Description description) { + long duration = System.currentTimeMillis() - myCurrentTestStart; + + TestingMessageHelper.testFinished(out, description, duration); + } + + /** + * Called when test suite starts. + * + * @param description + * the description of the test suite + */ + public void testSuiteStarted(Description description) { + TestingMessageHelper.testSuiteStarted(out, description); + } + + /** + * Called when test suite finished. + * + * @param currentSuite + * name of test suite + */ + public void testSuiteFinished(String currentSuite) { + TestingMessageHelper.testSuiteFinished(out, currentSuite); + } + + /** + * Called when an atomic test fails. + * + * @param failure + * describes the test that failed and the exception that was thrown + */ + public void testFailure(Failure failure) { + long duration = System.currentTimeMillis() - myCurrentTestStart; + + TestingMessageHelper.testFailed(out, failure, duration); + } + + /** + * Called when all tests have finished + * + * @param result + * the summary of the test run, including all the tests that failed + */ + public void testRunFinished(Result result) { + TestingMessageHelper.testRunFinished(out, result); + } + + /** + * Called when a test will not be run, generally because a test method is annotated + * with {@link org.junit.Ignore}. + * + * @param description + * describes the test that will not be run + */ + public void testIgnored(Description description) { + TestingMessageHelper.testIgnored(out, description.getMethodName()); + } + + + /** + * Parse test tree and send atomic test nodes. + * + * @param description + * the description of the test tree + */ + public void suiteSendTree(Description description) { + if (description.isTest()) { + TestingMessageHelper.treeNode(out, description); + } else { + for (Description child : description.getChildren()) { + suiteSendTree(child); + } + } + } + + /** + * Called when build of test tree started. + * + * @param description + * describes the test suite + */ + public void suiteTreeStarted(Description description) { + TestingMessageHelper.suiteTreeNodeStarted(out, description); + } + + /** + * Called when build of test tree finished. + * + * @param description + * describes the test suite + */ + public void suiteTreeEnded(Description description) { + TestingMessageHelper.suiteTreeNodeEnded(out, description); + } + +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/JUnitExecutionListener.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/JUnitExecutionListener.java new file mode 100644 index 0000000000..aa46126bed --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/src/main/java/org/eclipse/che/junit/junit4/listeners/JUnitExecutionListener.java @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.junit.junit4.listeners; + +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; + +/** + * Overridden JUnit run listener {@link RunListener}. + * The listener responds to the events during a test run. + */ +public class JUnitExecutionListener extends RunListener { + private CheJUnitTestListener delegate; + + private String currentSuite; + + public JUnitExecutionListener(CheJUnitTestListener delegate) { + this.delegate = delegate; + currentSuite = ""; + } + + @Override + public void testRunStarted(Description description) throws Exception { + delegate.testRunStarted(description); + } + + @Override + public void testRunFinished(Result result) throws Exception { + if (!currentSuite.isEmpty()) { + delegate.testSuiteFinished(currentSuite); + } + + delegate.testRunFinished(result); + } + + @Override + public void testStarted(Description description) throws Exception { + if (currentSuite.isEmpty()) { + currentSuite = description.getClassName(); + delegate.testSuiteStarted(description); + } else if (!currentSuite.equals(description.getClassName())) { + delegate.testSuiteFinished(currentSuite); + currentSuite = description.getClassName(); + delegate.testSuiteStarted(description); + } + + delegate.testStarted(description); + } + + @Override + public void testFinished(Description description) throws Exception { + delegate.testFinished(description); + } + + @Override + public void testFailure(Failure failure) throws Exception { + delegate.testFailure(failure); + } + + @Override + public void testAssumptionFailure(Failure failure) { + delegate.testFailure(failure); + } + + @Override + public void testIgnored(Description description) throws Exception { + delegate.testIgnored(description); + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml index d37e2e0a15..ce770fb23b 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-junit-server Che Plugin :: Java Testing :: JUnit Server @@ -57,14 +57,26 @@ org.eclipse.che.core che-core-commons-lang + + org.eclipse.che.lib + org-eclipse-jdt-core-repack + org.eclipse.che.plugin che-plugin-testing-classpath + + org.eclipse.che.plugin + che-plugin-testing-junit-runtime + org.javassist javassist + + org.slf4j + slf4j-api + junit junit diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/inject/JunitGuiceModule.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/inject/JunitGuiceModule.java index d655656c89..27c876e846 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/inject/JunitGuiceModule.java +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/inject/JunitGuiceModule.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.che.plugin.testing.junit.server.inject; -import static com.google.inject.multibindings.Multibinder.newSetBinder; - -import org.eclipse.che.api.testing.server.framework.TestRunner; -import org.eclipse.che.inject.DynaModule; -import org.eclipse.che.plugin.testing.junit.server.JUnitTestRunner; - import com.google.inject.AbstractModule; +import org.eclipse.che.inject.DynaModule; +import org.eclipse.che.plugin.testing.junit.server.junit4.JUnit4TestRunner; + +import static com.google.inject.multibindings.Multibinder.newSetBinder; + /** * @author Mirage Abeysekara */ @@ -25,6 +24,6 @@ import com.google.inject.AbstractModule; public class JunitGuiceModule extends AbstractModule { @Override protected void configure() { - newSetBinder(binder(), TestRunner.class).addBinding().to(JUnitTestRunner.class); + newSetBinder(binder(), org.eclipse.che.api.testing.server.framework.TestRunner.class).addBinding().to(JUnit4TestRunner.class); } } diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/junit4/JUnit4TestRunner.java b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/junit4/JUnit4TestRunner.java new file mode 100644 index 0000000000..0c7c3e0635 --- /dev/null +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/src/main/java/org/eclipse/che/plugin/testing/junit/server/junit4/JUnit4TestRunner.java @@ -0,0 +1,231 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.plugin.testing.junit.server.junit4; + +import com.google.inject.name.Named; + +import org.eclipse.che.api.testing.shared.TestExecutionContext; +import org.eclipse.che.api.testing.shared.TestResult; +import org.eclipse.che.api.testing.shared.dto.TestResultDto; +import org.eclipse.che.api.testing.shared.dto.TestResultRootDto; +import org.eclipse.che.commons.lang.execution.CommandLine; +import org.eclipse.che.commons.lang.execution.ExecutionException; +import org.eclipse.che.commons.lang.execution.JavaParameters; +import org.eclipse.che.commons.lang.execution.ProcessHandler; +import org.eclipse.che.plugin.java.testing.AbstractJavaTestRunner; +import org.eclipse.che.plugin.java.testing.ClasspathUtil; +import org.eclipse.che.plugin.java.testing.ProjectClasspathProvider; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IImportDeclaration; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.che.junit.junit4.CheJUnitCoreRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * JUnit implementation for the test runner service. + */ +public class JUnit4TestRunner extends AbstractJavaTestRunner { + private static final Logger LOG = LoggerFactory.getLogger(JUnit4TestRunner.class); + + private static final String JUNIT_TEST_ANNOTATION = "org.junit.Test"; + private static final String JUNIT_TEST_NAME = "junit"; + private static final String MAIN_CLASS_NAME = "org.eclipse.che.junit.junit4.CheJUnitLauncher"; + + private String workspacePath; + private ProjectClasspathProvider classpathProvider; + + @Inject + public JUnit4TestRunner(@Named("che.user.workspaces.storage") String workspacePath, + ProjectClasspathProvider classpathProvider) { + super(workspacePath); + this.workspacePath = workspacePath; + this.classpathProvider = classpathProvider; + } + + @Override + public ProcessHandler execute(TestExecutionContext context) { + IJavaProject javaProject = getJavaProject(context.getProjectPath()); + if (javaProject.exists()) { + return startTestProcess(javaProject, context); + } + + return null; + } + + @Override + public String getName() { + return JUNIT_TEST_NAME; + } + + @Override + public boolean isTestMethod(IMethod method, ICompilationUnit compilationUnit) { + try { + int flags = method.getFlags(); + if (method.isConstructor() || + !Flags.isPublic(flags) || + Flags.isAbstract(flags) || + Flags.isStatic(flags) || + !"V".equals(method.getReturnType())) { // 'V' is void signature + return false; + } + + return isTest(method, compilationUnit); + } catch (JavaModelException ignored) { + return false; + } + } + + private ProcessHandler startTestProcess(IJavaProject javaProject, TestExecutionContext context) { + JavaParameters parameters = new JavaParameters(); + parameters.setJavaExecutable(JAVA_EXECUTABLE); + parameters.setMainClassName(MAIN_CLASS_NAME); + parameters.setWorkingDirectory(workspacePath + javaProject.getPath()); + + List classPath = new ArrayList<>(); + Set projectClassPath = classpathProvider.getProjectClassPath(javaProject); + classPath.addAll(projectClassPath); + classPath.add(ClasspathUtil.getJarPathForClass(CheJUnitCoreRunner.class)); + parameters.getClassPath().addAll(classPath); + + String suite = createTestSuite(context, javaProject); + parameters.getParametersList().add(suite); + if (context.isDebugModeEnable()) { + generateDebuggerPort(); + parameters.getVmParameters().add("-Xdebug"); + parameters.getVmParameters().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + getDebugPort()); + } + CommandLine command = parameters.createCommand(); + try { + return new ProcessHandler(command.createProcess()); + } catch (ExecutionException e) { + LOG.error("Can't run JUnit JVM", e); + } + + return null; + } + + private String createTestSuite(TestExecutionContext context, IJavaProject javaProject) { + switch (context.getTestType()) { + case FILE: + return createClassRequest(javaProject, context.getFilePath()); + case FOLDER: + return createPackageRequest(javaProject, context.getFilePath()); + case PROJECT: + return createProjectRequest(javaProject); + case CURSOR_POSITION: + return createMethodRequest(javaProject, context.getFilePath(), context.getCursorOffset()); + } + + return null; + } + + private String createMethodRequest(IJavaProject javaProject, String filePath, int cursorOffset) { + ICompilationUnit compilationUnit = findCompilationUnitByPath(javaProject, filePath); + IType primaryType = compilationUnit.findPrimaryType(); + String qualifiedName = primaryType.getFullyQualifiedName(); + try { + IJavaElement element = compilationUnit.getElementAt(cursorOffset); + if (element instanceof IMethod) { + IMethod method = (IMethod)element; + qualifiedName = qualifiedName + '#' + method.getElementName(); + } + } catch (JavaModelException e) { + LOG.debug("Can't read a method.", e); + } + return qualifiedName; + } + + private String createProjectRequest(IJavaProject javaProject) { + //TODO add suite to run all tests from the project + return null; + } + + private String createPackageRequest(IJavaProject javaProject, String filePath) { + //TODO add suite to run all tests from the package + return null; + } + + private String createClassRequest(IJavaProject javaProject, String filePath) { + ICompilationUnit compilationUnit = findCompilationUnitByPath(javaProject, filePath); + IType primaryType = compilationUnit.findPrimaryType(); + return primaryType.getFullyQualifiedName(); + } + + private boolean isTest(IMethod method, ICompilationUnit compilationUnit) { + try { + IAnnotation[] annotations = method.getAnnotations(); + IAnnotation test = null; + for (IAnnotation annotation : annotations) { + String annotationElementName = annotation.getElementName(); + if ("Test".equals(annotationElementName)) { + test = annotation; + break; + } + if (JUNIT_TEST_ANNOTATION.equals(annotationElementName)) { + return true; + } + } + return test != null && isImportOfTestAnnotationExist(compilationUnit); + } catch (JavaModelException e) { + LOG.info("Can't read method's annotations.", e); + return false; + } + } + + private boolean isImportOfTestAnnotationExist(ICompilationUnit compilationUnit) { + try { + IImportDeclaration[] imports = compilationUnit.getImports(); + for (IImportDeclaration importDeclaration : imports) { + String elementName = importDeclaration.getElementName(); + if (JUNIT_TEST_ANNOTATION.equals(elementName)) { + return true; + } + if (importDeclaration.isOnDemand() && + JUNIT_TEST_ANNOTATION.startsWith(elementName.substring(0, elementName.length() - 3))) { //remove .* + return true; + } + } + } catch (JavaModelException e) { + LOG.info("Can't read class imports.", e); + return false; + } + return false; + } + + @Override + @Deprecated + public TestResult execute(Map testParameters) throws Exception { + throw new UnsupportedOperationException(); + } + + @Override + public TestResultRootDto runTests(Map testParameters) throws Exception { + throw new UnsupportedOperationException(); + } + + @Override + public List getTestResults(List testResultsPath) { + throw new UnsupportedOperationException(); + } +} diff --git a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml index 783a82ad75..7d7d8f0d96 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml @@ -16,14 +16,14 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-junit pom Che Plugin :: Java Testing :: JUnit Parent che-plugin-testing-junit-server - che-plugin-testing-junit-ide + che-plugin-testing-junit-runtime diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml deleted file mode 100644 index 3798a6adc0..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - 4.0.0 - - che-plugin-testing-testng - org.eclipse.che.plugin - 5.15.0-SNAPSHOT - - che-plugin-testing-testng-ide - Che Plugin :: Java Testing :: TestNG IDE - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-commons-gwt - - - org.eclipse.che.core - che-core-ide-api - - - org.eclipse.che.plugin - che-plugin-java-ext-lang-client - - - org.eclipse.che.plugin - che-plugin-maven-shared - - - org.eclipse.che.plugin - che-plugin-testing-ide - - - org.vectomatic - lib-gwt-svg - - - com.google.gwt - gwt-user - provided - - - com.google.gwt.inject - gin - provided - - - - - - src/main/java - - **/*.java - - - - src/main/resources - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - - - org.eclipse.che.plugin:che-plugin-maven-shared - - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.java deleted file mode 100644 index c62700f993..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide; - -import com.google.gwt.i18n.client.Messages; - -/** - * Localization constants. Interface to represent the constants defined in - * resource bundle: 'TestNGLocalizationConstant.properties'. - * - * @author Mirage Abeysekara - */ -public interface TestNGLocalizationConstant extends Messages { - - @Key("action.runClass.title") - String actionRunClassTitle(); - - @Key("action.runClass.description") - String actionRunClassDescription(); - - @Key("action.runAll.title") - String actionRunAllTitle(); - - @Key("action.runAll.description") - String actionRunAllDescription(); - - @Key("action.runXML.title") - String actionRunXMLTitle(); - - @Key("action.runXML.description") - String actionRunXMLDescription(); -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGResources.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGResources.java deleted file mode 100644 index 07f1982d0f..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGResources.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide; - -import org.vectomatic.dom.svg.ui.SVGResource; - -import com.google.gwt.resources.client.ClientBundle; - -/** - * - * @author Mirage Abeysekara - */ -public interface TestNGResources extends ClientBundle { - - @Source("org/eclipse/che/plugin/testing/ide/svg/test.svg") - SVGResource testIcon(); - - @Source("org/eclipse/che/plugin/testing/ide/svg/test_all.svg") - SVGResource testAllIcon(); - -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGTestAction.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGTestAction.java deleted file mode 100644 index deb7c9a187..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/TestNGTestAction.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide; - -import org.eclipse.che.ide.api.action.Action; -import org.eclipse.che.ide.api.action.ActionManager; -import org.eclipse.che.ide.api.action.DefaultActionGroup; -import org.eclipse.che.ide.api.keybinding.KeyBindingAgent; -import org.eclipse.che.ide.api.keybinding.KeyBuilder; -import org.eclipse.che.ide.util.browser.UserAgent; -import org.eclipse.che.plugin.testing.ide.TestAction; -import org.eclipse.che.plugin.testing.testng.ide.action.RunAllTestAction; -import org.eclipse.che.plugin.testing.testng.ide.action.RunClassTestAction; -import org.eclipse.che.plugin.testing.testng.ide.action.RunTestXMLAction; - -import com.google.inject.Inject; - -/** - * TestNG ide implementation. - * - * @author Mirage Abeysekara - */ -public class TestNGTestAction implements TestAction { - - public static final String TEST_ACTION_RUN_CLASS = "TestNGActionRunClassContext"; - public static final String TEST_ACTION_RUN_ALL = "TestNGActionRunAllContext"; - public static final String TEST_ACTION_RUN_XML = "TestNGActionRunXMLContext"; - - private final Action runClassContextTestAction; - private final Action runAllContextTestAction; - private final Action runTestXMLContextAction; - - @Inject - public TestNGTestAction(ActionManager actionManager, - RunClassTestAction runClassContextTestAction, - RunAllTestAction runAllContextTestAction, - RunTestXMLAction runTestXMLContextAction, - KeyBindingAgent keyBinding) { - - actionManager.registerAction(TEST_ACTION_RUN_CLASS, runClassContextTestAction); - actionManager.registerAction(TEST_ACTION_RUN_ALL, runAllContextTestAction); - actionManager.registerAction(TEST_ACTION_RUN_XML, runTestXMLContextAction); - if (UserAgent.isMac()) { - keyBinding.getGlobal().addKey(new KeyBuilder().control().alt().charCode('g').build(), TEST_ACTION_RUN_ALL); - keyBinding.getGlobal().addKey(new KeyBuilder().control().shift().charCode('g').build(), TEST_ACTION_RUN_CLASS); - } else { - keyBinding.getGlobal().addKey(new KeyBuilder().action().alt().charCode('g').build(), TEST_ACTION_RUN_ALL); - keyBinding.getGlobal().addKey(new KeyBuilder().action().shift().charCode('g').build(), TEST_ACTION_RUN_CLASS); - } - this.runClassContextTestAction = runClassContextTestAction; - this.runAllContextTestAction = runAllContextTestAction; - this.runTestXMLContextAction = runTestXMLContextAction; - } - - @Override - public void addMainMenuItems(DefaultActionGroup testMainMenu) { - testMainMenu.add(runClassContextTestAction); - testMainMenu.add(runAllContextTestAction); - testMainMenu.add(runTestXMLContextAction); - } - - @Override - public void addContextMenuItems(DefaultActionGroup testContextMenu) { - testContextMenu.add(runClassContextTestAction); - testContextMenu.add(runAllContextTestAction); - testContextMenu.add(runTestXMLContextAction); - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java deleted file mode 100644 index d92169e6f9..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide.action; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; -import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.resources.Project; -import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.plugin.testing.ide.TestServiceClient; -import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate; -import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter; -import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant; -import org.eclipse.che.plugin.testing.testng.ide.TestNGResources; - -import javax.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Collections.singletonList; -import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; - -/** - * @author Mirage Abeysekara - * @author David Festal - */ -public class RunAllTestAction extends AbstractPerspectiveAction - implements RunTestActionDelegate.Source { - - private final NotificationManager notificationManager; - private final TestResultPresenter presenter; - private final TestServiceClient service; - private final AppContext appContext; - private final RunTestActionDelegate delegate; - - @Inject - public RunAllTestAction(TestNGResources resources, - NotificationManager notificationManager, - AppContext appContext, - TestResultPresenter presenter, - TestServiceClient service, - TestNGLocalizationConstant localization) { - super(singletonList(PROJECT_PERSPECTIVE_ID), localization.actionRunAllTitle(), - localization.actionRunAllDescription(), null, resources.testAllIcon()); - this.notificationManager = notificationManager; - this.presenter = presenter; - this.service = service; - this.appContext = appContext; - this.delegate = new RunTestActionDelegate(this); - } - - @Override - public void actionPerformed(ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource != null) { - Project project = resource.getProject(); - if (project != null) { - Map parameters = new HashMap<>(); - delegate.doRunTests(e, parameters); - } - } - } - - @Override - public void updateInPerspective(@NotNull ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource == null || resource.getProject() == null) { - e.getPresentation().setEnabledAndVisible(false); - return; - } - - e.getPresentation().setVisible(true); - - String projectType = resource.getProject().getType(); - boolean enable = "maven".equals(projectType); - e.getPresentation().setEnabled(enable); - } - - @Override - public NotificationManager getNotificationManager() { - return notificationManager; - } - - @Override - public AppContext getAppContext() { - return appContext; - } - - @Override - public TestServiceClient getService() { - return service; - } - - @Override - public TestResultPresenter getPresenter() { - return presenter; - } - - @Override - public String getTestingFramework() { - return "testng"; - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java deleted file mode 100644 index 784f370ce0..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide.action; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; -import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.resources.File; -import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.ide.api.resources.VirtualFile; -import org.eclipse.che.ide.ext.java.client.util.JavaUtil; -import org.eclipse.che.plugin.testing.ide.TestServiceClient; -import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate; -import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter; -import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant; -import org.eclipse.che.plugin.testing.testng.ide.TestNGResources; - -import javax.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Collections.singletonList; -import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; - -/** - * @author Mirage Abeysekara - */ -public class RunClassTestAction extends AbstractPerspectiveAction - implements RunTestActionDelegate.Source { - - private final NotificationManager notificationManager; - private final TestResultPresenter presenter; - private final TestServiceClient service; - private final AppContext appContext; - private final RunTestActionDelegate delegate; - - @Inject - public RunClassTestAction(TestNGResources resources, - NotificationManager notificationManager, - AppContext appContext, - TestResultPresenter presenter, - TestServiceClient service, - TestNGLocalizationConstant localization) { - super(singletonList(PROJECT_PERSPECTIVE_ID), localization.actionRunClassTitle(), - localization.actionRunClassDescription(), null, resources.testIcon()); - this.notificationManager = notificationManager; - this.presenter = presenter; - this.service = service; - this.appContext = appContext; - this.delegate = new RunTestActionDelegate(this); - } - - @Override - public void actionPerformed(ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource instanceof File) { - File file = ((File)resource); - String fqn = JavaUtil.resolveFQN((VirtualFile)file); - Map parameters = new HashMap<>(); - parameters.put("fqn", fqn); - parameters.put("runClass", "true"); - delegate.doRunTests(e, parameters); - } - } - - @Override - public void updateInPerspective(@NotNull ActionEvent e) { - Resource resource = appContext.getResource(); - if (!(resource instanceof File) || resource.getProject() == null) { - e.getPresentation().setEnabledAndVisible(false); - return; - } - - e.getPresentation().setVisible(true); - - String projectType = resource.getProject().getType(); - if (!"maven".equals(projectType)) { - e.getPresentation().setEnabled(false); - } - - boolean enable = "java".equals(((File)resource).getExtension()); - e.getPresentation().setEnabled(enable); - } - - @Override - public NotificationManager getNotificationManager() { - return notificationManager; - } - - @Override - public AppContext getAppContext() { - return appContext; - } - - @Override - public TestServiceClient getService() { - return service; - } - - @Override - public TestResultPresenter getPresenter() { - return presenter; - } - - @Override - public String getTestingFramework() { - return "testng"; - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java deleted file mode 100644 index 60080a1780..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide.action; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; -import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.resources.File; -import org.eclipse.che.ide.api.resources.Project; -import org.eclipse.che.ide.api.resources.Resource; -import org.eclipse.che.plugin.maven.shared.MavenAttributes; -import org.eclipse.che.plugin.testing.ide.TestServiceClient; -import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate; -import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter; -import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant; -import org.eclipse.che.plugin.testing.testng.ide.TestNGResources; - -import javax.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Collections.singletonList; -import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID; - -/** - * @author Mirage Abeysekara - * @author David Festal - */ -public class RunTestXMLAction extends AbstractPerspectiveAction - implements RunTestActionDelegate.Source { - - private final NotificationManager notificationManager; - private final TestResultPresenter presenter; - private final TestServiceClient service; - private final AppContext appContext; - private final RunTestActionDelegate delegate; - - @Inject - public RunTestXMLAction(TestNGResources resources, - NotificationManager notificationManager, - AppContext appContext, - TestResultPresenter presenter, - TestServiceClient service, - TestNGLocalizationConstant localization) { - super(singletonList(PROJECT_PERSPECTIVE_ID), localization.actionRunXMLTitle(), - localization.actionRunXMLDescription(), null, resources.testAllIcon()); - this.notificationManager = notificationManager; - this.presenter = presenter; - this.service = service; - this.appContext = appContext; - this.delegate = new RunTestActionDelegate(this); - } - - @Override - public void actionPerformed(ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource != null) { - Project project = resource.getProject(); - if (project != null) { - Map parameters = new HashMap<>(); - parameters.put("testngXML", - project.getPath() + "/" + MavenAttributes.DEFAULT_TEST_RESOURCES_FOLDER + "/testng.xml"); - delegate.doRunTests(e, parameters); - } - } - } - - @Override - public void updateInPerspective(@NotNull ActionEvent e) { - Resource resource = appContext.getResource(); - if (resource == null || resource.getProject() == null) { - e.getPresentation().setEnabledAndVisible(false); - return; - } - - e.getPresentation().setVisible(true); - - String projectType = resource.getProject().getType(); - if (!"maven".equals(projectType)) { - e.getPresentation().setEnabled(false); - } - - if (resource instanceof File) { - File file = (File)resource; - String expectedXmlFile = MavenAttributes.DEFAULT_TEST_RESOURCES_FOLDER + "/testng.xml"; - e.getPresentation().setEnabled(file.getLocation().toString().endsWith(expectedXmlFile)); - } else { - e.getPresentation().setEnabled(true); - } - } - - @Override - public NotificationManager getNotificationManager() { - return notificationManager; - } - - @Override - public AppContext getAppContext() { - return appContext; - } - - @Override - public TestServiceClient getService() { - return service; - } - - @Override - public TestResultPresenter getPresenter() { - return presenter; - } - - @Override - public String getTestingFramework() { - return "testng"; - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/inject/TestNGGinModule.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/inject/TestNGGinModule.java deleted file mode 100644 index 2f8c3e9b0f..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/inject/TestNGGinModule.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.testing.testng.ide.inject; - -import com.google.gwt.inject.client.AbstractGinModule; - -import org.eclipse.che.ide.api.extension.ExtensionGinModule; - -/** - * - * @author Mirage Abeysekara - */ -@ExtensionGinModule -public class TestNGGinModule extends AbstractGinModule { - @Override - protected void configure() { - } -} diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml deleted file mode 100644 index f838358478..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/TestNG.gwt.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.properties b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.properties deleted file mode 100644 index bd9cdc5dcf..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/TestNGLocalizationConstant.properties +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2012-2017 Codenvy, S.A. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Codenvy, S.A. - initial API and implementation -# - - - -##### Actions ##### -action.runClass.title = TestNG Class -action.runClass.description = Run the TestNG test cases - -action.runAll.title = TestNG Project -action.runAll.description = Run all TestNG test cases - -action.runXML.title = TestNG XML Suite -action.runXML.description = Run the TestNG XML Suite defined in testng.xml - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test.svg b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test.svg deleted file mode 100644 index 79b385d2dd..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test_all.svg b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test_all.svg deleted file mode 100644 index 42353ffae0..0000000000 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/resources/org/eclipse/che/plugin/testing/testng/ide/svg/test_all.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml index 03253c8569..ae833c8d27 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-testng-runtime diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml index f4fd5e2d6d..8df39ff7f8 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-testng-server Che Plugin :: Java Testing :: TestNG Server @@ -81,10 +81,6 @@ org.eclipse.che.core che-core-commons-lang - - org.eclipse.che.lib - org-eclipse-jdt-core-repack - org.eclipse.che.lib org-eclipse-jdt-core-repack diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java index c9b60310b7..4687779392 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java @@ -11,6 +11,7 @@ package org.eclipse.che.plugin.testing.testng.server; import com.beust.jcommander.JCommander; +import com.google.inject.name.Named; import org.eclipse.che.api.testing.shared.TestExecutionContext; import org.eclipse.che.api.testing.shared.TestResult; @@ -24,9 +25,7 @@ import org.eclipse.che.commons.lang.execution.ProcessHandler; import org.eclipse.che.plugin.java.testing.AbstractJavaTestRunner; import org.eclipse.che.plugin.java.testing.ClasspathUtil; import org.eclipse.che.plugin.java.testing.ProjectClasspathProvider; -import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IImportDeclaration; import org.eclipse.jdt.core.IJavaElement; @@ -40,33 +39,29 @@ import org.testng.annotations.Test; import javax.inject.Inject; import java.io.File; -import java.io.IOException; -import java.net.Socket; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; /** * TestNG implementation for the test runner service. - * - * @author Mirage Abeysekara */ public class TestNGRunner extends AbstractJavaTestRunner { - private static final String PROJECTS_ROOT_FOLDER = "/projects"; - private static final String TEST_OUTPUT_FOLDER = "/test-output"; - private static final String TESTNG_NAME = "testng"; - private static final String TEST_ANNOTATION_FQN = Test.class.getName(); - private static final Logger LOG = LoggerFactory.getLogger(TestNGRunner.class); + private static final String TESTNG_NAME = "testng"; + private static final String TEST_ANNOTATION_FQN = Test.class.getName(); + private static final Logger LOG = LoggerFactory.getLogger(TestNGRunner.class); + private String workspacePath; private final ProjectClasspathProvider classpathProvider; private final TestNGSuiteUtil suiteUtil; - private int debugPort; - @Inject - public TestNGRunner(ProjectClasspathProvider classpathProvider, TestNGSuiteUtil suiteUtil) { + public TestNGRunner(@Named("che.user.workspaces.storage") String workspacePath, + ProjectClasspathProvider classpathProvider, + TestNGSuiteUtil suiteUtil) { + super(workspacePath); + this.workspacePath = workspacePath; this.classpathProvider = classpathProvider; this.suiteUtil = suiteUtil; } @@ -103,11 +98,6 @@ public class TestNGRunner extends AbstractJavaTestRunner { return null; } - @Override - public int getDebugPort() { - return debugPort; - } - private ProcessHandler startTestProcess(IJavaProject javaProject, TestExecutionContext context) { File suiteFile = createSuite(context, javaProject); if (suiteFile == null) { @@ -115,11 +105,11 @@ public class TestNGRunner extends AbstractJavaTestRunner { } JavaParameters parameters = new JavaParameters(); - parameters.setJavaExecutable("java"); + parameters.setJavaExecutable(JAVA_EXECUTABLE); parameters.setMainClassName("org.testng.CheTestNGLauncher"); String outputDirectory = getOutputDirectory(javaProject); parameters.getParametersList().add("-d", outputDirectory); - parameters.setWorkingDirectory(PROJECTS_ROOT_FOLDER + javaProject.getPath()); + parameters.setWorkingDirectory(workspacePath + javaProject.getPath()); List classPath = new ArrayList<>(); Set projectClassPath = classpathProvider.getProjectClassPath(javaProject); classPath.addAll(projectClassPath); @@ -129,9 +119,9 @@ public class TestNGRunner extends AbstractJavaTestRunner { parameters.getParametersList().add("-suiteFile", suiteFile.getAbsolutePath()); if (context.isDebugModeEnable()) { - debugPort = generateDebuggerPort(); + generateDebuggerPort(); parameters.getVmParameters().add("-Xdebug"); - parameters.getVmParameters().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + debugPort); + parameters.getVmParameters().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + getDebugPort()); } CommandLine command = parameters.createCommand(); try { @@ -143,39 +133,6 @@ public class TestNGRunner extends AbstractJavaTestRunner { return null; } - private String getOutputDirectory(IJavaProject javaProject) { - String path = PROJECTS_ROOT_FOLDER + javaProject.getPath() + TEST_OUTPUT_FOLDER; - try { - IClasspathEntry[] resolvedClasspath = javaProject.getResolvedClasspath(true); - for (IClasspathEntry iClasspathEntry : resolvedClasspath) { - if (iClasspathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) { - IPath outputLocation = iClasspathEntry.getOutputLocation(); - if (outputLocation == null) { - continue; - } - return PROJECTS_ROOT_FOLDER + outputLocation.removeLastSegments(1).append(TEST_OUTPUT_FOLDER); - } - } - } catch (JavaModelException e) { - return path; - } - return path; - } - - private int generateDebuggerPort() { - Random random = new Random(); - int port = random.nextInt(65535); - return isPortAvailable(port) ? port : generateDebuggerPort(); - } - - private static boolean isPortAvailable(int port) { - try (Socket ignored = new Socket("localhost", port)) { - return false; - } catch (IOException ignored) { - return true; - } - } - private File createSuite(TestExecutionContext context, IJavaProject javaProject) { switch (context.getTestType()) { case FILE: diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java index 8cbd8506c6..9fbef89e4c 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java @@ -18,10 +18,7 @@ import org.eclipse.che.api.core.jsonrpc.commons.transmission.SendConfiguratorFro import org.eclipse.che.api.project.server.FolderEntry; import org.eclipse.che.api.project.server.ProjectCreatedEvent; import org.eclipse.che.api.testing.server.dto.DtoServerImpls; -import org.eclipse.che.api.testing.server.framework.TestMessagesOutputTransmitter; import org.eclipse.che.api.testing.shared.TestExecutionContext; -import org.eclipse.che.commons.lang.execution.ProcessHandler; -import org.eclipse.che.ide.runtime.Assert; import org.eclipse.che.jdt.core.launching.JREContainerInitializer; import org.eclipse.che.jdt.core.resources.ResourceChangedEvent; import org.eclipse.che.plugin.java.testing.ClasspathUtil; @@ -33,7 +30,6 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.core.JavaModelManager; -import org.mockito.ArgumentCaptor; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -59,7 +55,7 @@ public class TestNGRunnerTest extends BaseTest { startSendConfiguratorFromOne = mock(SendConfiguratorFromOne.class); transmitter = mock(RequestTransmitter.class); - runner = new TestNGRunner(new ProjectClasspathProvider(""), new TestNGSuiteUtil()); + runner = new TestNGRunner("", new ProjectClasspathProvider(""), new TestNGSuiteUtil()); } @Test() diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGTestDiscoveryTest.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGTestDiscoveryTest.java index 1e0112a99f..be00c67f89 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGTestDiscoveryTest.java +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGTestDiscoveryTest.java @@ -31,7 +31,7 @@ import static org.fest.assertions.Assertions.assertThat; public class TestNGTestDiscoveryTest extends BaseTest { - private IJavaProject javaProject; + private IJavaProject javaProject; private IPackageFragment packageFragment; @@ -65,9 +65,10 @@ public class TestNGTestDiscoveryTest extends BaseTest { ICompilationUnit compilationUnit = packageFragment.createCompilationUnit("T.java", buf.toString(), false, null); compilationUnit.reconcile(0, true, DefaultWorkingCopyOwner.PRIMARY, null); - TestNGRunner runner = new TestNGRunner(null, null); + TestNGRunner runner = new TestNGRunner("", null, null); - List testPositions = runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); + List testPositions = + runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); assertThat(testPositions).isNotNull().isNotEmpty().hasSize(1); TestPosition testPosition = testPositions.iterator().next(); @@ -93,9 +94,10 @@ public class TestNGTestDiscoveryTest extends BaseTest { ICompilationUnit compilationUnit = packageFragment.createCompilationUnit("T.java", buf.toString(), false, null); compilationUnit.reconcile(0, true, DefaultWorkingCopyOwner.PRIMARY, null); - TestNGRunner runner = new TestNGRunner(null, null); + TestNGRunner runner = new TestNGRunner("", null, null); - List testPositions = runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); + List testPositions = + runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); assertThat(testPositions).isNotNull().isNotEmpty().hasSize(1); TestPosition testPosition = testPositions.iterator().next(); @@ -116,9 +118,10 @@ public class TestNGTestDiscoveryTest extends BaseTest { ICompilationUnit compilationUnit = packageFragment.createCompilationUnit("T.java", buf.toString(), false, null); compilationUnit.reconcile(0, true, DefaultWorkingCopyOwner.PRIMARY, null); - TestNGRunner runner = new TestNGRunner(null, null); + TestNGRunner runner = new TestNGRunner("", null, null); - List testPositions = runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); + List testPositions = + runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); assertThat(testPositions).isNotNull().isNotEmpty().hasSize(1); TestPosition testPosition = testPositions.iterator().next(); @@ -140,9 +143,10 @@ public class TestNGTestDiscoveryTest extends BaseTest { ICompilationUnit compilationUnit = packageFragment.createCompilationUnit("T.java", buf.toString(), false, null); compilationUnit.reconcile(0, true, DefaultWorkingCopyOwner.PRIMARY, null); - TestNGRunner runner = new TestNGRunner(null, null); + TestNGRunner runner = new TestNGRunner("", null, null); - List testPositions = runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); + List testPositions = + runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); assertThat(testPositions).isNotNull().isNotEmpty().hasSize(1); TestPosition testPosition = testPositions.iterator().next(); @@ -163,9 +167,10 @@ public class TestNGTestDiscoveryTest extends BaseTest { ICompilationUnit compilationUnit = packageFragment.createCompilationUnit("T.java", buf.toString(), false, null); compilationUnit.reconcile(0, true, DefaultWorkingCopyOwner.PRIMARY, null); - TestNGRunner runner = new TestNGRunner(null, null); + TestNGRunner runner = new TestNGRunner("", null, null); - List testPositions = runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); + List testPositions = + runner.detectTests(new MockTestDetectionContext("/testDiscovery", "/testDiscovery/src/test/T.java", -1)); assertThat(testPositions).isNotNull().isEmpty(); } @@ -174,7 +179,7 @@ public class TestNGTestDiscoveryTest extends BaseTest { private String projectPath; private String filePath; - private int offset; + private int offset; public MockTestDetectionContext(String projectPath, String filePath, int offset) { this.projectPath = projectPath; diff --git a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml index de8ebe76ea..9c94aa683b 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-testng pom @@ -24,7 +24,6 @@ che-plugin-testing-testng-runtime che-plugin-testing-testng-server - che-plugin-testing-testng-ide diff --git a/plugins/plugin-testing-java/pom.xml b/plugins/plugin-testing-java/pom.xml index 710d405326..eb06f3ae15 100644 --- a/plugins/plugin-testing-java/pom.xml +++ b/plugins/plugin-testing-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-java-parent pom diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml index 330cefd7a4..f8f30de84c 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-phpunit-ide Che Plugin :: PHP Testing :: PHPUnit IDE diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml index c2d038268d..5a112bf3e9 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-phpunit-server Che Plugin :: PHP Testing :: PHPUnit Server diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml index 8a0b322a2d..9b25003e7e 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-php-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-phpunit pom diff --git a/plugins/plugin-testing-php/pom.xml b/plugins/plugin-testing-php/pom.xml index 1308e1389c..e16e5624a0 100644 --- a/plugins/plugin-testing-php/pom.xml +++ b/plugins/plugin-testing-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-php-parent pom diff --git a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml index 6fe145d63c..cf7a988e24 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml +++ b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-ide Che Plugin :: Testing :: IDE diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestResources.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestResources.java index 4f7a0eb0f4..4f6dd13911 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestResources.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestResources.java @@ -61,4 +61,7 @@ public interface TestResources extends ClientBundle { @Source("org/eclipse/che/plugin/testing/ide/svg/test_result_trace_frame.svg") SVGResource testResultTraceFrameIcon(); + + @Source("org/eclipse/che/plugin/testing/ide/svg/test_in_progress.svg") + SVGResource testInProgressIcon(); } diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestingExtension.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestingExtension.java index d10914b957..7b063aaca5 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestingExtension.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/TestingExtension.java @@ -15,6 +15,9 @@ import com.google.inject.Singleton; import org.eclipse.che.ide.api.action.ActionManager; import org.eclipse.che.ide.api.action.DefaultActionGroup; import org.eclipse.che.ide.api.extension.Extension; +import org.eclipse.che.ide.api.keybinding.KeyBindingAgent; +import org.eclipse.che.ide.api.keybinding.KeyBuilder; +import org.eclipse.che.ide.util.browser.UserAgent; import org.eclipse.che.plugin.testing.ide.action.DebugTestAction; import org.eclipse.che.plugin.testing.ide.action.RunTestAction; @@ -31,11 +34,14 @@ import static org.eclipse.che.ide.api.action.IdeActions.GROUP_RUN; @Singleton @Extension(title = "Testing Extension", version = "1.0.0") public class TestingExtension { + public static final String RUN_TEST = "RunTest"; + public static final String DEBUG_TEST = "DebugTest"; @Inject public TestingExtension(ActionManager actionManager, TestLocalizationConstant localization, Set testActions, + KeyBindingAgent keyBinding, DebugTestAction debugTestAction, RunTestAction runTestAction) { @@ -48,8 +54,17 @@ public class TestingExtension { testAction.addMainMenuItems(testMainMenu); testMainMenu.addSeparator(); } - actionManager.registerAction("RunTest", runTestAction); - actionManager.registerAction("DebugTest", debugTestAction); + actionManager.registerAction(RUN_TEST, runTestAction); + actionManager.registerAction(DEBUG_TEST, debugTestAction); + + if (UserAgent.isMac()) { + keyBinding.getGlobal().addKey(new KeyBuilder().control().alt().charCode('x').build(), DEBUG_TEST); + keyBinding.getGlobal().addKey(new KeyBuilder().control().alt().charCode('z').build(), RUN_TEST); + } else { + keyBinding.getGlobal().addKey(new KeyBuilder().action().alt().charCode('x').build(), DEBUG_TEST); + keyBinding.getGlobal().addKey(new KeyBuilder().action().alt().charCode('z').build(), RUN_TEST); + } + testMainMenu.add(runTestAction); testMainMenu.add(debugTestAction); runMenu.addSeparator(); diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java index a3295f0241..bdc0e2e5ee 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java @@ -35,7 +35,7 @@ import java.util.function.Function; import static org.eclipse.che.plugin.testing.ide.model.Printer.OutputType; /** - * Event processor converts events form runner to internal form. + * Event processor converts events from runner to internal form. */ public class GeneralTestingEventsProcessor extends AbstractTestingEventsProcessor { private final TestRootState testRootState; @@ -68,6 +68,9 @@ public class GeneralTestingEventsProcessor extends AbstractTestingEventsProcesso String name = event.getName(); String location = event.getLocation(); TestState currentSuite = getCurrentSuite(); + if (currentSuite.getName().equals(name) && treeBuildBeforeStart) { + return; + } TestState newState; if (location == null) { newState = findChildByName(currentSuite, name, true); @@ -241,18 +244,16 @@ public class GeneralTestingEventsProcessor extends AbstractTestingEventsProcesso @Override public void onSuiteTreeStarted(String suiteName, String location) { treeBuildBeforeStart = true; - buildTreeEvents.add(() -> { - TestState currentSuite = getCurrentSuite(); - TestState newSuite = new TestState(suiteName, true, location); - if (testLocator != null) { - newSuite.setTestLocator(testLocator); - } + TestState currentSuite = getCurrentSuite(); + TestState newSuite = new TestState(suiteName, true, location); + if (testLocator != null) { + newSuite.setTestLocator(testLocator); + } - currentSuite.addChild(newSuite); + currentSuite.addChild(newSuite); - testSuiteStack.push(newSuite); - callSuiteTreeStarted(newSuite); - }); + testSuiteStack.push(newSuite); + callSuiteTreeStarted(newSuite); } private void callSuiteTreeStarted(TestState newSuite) { @@ -277,19 +278,17 @@ public class GeneralTestingEventsProcessor extends AbstractTestingEventsProcesso @Override public void onSuiteTreeNodeAdded(String suiteName, String location) { treeBuildBeforeStart = true; - buildTreeEvents.add(() -> { - TestState newState = new TestState(suiteName, false, location); - newState.setTreeBuildBeforeStart(); - if (testLocator != null) { - newState.setTestLocator(testLocator); - } + TestState newState = new TestState(suiteName, false, location); + newState.setTreeBuildBeforeStart(); + if (testLocator != null) { + newState.setTestLocator(testLocator); + } - TestState currentSuite = getCurrentSuite(); - currentSuite.setTreeBuildBeforeStart(); - currentSuite.addChild(newState); + TestState currentSuite = getCurrentSuite(); + currentSuite.setTreeBuildBeforeStart(); + currentSuite.addChild(newState); - callSuiteTreeNodeAdded(newState); - }); + callSuiteTreeNodeAdded(newState); } private void callSuiteTreeNodeAdded(TestState newState) { diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestStateEventsListener.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestStateEventsListener.java index 9b1eaaeeb5..2ded611e1e 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestStateEventsListener.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestStateEventsListener.java @@ -44,10 +44,30 @@ public interface TestStateEventsListener { */ void onSuiteFinished(TestState testState); + /** + * Called when test node added + * + * @param testState + * describes test node + */ void onSuiteTreeNodeAdded(TestState testState); + /** + * Called when building of test tree started + * + * @param testState + * describes test suite + */ void onSuiteTreeStarted(TestState testState); + /** + * Called when building of test tree finished + * + * @param suite + * describes test suite + */ + void onSuiteTreeNodeFinished(TestState suite); + /** * @param count */ diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/info/TestFailedInfo.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/info/TestFailedInfo.java index b97b56e976..487bff34d8 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/info/TestFailedInfo.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/info/TestFailedInfo.java @@ -32,7 +32,7 @@ public class TestFailedInfo extends AbstractTestStateInfo { public static String createErrMessage(String message, String stackTrace) { StringBuilder builder = new StringBuilder(); - if (!StringUtils.isNullOrWhitespace(message)) { + if (!StringUtils.isNullOrWhitespace(message) && !"null".equals(message)) { builder.append(message).append('\n'); } diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/TestResultViewImpl.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/TestResultViewImpl.java index 0c0f0edc5e..01e303f629 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/TestResultViewImpl.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/TestResultViewImpl.java @@ -169,17 +169,20 @@ public class TestResultViewImpl extends BaseView @Override public void onSuiteFinished(TestState testState) { - } @Override public void onSuiteTreeNodeAdded(TestState testState) { - + addSuiteOrTest(testState); } @Override public void onSuiteTreeStarted(TestState testState) { + addSuiteOrTest(testState); + } + @Override + public void onSuiteTreeNodeFinished(TestState suite) { } @Override diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/navigation/nodes/TestStateNode.java b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/navigation/nodes/TestStateNode.java index 8a61d7ed95..2b0a326e18 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/navigation/nodes/TestStateNode.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view2/navigation/nodes/TestStateNode.java @@ -27,17 +27,20 @@ import java.util.ArrayList; import java.util.List; /** - * + * Describes UI state of the test node. */ public class TestStateNode extends AbstractTreeNode implements HasPresentation { - private final PromiseProvider promiseProvider; - private final TestResources testResources; - private final TestState testState; - private NodePresentation nodePresentation; + private final PromiseProvider promiseProvider; + private final TestResources testResources; + private final TestState testState; + + private NodePresentation nodePresentation; @Inject - public TestStateNode(PromiseProvider promiseProvider, TestResources testResources, @Assisted TestState testState) { + public TestStateNode(PromiseProvider promiseProvider, + TestResources testResources, + @Assisted TestState testState) { this.promiseProvider = promiseProvider; this.testResources = testResources; this.testState = testState; @@ -76,10 +79,17 @@ public class TestStateNode extends AbstractTreeNode implements HasPresentation { } if (testState.getDescription() == TestStateDescription.PASSED) { presentation.setPresentableTextCss("color: green;"); + presentation.setPresentableIcon(testResources.testResultSuccessIcon()); } else if (testState.getDescription() == TestStateDescription.IGNORED) { presentation.setPresentableTextCss("text-decoration: line-through; color: yellow;"); + presentation.setPresentableIcon(testResources.testResultSkippedIcon()); } else if (testState.getDescription() == TestStateDescription.FAILED || testState.getDescription() == TestStateDescription.ERROR) { presentation.setPresentableTextCss("color: red;"); + presentation.setPresentableIcon(testResources.testResultFailureIcon()); + } else if (testState.getDescription() == TestStateDescription.RUNNING) { + presentation.setPresentableIcon(testResources.testInProgressIcon()); + } else if (testState.getDescription() == TestStateDescription.NOT_RUN) { + presentation.setPresentableIcon(testResources.testResultSkippedIcon()); } } diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/ide/svg/test_in_progress.svg b/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/ide/svg/test_in_progress.svg new file mode 100644 index 0000000000..8eb5f3b21b --- /dev/null +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/main/resources/org/eclipse/che/plugin/testing/ide/svg/test_in_progress.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/plugin-testing/pom.xml b/plugins/plugin-testing/pom.xml index 85b1b5c8bb..e61b06c00a 100644 --- a/plugins/plugin-testing/pom.xml +++ b/plugins/plugin-testing/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-testing-parent pom diff --git a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml index fc1172c85f..d0bbbb5615 100644 --- a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml +++ b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-traefik-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-traefik-docker jar diff --git a/plugins/plugin-traefik/pom.xml b/plugins/plugin-traefik/pom.xml index ad17d30a84..085f480409 100644 --- a/plugins/plugin-traefik/pom.xml +++ b/plugins/plugin-traefik/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-traefik-parent diff --git a/plugins/plugin-urlfactory/pom.xml b/plugins/plugin-urlfactory/pom.xml index c65e712b35..ab871c62ec 100644 --- a/plugins/plugin-urlfactory/pom.xml +++ b/plugins/plugin-urlfactory/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-url-factory diff --git a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml index 2dc4d50354..bff4e92ba3 100644 --- a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-web-ext-server diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml index 26ec91d8db..4f45ccd185 100644 --- a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-web-ext-shared diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index 939ee31eb5..b42e506184 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-web-ext-web jar diff --git a/plugins/plugin-web/pom.xml b/plugins/plugin-web/pom.xml index 97b650ae6c..f2c6934f7f 100644 --- a/plugins/plugin-web/pom.xml +++ b/plugins/plugin-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-web-parent diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml index 5efb32d4fb..1fb8482de0 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-zend-debugger-ide jar diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml index ae9430523f..4f0cb5e1a8 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-plugin-zend-debugger-server jar diff --git a/plugins/plugin-zend-debugger/pom.xml b/plugins/plugin-zend-debugger/pom.xml index 52cb7ccba5..b709c5d927 100644 --- a/plugins/plugin-zend-debugger/pom.xml +++ b/plugins/plugin-zend-debugger/pom.xml @@ -13,7 +13,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-plugin-zend-debugger-parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 6182b8931f..a96a833dff 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che.plugin che-plugin-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Plugin :: Parent diff --git a/pom.xml b/pom.xml index b7852643d3..8422ab2234 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,11 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che che-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Parent @@ -44,9 +44,9 @@ https://github.com/eclipse/che - 5.15.0-SNAPSHOT - 5.15.0-SNAPSHOT - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT + 5.16.0-SNAPSHOT + 5.16.0-SNAPSHOT 1.0-beta2 @@ -947,7 +947,7 @@ org.eclipse.che.plugin - che-plugin-testing-junit-ide + che-plugin-testing-junit-runtime ${che.version} @@ -965,11 +965,6 @@ che-plugin-testing-phpunit-server ${che.version} - - org.eclipse.che.plugin - che-plugin-testing-testng-ide - ${che.version} - org.eclipse.che.plugin che-plugin-testing-testng-runtime diff --git a/samples/pom.xml b/samples/pom.xml index 97c3dd2c44..fd819fd9b0 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml org.eclipse.che.sample che-sample-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Sample :: Parent diff --git a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml index c1276569fc..b623ba883a 100644 --- a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml +++ b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-actions-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-actions-ide jar diff --git a/samples/sample-plugin-actions/pom.xml b/samples/sample-plugin-actions/pom.xml index d988129ad4..5ff2c835b1 100644 --- a/samples/sample-plugin-actions/pom.xml +++ b/samples/sample-plugin-actions/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-actions-parent diff --git a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml index b44906f917..55ec6d69ff 100644 --- a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml +++ b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-embedjs-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-embedjs-ide jar diff --git a/samples/sample-plugin-embedjs/pom.xml b/samples/sample-plugin-embedjs/pom.xml index b83f65fce6..107953e511 100644 --- a/samples/sample-plugin-embedjs/pom.xml +++ b/samples/sample-plugin-embedjs/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-embedjs-parent diff --git a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml index e14fc70d91..5dabee0ea8 100644 --- a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml +++ b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-filetype-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-filetype-ide jar diff --git a/samples/sample-plugin-filetype/pom.xml b/samples/sample-plugin-filetype/pom.xml index c2950cb3dc..079146b134 100644 --- a/samples/sample-plugin-filetype/pom.xml +++ b/samples/sample-plugin-filetype/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-filetype-parent diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml index a8c1be2664..fd2016a1b1 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-json-ide jar diff --git a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml index aa77c9c36c..fa38a3abea 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-json-server Che Sample :: Plugin JSON :: Server diff --git a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml index 86325e824b..dfcacbe5c5 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-json-shared Che Sample :: Plugin JSON :: Shared diff --git a/samples/sample-plugin-json/pom.xml b/samples/sample-plugin-json/pom.xml index 4adf57fc9c..d855ad724f 100644 --- a/samples/sample-plugin-json/pom.xml +++ b/samples/sample-plugin-json/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-json-parent diff --git a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml index 5d34238c51..323531a7b3 100644 --- a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml +++ b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-nativeaccess-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-nativeaccess-ide jar diff --git a/samples/sample-plugin-nativeaccess/pom.xml b/samples/sample-plugin-nativeaccess/pom.xml index f784778fc8..3d1e0647de 100644 --- a/samples/sample-plugin-nativeaccess/pom.xml +++ b/samples/sample-plugin-nativeaccess/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-nativeaccess-parent diff --git a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml index 0afc00a89b..3ed3b00bda 100644 --- a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml +++ b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-parts-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-parts-ide jar diff --git a/samples/sample-plugin-parts/pom.xml b/samples/sample-plugin-parts/pom.xml index 7e2650112b..3f6c7aac4a 100644 --- a/samples/sample-plugin-parts/pom.xml +++ b/samples/sample-plugin-parts/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-parts-parent diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml index 646e5c5fe6..624ffbd0a8 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-serverservice-ide jar diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml index 5ee9c045d5..f6dc5a7d5c 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-serverservice-server Che Sample :: Plugin ServerService :: Server diff --git a/samples/sample-plugin-serverservice/pom.xml b/samples/sample-plugin-serverservice/pom.xml index cab23d2d39..178ce08385 100644 --- a/samples/sample-plugin-serverservice/pom.xml +++ b/samples/sample-plugin-serverservice/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-serverservice-parent diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml index 7a19ea4784..e2a3e3509b 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-wizard-ide jar diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml index 849767b249..aed1492dc5 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-wizard-server Che Sample :: Plugin Wizard :: Server diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml index 088619115c..ae8645fb4c 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-sample-plugin-wizard-shared Che Sample :: Plugin Wizard :: Shared diff --git a/samples/sample-plugin-wizard/pom.xml b/samples/sample-plugin-wizard/pom.xml index 8153a7ea38..7d9fb84f30 100644 --- a/samples/sample-plugin-wizard/pom.xml +++ b/samples/sample-plugin-wizard/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml che-sample-plugin-wizard-parent diff --git a/wsagent/activity/pom.xml b/wsagent/activity/pom.xml index 1af9c4cc35..b7d44ed271 100644 --- a/wsagent/activity/pom.xml +++ b/wsagent/activity/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT activity Che Core :: API :: Activity diff --git a/wsagent/agent/pom.xml b/wsagent/agent/pom.xml index 267f98f28f..8dfe807d8c 100644 --- a/wsagent/agent/pom.xml +++ b/wsagent/agent/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT wsagent Workspace Agent diff --git a/wsagent/che-core-api-debug-shared/pom.xml b/wsagent/che-core-api-debug-shared/pom.xml index 188df67c10..4504869efb 100644 --- a/wsagent/che-core-api-debug-shared/pom.xml +++ b/wsagent/che-core-api-debug-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-debug-shared jar diff --git a/wsagent/che-core-api-debug/pom.xml b/wsagent/che-core-api-debug/pom.xml index 55cbff96b7..1cab90df9d 100644 --- a/wsagent/che-core-api-debug/pom.xml +++ b/wsagent/che-core-api-debug/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-debug Che Core :: API :: Debug diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml index 6960799887..7249f6add1 100644 --- a/wsagent/che-core-api-git-shared/pom.xml +++ b/wsagent/che-core-api-git-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-git-shared jar diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml index eccd5bcb4f..4dbdbca00a 100644 --- a/wsagent/che-core-api-git/pom.xml +++ b/wsagent/che-core-api-git/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-git jar diff --git a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml index 515d279d51..1c6ddc650d 100644 --- a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml +++ b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-languageserver-maven-plugin maven-plugin diff --git a/wsagent/che-core-api-languageserver-shared/pom.xml b/wsagent/che-core-api-languageserver-shared/pom.xml index d0a3398bac..2fb67cd21b 100644 --- a/wsagent/che-core-api-languageserver-shared/pom.xml +++ b/wsagent/che-core-api-languageserver-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-languageserver-shared jar diff --git a/wsagent/che-core-api-languageserver/pom.xml b/wsagent/che-core-api-languageserver/pom.xml index 71de98a17c..d92e5eb9bb 100644 --- a/wsagent/che-core-api-languageserver/pom.xml +++ b/wsagent/che-core-api-languageserver/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-languageserver jar diff --git a/wsagent/che-core-api-oauth/pom.xml b/wsagent/che-core-api-oauth/pom.xml index fc97c4b33e..ba8007777c 100644 --- a/wsagent/che-core-api-oauth/pom.xml +++ b/wsagent/che-core-api-oauth/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-oauth jar diff --git a/wsagent/che-core-api-project-shared/pom.xml b/wsagent/che-core-api-project-shared/pom.xml index d18d7d9de4..788866efec 100644 --- a/wsagent/che-core-api-project-shared/pom.xml +++ b/wsagent/che-core-api-project-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-project-shared jar diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml index d3bd9cbed7..ae0335e086 100644 --- a/wsagent/che-core-api-project/pom.xml +++ b/wsagent/che-core-api-project/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-project jar @@ -101,7 +101,7 @@ org.eclipse.che.core che-core-api-project-shared - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.core diff --git a/wsagent/che-core-api-testing-shared/pom.xml b/wsagent/che-core-api-testing-shared/pom.xml index f27b912ce8..8ae98a857a 100644 --- a/wsagent/che-core-api-testing-shared/pom.xml +++ b/wsagent/che-core-api-testing-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-testing-shared Che Core :: API :: Testing Shared diff --git a/wsagent/che-core-api-testing/pom.xml b/wsagent/che-core-api-testing/pom.xml index 8f252d5ae9..bcbcff2f1e 100644 --- a/wsagent/che-core-api-testing/pom.xml +++ b/wsagent/che-core-api-testing/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-testing Che Core :: API :: Testing diff --git a/wsagent/che-core-git-impl-jgit/pom.xml b/wsagent/che-core-git-impl-jgit/pom.xml index 9cede1e1d8..014b55435e 100644 --- a/wsagent/che-core-git-impl-jgit/pom.xml +++ b/wsagent/che-core-git-impl-jgit/pom.xml @@ -17,7 +17,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-git-impl-jgit jar diff --git a/wsagent/che-core-ssh-key-ide/pom.xml b/wsagent/che-core-ssh-key-ide/pom.xml index ee69d4618c..6eedd41c4d 100644 --- a/wsagent/che-core-ssh-key-ide/pom.xml +++ b/wsagent/che-core-ssh-key-ide/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-ide diff --git a/wsagent/che-core-ssh-key-server/pom.xml b/wsagent/che-core-ssh-key-server/pom.xml index 2151616831..c0716241fe 100644 --- a/wsagent/che-core-ssh-key-server/pom.xml +++ b/wsagent/che-core-ssh-key-server/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-server diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml index f0da3499d8..5fbd4d1b15 100644 --- a/wsagent/che-wsagent-core/pom.xml +++ b/wsagent/che-wsagent-core/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-wsagent-core war diff --git a/wsagent/pom.xml b/wsagent/pom.xml index 3c663904b0..7da1856f4d 100644 --- a/wsagent/pom.xml +++ b/wsagent/pom.xml @@ -16,12 +16,12 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../core/pom.xml org.eclipse.che.core che-agent-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Agent Parent diff --git a/wsagent/wsagent-local/pom.xml b/wsagent/wsagent-local/pom.xml index db6745a381..c6051edae0 100644 --- a/wsagent/wsagent-local/pom.xml +++ b/wsagent/wsagent-local/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT wsagent-local Che Core :: API :: Agent diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml index 838f32e6e2..74675083c7 100644 --- a/wsmaster/che-core-api-account/pom.xml +++ b/wsmaster/che-core-api-account/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-account Che Core :: API :: Account diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml index 82367faf48..c667261810 100644 --- a/wsmaster/che-core-api-auth-shared/pom.xml +++ b/wsmaster/che-core-api-auth-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-auth-shared jar diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml index cdb8a2e06e..e0267aa590 100644 --- a/wsmaster/che-core-api-auth/pom.xml +++ b/wsmaster/che-core-api-auth/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-auth jar diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml index 9db232def8..e275431a98 100644 --- a/wsmaster/che-core-api-factory-shared/pom.xml +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-factory-shared jar diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml index cfb93533fd..daa2d7e8c0 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-factory jar diff --git a/wsmaster/che-core-api-installer-shared/pom.xml b/wsmaster/che-core-api-installer-shared/pom.xml index 0c5f485fef..fdbeb5c8fc 100644 --- a/wsmaster/che-core-api-installer-shared/pom.xml +++ b/wsmaster/che-core-api-installer-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-installer-shared jar diff --git a/wsmaster/che-core-api-installer/pom.xml b/wsmaster/che-core-api-installer/pom.xml index 8bf22e80f9..bef679f7e5 100644 --- a/wsmaster/che-core-api-installer/pom.xml +++ b/wsmaster/che-core-api-installer/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-installer jar diff --git a/wsmaster/che-core-api-project-templates-shared/pom.xml b/wsmaster/che-core-api-project-templates-shared/pom.xml index e01bfab781..36df011bb7 100644 --- a/wsmaster/che-core-api-project-templates-shared/pom.xml +++ b/wsmaster/che-core-api-project-templates-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-project-templates-shared Che Core :: API :: Project Templates :: Shared diff --git a/wsmaster/che-core-api-project-templates/pom.xml b/wsmaster/che-core-api-project-templates/pom.xml index d440f39900..868b880018 100644 --- a/wsmaster/che-core-api-project-templates/pom.xml +++ b/wsmaster/che-core-api-project-templates/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-project-templates Che Core :: API :: Project Templates diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml index 21762d7a39..9e3286e842 100644 --- a/wsmaster/che-core-api-ssh-shared/pom.xml +++ b/wsmaster/che-core-api-ssh-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-ssh-shared jar diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml index f7362a621e..d244e6cdff 100644 --- a/wsmaster/che-core-api-ssh/pom.xml +++ b/wsmaster/che-core-api-ssh/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-ssh jar diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml index f87b90bc9d..07fd91c38b 100644 --- a/wsmaster/che-core-api-system-shared/pom.xml +++ b/wsmaster/che-core-api-system-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-system-shared jar diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml index 8e361140ba..dc74d41110 100644 --- a/wsmaster/che-core-api-system/pom.xml +++ b/wsmaster/che-core-api-system/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-system jar diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml index 3013bceb68..9d5fb213fa 100644 --- a/wsmaster/che-core-api-user-shared/pom.xml +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-user-shared Che Core :: API :: User :: Shared diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml index 226bce685b..6722226b65 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-user Che Core :: API :: User diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml index 6d318b2243..a10b578292 100644 --- a/wsmaster/che-core-api-workspace-shared/pom.xml +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-workspace-shared jar diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml index 2bee848e45..56b7b248da 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-api-workspace jar diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml index 0f93b0ecf0..ee8dcfc81d 100644 --- a/wsmaster/che-core-sql-schema/pom.xml +++ b/wsmaster/che-core-sql-schema/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT che-core-sql-schema Che Core :: SQL :: Schema diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml index 3470b662e0..52cd7737f5 100644 --- a/wsmaster/integration-tests/cascade-removal/pom.xml +++ b/wsmaster/integration-tests/cascade-removal/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT cascade-removal Integration Tests :: Cascade Removal diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml index 1412fa39d6..9c2b52cf70 100644 --- a/wsmaster/integration-tests/pom.xml +++ b/wsmaster/integration-tests/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../pom.xml integration-tests-parent diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml index 94273b4ae7..61757b2900 100644 --- a/wsmaster/integration-tests/postgresql-tck/pom.xml +++ b/wsmaster/integration-tests/postgresql-tck/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT postgresql-tck jar diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index 671d81ad16..f728202896 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -16,11 +16,11 @@ che-core-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT ../core/pom.xml che-master-parent - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT pom Che Master Parent diff --git a/wsmaster/wsmaster-local/pom.xml b/wsmaster/wsmaster-local/pom.xml index a47b7a5f61..97f523dcf2 100644 --- a/wsmaster/wsmaster-local/pom.xml +++ b/wsmaster/wsmaster-local/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.15.0-SNAPSHOT + 5.16.0-SNAPSHOT wsmaster-local Che Core :: API :: Impl Local