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
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
f4cc97acce
Set next version 6.0.0-M1-SNAPSHOT
2017-10-19 13:53:40 +03:00
f34021b968
Remove svn plugin ( #6745 )
...
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
2017-10-17 15:19:04 +03:00
e321ab00b1
Merge with master
2017-10-15 14:33:47 +03:00
9581a9bbef
Move to mockito 2.10
...
Some changes are required like
- anyString() --> nullable(String.class) for many tests as in fact we provide null values
- add class for VerificationMode as there are more than one method now (can't use lambdas)
- remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
- remove unecessary stubbing (mockito is now reporting un-needed stubs)
Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-15 10:34:15 +02:00
abe3271908
RELEASE: Set next development version ( #6692 )
...
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
ee01b2998f
Multi-user Eclipse Che ( #6441 )
...
Multi-user Eclipse Che (#6441 )
#### How to run it.
```docker run -it -e CHE_MULTIUSER=true -e CHE_HOST=<your ip> -e CHE_KEYCLOAK_AUTH-SERVER-URL=http://<your ip>:5050/auth -v /var/run/docker.sock:/var/run/docker.sock -v ~/.che-multiuser:/data eclipse/che:nightly start --skip:pull --skip:nightly```
#### How to manage it
- Keycloak configured with two realms. ```Master``` and ```che```. Also we have one user admin/admin in both realm. Admin user in master realm is - super admin.
- Eclipse Che configured for che realm
- We enabled user registration in ```Che``` realm
#### Known limitation
- swagger would not work. We need to upgrade a version. to support openid authentification https://github.com/eclipse/che/issues/6015
- It's working on local docker. We are going to provide scalable version based on OpenShift on next versions.
- Invitation of non-existent users to Eclipse Che organization https://github.com/eclipse/che/issues/6335
#### How to run it when it is in a branch
To run an multiuser Che version, the following steps are required after building the branch:
- Rebuild init, cli and che images (in the given sequence). To do that, proceed to folder _dockerfiles/<image_name>_ and run _build.sh_
- Run Che in a usual way using cli, with additional parameters: `-e CHE_MULTIUSER=true` and `--skip:pull --skip:nightly`
Full command example:
`docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v /home/user/.che:/data -e CHE_MULTIUSER=true eclipse/che-cli:nightly start --skip:pull --skip:nightly`
- MacOS users may need to edit _che.env_ file in the data folder, changing `CHE_HOST` and `CHE_KEYCLOAK_AUTH__SERVER__URL` values to their specific IP.
When start is succeeded, the following docker containers should be created:
- che, exposing 8080 port;
- che_keycloak, exposing 5050 port;
- che_postgres, exposing 5432 port;
2017-10-06 17:27:27 +03:00
108b3d832b
Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser
...
# Conflicts:
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
# dockerfiles/init/manifests/che.env
# plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
# plugins/plugin-docker/pom.xml
# plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
# pom.xml
# wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
# wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
# wsmaster/che-core-api-machine/pom.xml
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
2017-09-28 12:33:07 +03:00
685def4d29
Merge branch 'master' into spi
2017-09-21 09:24:39 +03:00
546ba4e4ea
Merge with master
2017-09-20 11:34:18 +03:00
8e03d56bfb
RELEASE: Set next development version ( #6345 )
2017-09-19 14:52:53 +03:00
d4f03cbc4a
Ability to authenticate Oauth flow ( #6326 )
...
* Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* Fix dashboard build
* fixup! Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* Add security token for websocket url (#6319 )
* Add security token for websocket url
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
* Fix failed test (#6325 )
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-09-18 18:42:49 +03:00
04be689c69
Merge branch 'master' into spi
2017-09-04 11:51:57 +03:00
2850a74a11
RELEASE: Set next development version ( #6067 )
2017-08-23 11:11:34 +03:00
6e9825c699
Used Google Java Codestyle
2017-08-18 17:16:54 +03:00
5b373e6cf5
Used Google Java Codestyle ( #5851 )
2017-08-18 17:00:58 +03:00
a552e67a76
Merge branch 'master' into spi
2017-08-17 16:40:48 +03:00
51fed52707
Merge branch 'master' into spi
2017-08-17 15:21:26 +03:00
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
c2eb3188c1
RELEASE: Set next development version ( #5949 )
2017-08-09 11:17:20 +03:00
dd66566958
IDE API reorganization ( #5867 )
2017-08-01 18:16:59 +03:00
32de1e7447
Rename methods ( #5762 )
...
AppContext#getMasterEndpoint -> AppContext#getMasterApiEndpoint
AppContext#getDevAgentEndpoint -> AppContext#getWsAgentServerApiEndpoint
2017-07-21 10:15:20 +03:00
b851196df5
Merge branch 'master' into spi
2017-07-20 12:30:15 +03:00
185273f8b9
RELEASE: Set next development version ( #5734 )
...
* RELEASE: Set next development version
2017-07-19 12:45:32 +03:00
1ba5f63d8f
Merge branch 'master' into spi
2017-06-29 17:45:59 +03:00
eab04ddd6b
RELEASE: Set next development version
2017-06-29 07:59:05 +00:00
ad2460999e
Merge branch 'master' into spi
2017-06-22 08:27:59 +03:00
513aa19ebd
RELEASE: Set next development version
2017-06-21 13:04:16 +00:00
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
eb2fa0eeed
RELEASE: Set next development version
2017-06-14 07:13:04 +00:00
fe60e9f143
CHE-4007: Remove deprecated methods in GitHubClientService ( #5322 )
2017-06-13 09:26:24 +00:00
1d5648fd6e
Fix building project with maven ( #5354 )
2017-06-12 23:48:28 +03:00
ad3bc4d739
Use Workdspace's and Factory's model objects in IDE ( #5221 )
2017-05-29 16:19:43 +03:00
993e8df52e
Merge branch 'master' into spi
2017-05-24 12:16:17 +03:00
9fbf173eb9
RELEASE: Set next development version
2017-05-24 07:30:41 +00:00
21c4589086
Merge branch 'master' into spi
...
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-05-15 12:27:23 +03:00
856ca353c2
clean-up IDE code
2017-05-13 16:58:12 +03:00
b3ae33acf5
RELEASE: Set next development version
2017-05-10 10:54:42 +00:00
9ef71488a8
CHE-4462; Separate master and agents OAuth modules; ( #4919 )
2017-04-27 07:15:14 +00:00
6d88cf8c73
[maven-release-plugin] prepare for next development iteration
2017-04-25 18:19:17 +00:00
d7f023fd89
[maven-release-plugin] prepare release 5.9.0
2017-04-25 18:19:10 +00:00
7805c146e6
[maven-release-plugin] prepare for next development iteration
2017-04-13 11:07:13 +00:00
e8107fd96c
[maven-release-plugin] prepare release 5.8.0
2017-04-13 11:07:06 +00:00
840ae853f8
Revert "RELEASE: set minor change version"
...
This reverts commit e23b9257a3
2017-04-11 20:55:24 +03:00
e23b9257a3
RELEASE: set minor change version
2017-04-11 18:10:45 +03:00
08d4d0f25c
[maven-release-plugin] prepare for next development iteration
2017-04-06 14:28:39 +00:00
53a0325213
[maven-release-plugin] prepare release 5.7.0
2017-04-06 14:28:33 +00:00
6f25db4709
Added factory images ( #4725 )
2017-04-06 16:04:55 +03:00
62d32687c2
Factory migration ( #4413 )
2017-04-03 15:11:45 +03:00
342f103654
[maven-release-plugin] prepare for next development iteration
2017-03-30 12:25:35 +00:00
e6e4a652cc
[maven-release-plugin] prepare release 5.6.0
2017-03-30 12:25:28 +00:00
2bf0470022
CHE-3930: Move SshServiceClient from wsmaster to wsagent war ( #4386 )
2017-03-17 14:05:20 +02:00
e7588aa2b3
[maven-release-plugin] prepare for next development iteration
2017-03-15 14:59:35 +00:00
69cf9f5528
[maven-release-plugin] prepare release 5.5.0
2017-03-15 14:59:28 +00:00
ceff3938ff
[maven-release-plugin] prepare for next development iteration
2017-03-02 18:33:12 +00:00
8ed6e10476
[maven-release-plugin] prepare release 5.4.0
2017-03-02 18:33:06 +00:00
445c24c03d
Use https instead of http in web links. ( #4276 )
...
Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
2017-03-01 14:58:58 +02:00
e71c7b5671
[maven-release-plugin] prepare for next development iteration
2017-02-17 11:04:07 +00:00
c071c65aa2
[maven-release-plugin] prepare release 5.3.0
2017-02-17 11:03:59 +00:00
0dd0dea686
[maven-release-plugin] prepare for next development iteration
2017-02-01 13:31:32 +00:00
d138c3623f
[maven-release-plugin] prepare release 5.2.0
2017-02-01 13:31:25 +00:00
05a7cd53b5
[maven-release-plugin] prepare for next development iteration
2017-01-18 16:33:24 +00:00
41d3739928
[maven-release-plugin] prepare release 5.1.0
2017-01-18 16:33:17 +00:00
88a1fa41ca
Base URL to the master will be provided by AppContext ( #3658 )
...
Add ability to take base endpoint to thews master from AppContext
Mark RestContextProvider ad deprecated
Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
2017-01-13 14:40:25 +02:00
9904460818
[maven-release-plugin] prepare for next development iteration
2017-01-06 11:48:49 +00:00
b5a7d04ca2
[maven-release-plugin] prepare release 5.0.0
2017-01-06 11:48:42 +00:00
0e8b21ad3f
Set new license year
2017-01-04 17:10:31 +02:00
abc1367c1d
remove milestone from version
2016-12-23 15:04:56 +02:00
813d930275
change version to M10-SNAPSHOT
2016-12-22 11:48:31 +02:00
7850cc2908
[maven-release-plugin] prepare for next development iteration
2016-12-07 12:34:30 +00:00
1c15a44844
[maven-release-plugin] prepare release 5.0.0-M8
2016-12-07 12:34:25 +00:00
52f84d9092
[maven-release-plugin] prepare for next development iteration
2016-11-10 11:37:24 +00:00
315056731e
[maven-release-plugin] prepare release 5.0.0-M7
2016-11-10 11:37:20 +00:00
494442e11a
CHE-2015 Rename configuration properties
2016-10-27 17:29:46 +03:00
825af31a5d
[maven-release-plugin] prepare for next development iteration
2016-10-26 09:37:49 +00:00
7da1d4a910
[maven-release-plugin] prepare release 5.0.0-M6
2016-10-26 09:37:45 +00:00
b986091e4a
[maven-release-plugin] prepare for next development iteration
2016-10-07 10:22:41 +00:00
8f799b4c28
[maven-release-plugin] prepare release 5.0.0-M5
2016-10-07 10:22:37 +00:00
67f78d7711
Fix scope to be compliant as well with #2610 issue ( #2696 )
...
-Dmaven.test.skip=true should work
Fix #2610
Change-Id: I27294cb9d2f161d30174d2d7cceb0cf758f6be50
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2016-10-05 09:58:58 +02:00
33944c6ec1
set M5 version
2016-09-27 16:08:19 +03:00
152be21b4f
[maven-release-plugin] prepare for next development iteration
2016-09-26 14:19:41 +00:00
89ab012035
[maven-release-plugin] prepare release 5.0.0-M3
2016-09-26 14:19:37 +00:00
900ccbb807
set M3 version
2016-09-20 17:31:42 +03:00
c84340807b
CHE-2286: disable menu items until the workspace is not loaded or stopped
...
Signed-off-by: Oleksii Orel <oorel@codenvy.com>
2016-09-19 10:46:06 +03:00
3c1df2e4ad
[maven-release-plugin] prepare for next development iteration
2016-09-14 15:50:20 +00:00
b647b5eef7
[maven-release-plugin] prepare release 5.0.0-M1
2016-09-14 15:50:16 +00:00
8df0560ad3
set new version
2016-09-07 10:38:51 +03:00
ca14fc7470
[maven-release-plugin] prepare for next development iteration
2016-08-29 15:12:16 +00:00
36311ea4c8
[maven-release-plugin] prepare release 4.7.0
2016-08-29 15:12:12 +00:00
813b36851c
[maven-release-plugin] prepare for next development iteration
2016-08-16 08:28:05 +00:00
ef38dd5fb2
[maven-release-plugin] prepare release 4.7.0-RC1
2016-08-16 08:28:02 +00:00
3a846378f6
Add support for checkout exception
...
add a mapper for checkout git exceptions
add new messages : GitConlict , GitInvalidRefName , GitRefAlreadyExist , GitRefNotFound
Signed-off-by: i053322 <yossi.balan@sap.com>
2016-08-09 10:28:58 +03:00
34593e1273
CHE-2033 Rename Plugin Github package
2016-08-04 11:01:16 +03:00
99b6beb356
[maven-release-plugin] prepare for next development iteration
2016-08-01 10:32:16 +00:00
3a0fd2a00c
[maven-release-plugin] prepare release 4.6.0
2016-08-01 10:32:13 +00:00
175e5e4cbc
Fix possible NPE if GitHub repo don't have description ( #1997 )
...
Signed-off-by: Vitaly Parfonov <vparfonov@codenvy.com>
2016-07-29 18:37:45 +03:00
f9369146c1
[maven-release-plugin] prepare for next development iteration
2016-07-18 13:58:51 +00:00
b6795f1a9a
[maven-release-plugin] prepare release 4.5.0
2016-07-18 13:58:48 +00:00
d1aa2cfed7
User structural refactoring
2016-07-05 11:27:58 +03:00
Florent BENOIT