Commit Graph

159 Commits (287c98d9c4df17258c8fc86baa79b78a6d9ea202)

Author SHA1 Message Date
Florent BENOIT 3f262e620e Cleanup some Mockito deprecated usage (che6) (#6864)
* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner

Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-21 09:07:43 +02:00
Florent BENOIT 6a95b6d74a Apply google format v1.4 https://github.com/google/google-java-format/releases/tag/google-java-format-1.4
Change-Id: I5df30c23165df1fd39eef4c57893bebd1d681c1d
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-19 22:23:04 +02:00
Sergii Kabashniuk f4cc97acce Set next version 6.0.0-M1-SNAPSHOT 2017-10-19 13:53:40 +03:00
Sergii Kabashniuk e321ab00b1 Merge with master 2017-10-15 14:33:47 +03:00
Roman Iuvshyn abe3271908 RELEASE: Set next development version (#6692)
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
Sergii Kabashniuk 70ac13c008 Merge remote-tracking branch 'origin/master' into che6 2017-10-12 16:14:51 +03:00
Dmytro Kulieshov c35d27e7eb Removing deprecated FileTreeWatcher (#6688) 2017-10-12 15:21:55 +03:00
Artem Zatsarynnyi 22c21265aa Merge branch 'master' into spi 2017-10-11 10:16:43 +03:00
Valeriy Svydenko e2439d78d9 Send events from server to client about project's changes (#6628) 2017-10-10 15:46:27 +03:00
Artem Zatsarynnyi 685def4d29 Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
Roman Iuvshyn 8e03d56bfb RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
Artem Zatsarynnyi 9866284b67 Merge branch 'master' into spi 2017-09-12 11:36:21 +03:00
Florent BENOIT e56989159a lazily init the local repository.
Change-Id: I7cf8aff6b655f4040426bf9152fe98c6f0d34ef4
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-11 11:03:41 +02:00
Artem Zatsarynnyi 04be689c69 Merge branch 'master' into spi 2017-09-04 11:51:57 +03:00
Roman Iuvshyn 2850a74a11 RELEASE: Set next development version (#6067) 2017-08-23 11:11:34 +03:00
Sergii Kabashniuk 6e9825c699 Used Google Java Codestyle 2017-08-18 17:16:54 +03:00
Sergii Kabashniuk 5b373e6cf5 Used Google Java Codestyle (#5851) 2017-08-18 17:00:58 +03:00
Sergii Kabashniuk 1ca8cecad5 Merge with master 2017-08-17 18:13:10 +03:00
Mykhailo Kuznietsov ce41b4a71d Change copyright owner to "Red Hat, Inc" on remaining files (#6032)
* Change copyright owner on remaining files

* fixup! Change copyright owner on remaining files

* fixup! fixup! Change copyright owner on remaining files
2017-08-17 18:05:53 +03:00
Artem Zatsarynnyi a552e67a76 Merge branch 'master' into spi 2017-08-17 16:40:48 +03:00
Artem Zatsarynnyi 51fed52707 Merge branch 'master' into spi 2017-08-17 15:21:26 +03:00
Mykhailo Kuznietsov 69d5148385 Changed copyright owner to "Red Hat, Inc." in license headers (#5964)
Change license header contributor to Red Hat, Inc.
2017-08-11 10:46:58 +03:00
Roman Iuvshyn c2eb3188c1 RELEASE: Set next development version (#5949) 2017-08-09 11:17:20 +03:00
Artem Zatsarynnyi c9d0c12923 Merge branch 'master' into spi 2017-08-02 10:05:43 +03:00
Valeriy Svydenko 65c2201473 CHE-5725: Run all java tests from the project or package (#5804) 2017-08-01 16:56:13 +03:00
Artem Zatsarynnyi b851196df5 Merge branch 'master' into spi 2017-07-20 12:30:15 +03:00
Roman Iuvshyn 185273f8b9 RELEASE: Set next development version (#5734)
* RELEASE: Set next development version
2017-07-19 12:45:32 +03:00
Yevhen Vydolob 3c2aa13b59 fix build (#5666)
Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
2017-07-17 10:25:51 +03:00
Artem Zatsarynnyi e346d42050 Fix merge 2017-07-17 08:16:29 +03:00
Artem Zatsarynnyi a3a91c820c Merge branch 'master' into spi 2017-07-17 07:50:32 +03:00
Thomas Mäder 2a57ca8cf2 Use LSP for pom editor (#5641)
Signed-off-by: Thomas Mäder <tmader@redhat.com>
2017-07-14 17:15:14 +02:00
Artem Zatsarynnyi 51cd595497 Merge branch 'master' into spi 2017-07-14 16:03:43 +03:00
Vitalii Parfonov 95a09d6544 Avoid using ProjectManager only for taking project root dir instead of we will use special properties (#5636)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-07-13 15:39:50 +03:00
Artem Zatsarynnyi c49aeb0977 Merge branch 'master' into spi 2017-07-13 10:24:36 +03:00
Alexander Garagatyi 2b45703841 Move mvn and svn tests execution to integration profile (#5596)
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-07-12 12:25:17 +03:00
Artem Zatsarynnyi da2b92c66e Merge branch 'master' into spi 2017-07-12 11:37:57 +03:00
Valeriy Svydenko a5b3b7b612 New runner for TestNG tests (#5472) 2017-07-06 16:20:58 +03:00
Valeriy Svydenko 2e8d802789 CHE-5350: change names of methods for WebSocket communication (#5543) 2017-07-06 14:38:09 +03:00
Artem Zatsarynnyi a1dfdfb04e Merge branch 'master' into spi 2017-07-05 18:25:50 +03:00
Valeriy Svydenko ef74274eba CHE-5350: rework Maven plugin to avoid using Everrest Websocket (#5527) 2017-07-05 16:22:51 +03:00
Artem Zatsarynnyi 1ba5f63d8f Merge branch 'master' into spi 2017-06-29 17:45:59 +03:00
Roman Iuvshin eab04ddd6b RELEASE: Set next development version 2017-06-29 07:59:05 +00:00
Artem Zatsarynnyi ad2460999e Merge branch 'master' into spi 2017-06-22 08:27:59 +03:00
Roman Iuvshin 513aa19ebd RELEASE: Set next development version 2017-06-21 13:04:16 +00:00
Artem Zatsarynnyi cce79bf469 Merge branch 'master' into spi
# Conflicts:
#	assembly/assembly-wsmaster-war/pom.xml
#	infrastructures/docker/pom.xml
#	plugins/plugin-docker/che-plugin-docker-compose/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	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
#	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
#	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
#	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
#	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
#	pom.xml
#	wsmaster/che-core-api-machine/pom.xml
2017-06-15 10:35:47 +03:00
Roman Iuvshin eb2fa0eeed RELEASE: Set next development version 2017-06-14 07:13:04 +00:00
Yevhen Vydolob e4f0f23724 #5356 use java for maven server which ws-agent use (#5363)
Signed-off-by: Even Vidolob <evidolob@codenvy.com>
2017-06-13 15:45:45 +03:00
Artem Zatsarynnyi 1d5648fd6e Fix building project with maven (#5354) 2017-06-12 23:48:28 +03:00
Artem Zatsarynnyi 212bbc7808 Merge branch 'master' into spi 2017-06-01 10:45:08 +03:00
Roman Nikitenko 1c7818f14e CHE-3570. Add ability to turn on/off autosave mode for editor content
Signed-off-by: Roman Nikitenko <rnikitenko@codenvy.com>
2017-05-31 13:29:01 +00:00