Commit Graph

139 Commits (cfc97517334f7b7a8886466cd40718cd5fc44263)

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
Oleksandr Garagatyi 90142e268c Move Docker client to Docker infrastructure packaging (#6779)
Also, remove OpenShiftConnector as it is replaced with OpenShift
infrastructure.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-18 15:08:55 +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
Artem Zatsarynnyi ba47c0b825 Port AppStatesPreferenceCleaner to spi branch (#6611)
* Port AppStatesPreferenceCleaner from master branch. Class has been missed as a result of previous merges.

* Move AppStatesPreferenceCleaner to che-core-api-workspace.

* Move WorkspaceRemovedEvent and WorkspaceCreatedEvent to che-core-api-workspace-shared;
Move AppStatesPreferenceCleaner to che-core-api-user
2017-10-07 09:56:03 +03:00
Artem Zatsarynnyi 89ba171893 Merge branch 'master' into spi 2017-09-26 10:24:43 +03:00
Sergii Leshchenko f1d2a2c647 Fix logging when an exception occurs on operations with workspaces' ssh keys (#6419) 2017-09-25 16:47:31 +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 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
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
Oleksandr Garagatyi 8be2f0e4dc CHE-5871: Refactor DockerMachineStarter
Refactor DockerMachineStarter to clean it up and reduce
its responsibilities. Move container configuration applying
to InfrastructureProvisioners.
Move classes to different packages to create some structure and
reduce classes mess in a single package.
Uncomment some commented tests.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-08-09 11:35:32 +03:00
Roman Iuvshyn c2eb3188c1 RELEASE: Set next development version (#5949) 2017-08-09 11:17:20 +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
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
Max Shaposhnik 89896f6c7f Handling bootstrapper & installer events. (#5345) 2017-06-13 11:42:20 +00:00
Artem Zatsarynnyi 1d5648fd6e Fix building project with maven (#5354) 2017-06-12 23:48:28 +03:00
Artem Zatsarynnyi 11abb61488 Merge branch 'master' into spi 2017-06-12 10:48:59 +03:00
Sergii Leshchenko ac8d44e579 CHE-4058 Removed usage name of a current user as a namespace (#5207)
Also, it contains fixing logging errors while fetching user by namespace
2017-06-02 11:56:34 +03:00
Gennady Azarenkov 8ad21b4638 SPI messaging and code clean 2017-05-25 21:12:12 +03:00
Artem Zatsarynnyi 993e8df52e Merge branch 'master' into spi 2017-05-24 12:16:17 +03:00
Roman Iuvshin 9fbf173eb9 RELEASE: Set next development version 2017-05-24 07:30:41 +00:00
Alexander Garagatyi 21c4589086 Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-05-15 12:27:23 +03:00
Roman Iuvshin b3ae33acf5 RELEASE: Set next development version 2017-05-10 10:54:42 +00:00
Alexander Garagatyi 7877e47f6a Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-04-27 12:08:59 +03:00
Roman Iuvshin 6d88cf8c73 [maven-release-plugin] prepare for next development iteration 2017-04-25 18:19:17 +00:00
Roman Iuvshin d7f023fd89 [maven-release-plugin] prepare release 5.9.0 2017-04-25 18:19:10 +00:00
Alexander Garagatyi 5e95640fd6 Remove che-core-api-machine module
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-04-20 17:06:05 +03:00
Alexander Garagatyi 7e0ed03cf2 Merge branch 'master' into spi 2017-04-19 16:52:48 +03:00
Roman Iuvshin 7805c146e6 [maven-release-plugin] prepare for next development iteration 2017-04-13 11:07:13 +00:00
Roman Iuvshin e8107fd96c [maven-release-plugin] prepare release 5.8.0 2017-04-13 11:07:06 +00:00
Yevhenii Voevodin c753175655 servers starts 2017-04-13 10:50:13 +03:00
Yevhenii Voevodin 38cc160c79 allow to stop context 2017-04-12 16:54:42 +03:00
Roman Iuvshin 840ae853f8 Revert "RELEASE: set minor change version"
This reverts commit e23b9257a3.
2017-04-11 20:55:24 +03:00
Roman Iuvshin e23b9257a3 RELEASE: set minor change version 2017-04-11 18:10:45 +03:00
Roman Iuvshin 08d4d0f25c [maven-release-plugin] prepare for next development iteration 2017-04-06 14:28:39 +00:00
Roman Iuvshin 53a0325213 [maven-release-plugin] prepare release 5.7.0 2017-04-06 14:28:33 +00:00