diff --git a/assembly/assembly-che-tomcat/pom.xml b/assembly/assembly-che-tomcat/pom.xml
index 6a81652ccc..23e24c3948 100644
--- a/assembly/assembly-che-tomcat/pom.xml
+++ b/assembly/assembly-che-tomcat/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
assembly-che-tomcat
jar
diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
index d3967d222d..aa82a6a8a9 100644
--- a/assembly/assembly-main/pom.xml
+++ b/assembly/assembly-main/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
assembly-main
pom
diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml
index c813854fde..75a2ab98d1 100644
--- a/assembly/assembly-root-war/pom.xml
+++ b/assembly/assembly-root-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
assembly-root-war
war
diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml
index 130a039f02..2f4aaacdf0 100644
--- a/assembly/assembly-swagger-war/pom.xml
+++ b/assembly/assembly-swagger-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
assembly-swagger-war
war
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
index fe7f142a3b..8fb3c3ecfa 100644
--- a/assembly/assembly-wsmaster-war/pom.xml
+++ b/assembly/assembly-wsmaster-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
assembly-wsmaster-war
war
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ca22e401fb..26628e09c8 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-assembly-parent
diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml
index 3a63784a31..668e01c32f 100644
--- a/core/che-core-api-core/pom.xml
+++ b/core/che-core-api-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 c6e68b25cd..765a61a15a 100644
--- a/core/che-core-api-dto-maven-plugin/pom.xml
+++ b/core/che-core-api-dto-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 b5ab4ed6e1..26e1cba5d4 100644
--- a/core/che-core-api-dto/pom.xml
+++ b/core/che-core-api-dto/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 a9c751f918..f132d5a774 100644
--- a/core/che-core-api-model/pom.xml
+++ b/core/che-core-api-model/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-model
jar
diff --git a/core/che-core-logback/pom.xml b/core/che-core-logback/pom.xml
index 37a88d826f..1b32db4bd0 100644
--- a/core/che-core-logback/pom.xml
+++ b/core/che-core-logback/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-logback
jar
diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml
index ae97bb6e15..1a3180c5c1 100644
--- a/core/che-core-metrics-core/pom.xml
+++ b/core/che-core-metrics-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-metrics-core
Che Core :: Commons :: Metrics :: Core
diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml
index e689ade56b..e9e9096f51 100644
--- a/core/che-core-tracing-core/pom.xml
+++ b/core/che-core-tracing-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-tracing-core
Che Core :: Commons :: Tracing :: Core
diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml
index 67b1e0eac6..2d22528ec1 100644
--- a/core/che-core-tracing-metrics/pom.xml
+++ b/core/che-core-tracing-metrics/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-tracing-metrics
Che Core :: Commons :: Tracing :: Metrics
diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml
index c916383845..e695e73060 100644
--- a/core/che-core-tracing-web/pom.xml
+++ b/core/che-core-tracing-web/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-tracing-web
Che Core :: Commons :: Tracing :: Web
diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml
index 8bef4b5cf0..2a8741008a 100644
--- a/core/che-core-typescript-dto-maven-plugin/pom.xml
+++ b/core/che-core-typescript-dto-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-typescript-dto-maven-plugin
maven-plugin
diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml
index 7721d779eb..87b7db4b63 100644
--- a/core/commons/che-core-commons-annotations/pom.xml
+++ b/core/commons/che-core-commons-annotations/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 b8e2aefdc6..2ef07b7e04 100644
--- a/core/commons/che-core-commons-inject/pom.xml
+++ b/core/commons/che-core-commons-inject/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 ee6c0c0794..50348aea72 100644
--- a/core/commons/che-core-commons-j2ee/pom.xml
+++ b/core/commons/che-core-commons-j2ee/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 7dc3518069..2dd7f5418a 100644
--- a/core/commons/che-core-commons-json/pom.xml
+++ b/core/commons/che-core-commons-json/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 de8de41a31..2d6c093f6d 100644
--- a/core/commons/che-core-commons-lang/pom.xml
+++ b/core/commons/che-core-commons-lang/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-commons-lang
jar
diff --git a/core/commons/che-core-commons-observability/pom.xml b/core/commons/che-core-commons-observability/pom.xml
index ba9e54ff65..747f974f15 100644
--- a/core/commons/che-core-commons-observability/pom.xml
+++ b/core/commons/che-core-commons-observability/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-commons-observability
Che Core :: Commons :: Tracing and Monitoring wrapper
diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml
index e18e394874..4c6777e639 100644
--- a/core/commons/che-core-commons-schedule/pom.xml
+++ b/core/commons/che-core-commons-schedule/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 a1d64a07d1..eb7d23b291 100644
--- a/core/commons/che-core-commons-test/pom.xml
+++ b/core/commons/che-core-commons-test/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-commons-test
jar
diff --git a/core/commons/che-core-commons-tracing/pom.xml b/core/commons/che-core-commons-tracing/pom.xml
index e0f0d4ae8d..6e917e1ccf 100644
--- a/core/commons/che-core-commons-tracing/pom.xml
+++ b/core/commons/che-core-commons-tracing/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-commons-tracing
Che Core :: Commons :: Tracing
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 2bb635f665..3d4da64afb 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-core-commons-parent
diff --git a/core/pom.xml b/core/pom.xml
index a96c21a372..127c930e72 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
org.eclipse.che.core
diff --git a/infrastructures/infrastructure-distributed/pom.xml b/infrastructures/infrastructure-distributed/pom.xml
index fb2eeea487..3884b86c0e 100644
--- a/infrastructures/infrastructure-distributed/pom.xml
+++ b/infrastructures/infrastructure-distributed/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
infrastructure-distributed
jar
diff --git a/infrastructures/infrastructure-factory/pom.xml b/infrastructures/infrastructure-factory/pom.xml
index 382374adae..0cde21efca 100644
--- a/infrastructures/infrastructure-factory/pom.xml
+++ b/infrastructures/infrastructure-factory/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
infrastructure-factory
jar
diff --git a/infrastructures/infrastructure-metrics/pom.xml b/infrastructures/infrastructure-metrics/pom.xml
index 65080fc99c..f0434beaa1 100644
--- a/infrastructures/infrastructure-metrics/pom.xml
+++ b/infrastructures/infrastructure-metrics/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
infrastructure-metrics
diff --git a/infrastructures/infrastructure-permission/pom.xml b/infrastructures/infrastructure-permission/pom.xml
index ca35f6058f..706e400bbc 100644
--- a/infrastructures/infrastructure-permission/pom.xml
+++ b/infrastructures/infrastructure-permission/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
infrastructure-permission
Infrastructure :: Kubernetes Permissions
diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml
index b5e320d4eb..0d8f8d49c5 100644
--- a/infrastructures/kubernetes/pom.xml
+++ b/infrastructures/kubernetes/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
infrastructure-kubernetes
Infrastructure :: Kubernetes
diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml
index a92a771aee..15d6c88d7f 100644
--- a/infrastructures/openshift/pom.xml
+++ b/infrastructures/openshift/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
infrastructure-openshift
Infrastructure :: OpenShift
diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml
index 605a7d9904..2905766353 100644
--- a/infrastructures/pom.xml
+++ b/infrastructures/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
org.eclipse.che.infrastructure
diff --git a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
index 86cb0c6ccd..1fb175a3b6 100644
--- a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
+++ b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-authentication-commons
jar
diff --git a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
index 0c3cbd70c5..f7ab05a1e5 100644
--- a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
+++ b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-authorization-impl
jar
diff --git a/multiuser/api/che-multiuser-api-authorization/pom.xml b/multiuser/api/che-multiuser-api-authorization/pom.xml
index b3e5763f0d..0b43d09b2b 100644
--- a/multiuser/api/che-multiuser-api-authorization/pom.xml
+++ b/multiuser/api/che-multiuser-api-authorization/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-authorization
jar
diff --git a/multiuser/api/che-multiuser-api-organization-shared/pom.xml b/multiuser/api/che-multiuser-api-organization-shared/pom.xml
index 0c2e7b4d91..f27cd340e4 100644
--- a/multiuser/api/che-multiuser-api-organization-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-organization-shared
jar
diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml
index 456a84b791..727266832e 100644
--- a/multiuser/api/che-multiuser-api-organization/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-organization
jar
diff --git a/multiuser/api/che-multiuser-api-permission-shared/pom.xml b/multiuser/api/che-multiuser-api-permission-shared/pom.xml
index 9a5cce84fd..60fb1fa3d5 100644
--- a/multiuser/api/che-multiuser-api-permission-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-permission-shared
jar
diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml
index acc9989e25..dff77daaa0 100644
--- a/multiuser/api/che-multiuser-api-permission/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-permission
jar
diff --git a/multiuser/api/che-multiuser-api-resource-shared/pom.xml b/multiuser/api/che-multiuser-api-resource-shared/pom.xml
index 087f502395..9d1a76663b 100644
--- a/multiuser/api/che-multiuser-api-resource-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-resource-shared
jar
diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml
index 8d401aa157..9873307ce8 100644
--- a/multiuser/api/che-multiuser-api-resource/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-resource
jar
diff --git a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
index 49453f5426..1012132eeb 100644
--- a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
+++ b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-api-workspace-activity
jar
diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml
index f62dbfb52d..0da3753392 100644
--- a/multiuser/api/pom.xml
+++ b/multiuser/api/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-multiuser-api
diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
index 6111f48a91..be4b9bf9bf 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-keycloak-server
jar
diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
index e13d70f5be..1151d2b04d 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-keycloak-shared
jar
diff --git a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
index af3d4c74cf..50bec00ac9 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-keycloak-token-provider
Che Multiuser :: Keycloak Token Provider
diff --git a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
index 83cc4cce32..28d59f383d 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-keycloak-user-remover
jar
diff --git a/multiuser/keycloak/pom.xml b/multiuser/keycloak/pom.xml
index a10da6a7b6..65f00d9d2a 100644
--- a/multiuser/keycloak/pom.xml
+++ b/multiuser/keycloak/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-multiuser-keycloak
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
index e79950963c..ae3e8fee27 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-machine-auth
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-machine-authentication-shared
jar
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
index ac7b390a7b..478b73f5cd 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-machine-auth
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-machine-authentication
jar
diff --git a/multiuser/machine-auth/pom.xml b/multiuser/machine-auth/pom.xml
index c405abc7e5..edb69624b9 100644
--- a/multiuser/machine-auth/pom.xml
+++ b/multiuser/machine-auth/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-multiuser-machine-auth
diff --git a/multiuser/oidc/pom.xml b/multiuser/oidc/pom.xml
index 5d000be2f6..3cfe58e547 100644
--- a/multiuser/oidc/pom.xml
+++ b/multiuser/oidc/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-oidc
jar
diff --git a/multiuser/permission/che-multiuser-permission-devfile/pom.xml b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
index 56c7017de6..9e4fbd1d13 100644
--- a/multiuser/permission/che-multiuser-permission-devfile/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-devfile
Che Multiuser :: Devfile Permissions
diff --git a/multiuser/permission/che-multiuser-permission-logger/pom.xml b/multiuser/permission/che-multiuser-permission-logger/pom.xml
index 8c072f1ac7..8d10616f1f 100644
--- a/multiuser/permission/che-multiuser-permission-logger/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-logger/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-logger
Che Multiuser :: Logger Permissions
diff --git a/multiuser/permission/che-multiuser-permission-resource/pom.xml b/multiuser/permission/che-multiuser-permission-resource/pom.xml
index 78fac99e43..2f859d2557 100644
--- a/multiuser/permission/che-multiuser-permission-resource/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-resource/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-resource
Che Multiuser :: Resource :: Permissions
diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml
index 3b68a745fd..f5fdc25d31 100644
--- a/multiuser/permission/che-multiuser-permission-system/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-system/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-system
Che Multiuser :: System Permissions
diff --git a/multiuser/permission/che-multiuser-permission-user/pom.xml b/multiuser/permission/che-multiuser-permission-user/pom.xml
index 4bf4dcd2bb..1a49e712db 100644
--- a/multiuser/permission/che-multiuser-permission-user/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-user/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-user
Che Multiuser :: User Permissions
diff --git a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
index b616f412c3..29f7b00526 100644
--- a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-workspace-activity
Che Multiuser :: Workspace Activity Permissions
diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
index dad05b3fd1..e9e21ca07f 100644
--- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-permission-workspace
Che Multiuser :: Workspace Permissions
diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml
index 2ac003b5d2..637c44251b 100644
--- a/multiuser/permission/pom.xml
+++ b/multiuser/permission/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-multiuser-permission
diff --git a/multiuser/personal-account/pom.xml b/multiuser/personal-account/pom.xml
index e3754d3179..13322835c0 100644
--- a/multiuser/personal-account/pom.xml
+++ b/multiuser/personal-account/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-multiuser-personal-account
jar
diff --git a/multiuser/pom.xml b/multiuser/pom.xml
index 6f49792f4a..42f29f7201 100644
--- a/multiuser/pom.xml
+++ b/multiuser/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
org.eclipse.che.multiuser
diff --git a/multiuser/sql-schema/pom.xml b/multiuser/sql-schema/pom.xml
index 7a70146bc9..fdc3e38403 100644
--- a/multiuser/sql-schema/pom.xml
+++ b/multiuser/sql-schema/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../pom.xml
che-multiuser-sql-schema
diff --git a/pom.xml b/pom.xml
index 12bafd2914..d02b4064de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
4.0.0
org.eclipse.che
che-server
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
pom
Che Server
Eclipse Che Server
@@ -47,7 +47,7 @@
1.0
- 1.4.11
+ 1.5.6
0.22.1
2.15.2
1.7.1
@@ -98,7 +98,7 @@
Red Hat, Inc. - initial API and implementation
${project.version}
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
1.0-beta2
Red Hat, Inc.
diff --git a/typescript-dto/dto-pom.xml b/typescript-dto/dto-pom.xml
index 84219ad616..98f5c17d9f 100644
--- a/typescript-dto/dto-pom.xml
+++ b/typescript-dto/dto-pom.xml
@@ -23,7 +23,7 @@
pom
Che TypeScript DTO
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml
index ebd5e71874..399bea219d 100644
--- a/wsmaster/che-core-api-account/pom.xml
+++ b/wsmaster/che-core-api-account/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-account
Che Core :: API :: Account
diff --git a/wsmaster/che-core-api-auth-azure-devops/pom.xml b/wsmaster/che-core-api-auth-azure-devops/pom.xml
index c9bb1dbb42..1f5e3766ad 100644
--- a/wsmaster/che-core-api-auth-azure-devops/pom.xml
+++ b/wsmaster/che-core-api-auth-azure-devops/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-azure-devops
jar
diff --git a/wsmaster/che-core-api-auth-bitbucket/pom.xml b/wsmaster/che-core-api-auth-bitbucket/pom.xml
index 7cd6a28954..dca31ec50b 100644
--- a/wsmaster/che-core-api-auth-bitbucket/pom.xml
+++ b/wsmaster/che-core-api-auth-bitbucket/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-bitbucket
jar
diff --git a/wsmaster/che-core-api-auth-github-common/pom.xml b/wsmaster/che-core-api-auth-github-common/pom.xml
index b511278c55..5ae9a3df67 100644
--- a/wsmaster/che-core-api-auth-github-common/pom.xml
+++ b/wsmaster/che-core-api-auth-github-common/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-github-common
jar
diff --git a/wsmaster/che-core-api-auth-github/pom.xml b/wsmaster/che-core-api-auth-github/pom.xml
index 8876f1c7b1..12870e2499 100644
--- a/wsmaster/che-core-api-auth-github/pom.xml
+++ b/wsmaster/che-core-api-auth-github/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-github
jar
diff --git a/wsmaster/che-core-api-auth-gitlab/pom.xml b/wsmaster/che-core-api-auth-gitlab/pom.xml
index 90cde2ae98..2b0db8861e 100644
--- a/wsmaster/che-core-api-auth-gitlab/pom.xml
+++ b/wsmaster/che-core-api-auth-gitlab/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-gitlab
jar
diff --git a/wsmaster/che-core-api-auth-openshift/pom.xml b/wsmaster/che-core-api-auth-openshift/pom.xml
index bdc24c9477..b1c964bdc7 100644
--- a/wsmaster/che-core-api-auth-openshift/pom.xml
+++ b/wsmaster/che-core-api-auth-openshift/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth-openshift
jar
diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml
index b55b7b410f..e46c7b6ecf 100644
--- a/wsmaster/che-core-api-auth-shared/pom.xml
+++ b/wsmaster/che-core-api-auth-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 0ca11e0a15..e3b403e5ab 100644
--- a/wsmaster/che-core-api-auth/pom.xml
+++ b/wsmaster/che-core-api-auth/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-auth
jar
diff --git a/wsmaster/che-core-api-devfile-shared/pom.xml b/wsmaster/che-core-api-devfile-shared/pom.xml
index c5e346026a..b51a1994f9 100644
--- a/wsmaster/che-core-api-devfile-shared/pom.xml
+++ b/wsmaster/che-core-api-devfile-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-devfile-shared
jar
diff --git a/wsmaster/che-core-api-devfile/pom.xml b/wsmaster/che-core-api-devfile/pom.xml
index 754354df54..52491530f8 100644
--- a/wsmaster/che-core-api-devfile/pom.xml
+++ b/wsmaster/che-core-api-devfile/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-devfile
jar
diff --git a/wsmaster/che-core-api-factory-azure-devops/pom.xml b/wsmaster/che-core-api-factory-azure-devops/pom.xml
index 09281d4f35..da57282619 100644
--- a/wsmaster/che-core-api-factory-azure-devops/pom.xml
+++ b/wsmaster/che-core-api-factory-azure-devops/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-azure-devops
jar
diff --git a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
index 778acf2a0c..7b9f0f6484 100644
--- a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
+++ b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-bitbucket-server
jar
diff --git a/wsmaster/che-core-api-factory-bitbucket/pom.xml b/wsmaster/che-core-api-factory-bitbucket/pom.xml
index a27d7fe2cd..e32d0570da 100644
--- a/wsmaster/che-core-api-factory-bitbucket/pom.xml
+++ b/wsmaster/che-core-api-factory-bitbucket/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-bitbucket
jar
diff --git a/wsmaster/che-core-api-factory-git-ssh/pom.xml b/wsmaster/che-core-api-factory-git-ssh/pom.xml
index a7d95a974f..abc7910606 100644
--- a/wsmaster/che-core-api-factory-git-ssh/pom.xml
+++ b/wsmaster/che-core-api-factory-git-ssh/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-git-ssh
jar
diff --git a/wsmaster/che-core-api-factory-github-common/pom.xml b/wsmaster/che-core-api-factory-github-common/pom.xml
index d26b57a33e..57d2ce0a93 100644
--- a/wsmaster/che-core-api-factory-github-common/pom.xml
+++ b/wsmaster/che-core-api-factory-github-common/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-github-common
jar
diff --git a/wsmaster/che-core-api-factory-github/pom.xml b/wsmaster/che-core-api-factory-github/pom.xml
index 730815808f..31ccf14e5d 100644
--- a/wsmaster/che-core-api-factory-github/pom.xml
+++ b/wsmaster/che-core-api-factory-github/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-github
jar
diff --git a/wsmaster/che-core-api-factory-gitlab/pom.xml b/wsmaster/che-core-api-factory-gitlab/pom.xml
index c06abc97f1..e1884b19fe 100644
--- a/wsmaster/che-core-api-factory-gitlab/pom.xml
+++ b/wsmaster/che-core-api-factory-gitlab/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory-gitlab
jar
diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml
index 0c9fb7e580..50a2591ca4 100644
--- a/wsmaster/che-core-api-factory-shared/pom.xml
+++ b/wsmaster/che-core-api-factory-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 c390e17792..cf921b42ed 100644
--- a/wsmaster/che-core-api-factory/pom.xml
+++ b/wsmaster/che-core-api-factory/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-factory
jar
diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolver.java b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolver.java
index 1e6b133832..1896fc699b 100644
--- a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolver.java
+++ b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2023 Red Hat, Inc.
+ * Copyright (c) 2012-2024 Red Hat, Inc.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -16,7 +16,9 @@
import static org.eclipse.che.api.factory.server.FactoryResolverPriority.HIGHEST;
import static org.eclipse.che.api.factory.shared.Constants.URL_PARAMETER_NAME;
+import com.fasterxml.jackson.databind.JsonNode;
import jakarta.validation.constraints.NotNull;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -30,8 +32,10 @@
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
import org.eclipse.che.api.factory.shared.dto.FactoryMetaDto;
+import org.eclipse.che.api.workspace.server.devfile.DevfileParser;
import org.eclipse.che.api.workspace.server.devfile.URLFetcher;
import org.eclipse.che.api.workspace.server.devfile.URLFileContentProvider;
+import org.eclipse.che.api.workspace.server.devfile.exception.DevfileFormatException;
/**
* {@link FactoryParametersResolver} implementation to resolve factory based on url parameter as a
@@ -45,13 +49,15 @@ public class RawDevfileUrlFactoryParameterResolver extends BaseFactoryParameterR
protected final URLFactoryBuilder urlFactoryBuilder;
protected final URLFetcher urlFetcher;
+ private final DevfileParser devfileParser;
@Inject
public RawDevfileUrlFactoryParameterResolver(
- URLFactoryBuilder urlFactoryBuilder, URLFetcher urlFetcher) {
+ URLFactoryBuilder urlFactoryBuilder, URLFetcher urlFetcher, DevfileParser devfileParser) {
super(null, urlFactoryBuilder, PROVIDER_NAME);
this.urlFactoryBuilder = urlFactoryBuilder;
this.urlFetcher = urlFetcher;
+ this.devfileParser = devfileParser;
}
/**
@@ -64,7 +70,17 @@ public RawDevfileUrlFactoryParameterResolver(
@Override
public boolean accept(Map factoryParameters) {
String url = factoryParameters.get(URL_PARAMETER_NAME);
- return !isNullOrEmpty(url) && PATTERN.matcher(url).matches();
+ return !isNullOrEmpty(url) && (PATTERN.matcher(url).matches() || containsYaml(url));
+ }
+
+ private boolean containsYaml(String requestURL) {
+ try {
+ String fetch = urlFetcher.fetch(requestURL);
+ JsonNode parsedYaml = devfileParser.parseYamlRaw(fetch);
+ return !parsedYaml.isEmpty();
+ } catch (IOException | DevfileFormatException e) {
+ return false;
+ }
}
@Override
diff --git a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolverTest.java b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolverTest.java
index 68d7e1999d..84c9555944 100644
--- a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolverTest.java
+++ b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolverTest.java
@@ -24,11 +24,14 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.fail;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.che.api.core.BadRequestException;
@@ -63,6 +66,7 @@ public class RawDevfileUrlFactoryParameterResolverTest {
+ " reference: ../localfile\n";
@Mock private URLFetcher urlFetcher;
+ @Mock private DevfileParser devfileParser;
@InjectMocks private RawDevfileUrlFactoryParameterResolver rawDevfileUrlFactoryParameterResolver;
@@ -84,7 +88,7 @@ public void shouldResolveRelativeFiles() throws Exception {
"editor", "plugin", false, devfileParser, new DevfileVersionDetector());
RawDevfileUrlFactoryParameterResolver res =
- new RawDevfileUrlFactoryParameterResolver(factoryBuilder, urlFetcher);
+ new RawDevfileUrlFactoryParameterResolver(factoryBuilder, urlFetcher, devfileParser);
// set up our factory with the location of our devfile that is referencing our localfile
Map factoryParameters = new HashMap<>();
@@ -106,7 +110,7 @@ public void shouldFilterAndProvideOverrideParameters() throws Exception {
URLFetcher urlFetcher = mock(URLFetcher.class);
RawDevfileUrlFactoryParameterResolver res =
- new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher);
+ new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher, devfileParser);
Map factoryParameters = new HashMap<>();
factoryParameters.put(URL_PARAMETER_NAME, "http://myloc/devfile");
@@ -137,7 +141,7 @@ public void shouldThrowExceptionOnInvalidURL(String url, String message) throws
URLFetcher urlFetcher = mock(URLFetcher.class);
RawDevfileUrlFactoryParameterResolver res =
- new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher);
+ new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher, devfileParser);
Map factoryParameters = new HashMap<>();
factoryParameters.put(URL_PARAMETER_NAME, url);
@@ -165,12 +169,67 @@ public void shouldAcceptRawDevfileUrl(String url) {
assertTrue(result);
}
+ @Test(dataProvider = "devfileUrlsWithoutExtension")
+ public void shouldAcceptRawDevfileUrlWithoutExtension(String url) throws Exception {
+ // given
+ JsonNode jsonNode = mock(JsonNode.class);
+ when(urlFetcher.fetch(eq(url))).thenReturn(DEVFILE);
+ when(devfileParser.parseYamlRaw(eq(DEVFILE))).thenReturn(jsonNode);
+ when(jsonNode.isEmpty()).thenReturn(false);
+
+ // when
+ boolean result =
+ rawDevfileUrlFactoryParameterResolver.accept(singletonMap(URL_PARAMETER_NAME, url));
+
+ // then
+ assertTrue(result);
+ }
+
+ @Test
+ public void shouldAcceptRawDevfileUrlWithYaml() throws Exception {
+ // given
+ JsonNode jsonNode = mock(JsonNode.class);
+ String url = "https://host/path/devfile";
+ when(urlFetcher.fetch(eq(url))).thenReturn(DEVFILE);
+ when(devfileParser.parseYamlRaw(eq(DEVFILE))).thenReturn(jsonNode);
+ when(jsonNode.isEmpty()).thenReturn(false);
+
+ // when
+ boolean result =
+ rawDevfileUrlFactoryParameterResolver.accept(singletonMap(URL_PARAMETER_NAME, url));
+
+ // then
+ assertTrue(result);
+ }
+
+ @Test
+ public void shouldNotAcceptPublicGitRepositoryUrl() throws Exception {
+ // given
+ JsonNode jsonNode = mock(JsonNode.class);
+ String gitRepositoryUrl = "https://host/user/repo.git";
+ when(urlFetcher.fetch(eq(gitRepositoryUrl))).thenReturn("unsupported content");
+ when(devfileParser.parseYamlRaw(eq("unsupported content"))).thenReturn(jsonNode);
+ when(jsonNode.isEmpty()).thenReturn(true);
+
+ // when
+ boolean result =
+ rawDevfileUrlFactoryParameterResolver.accept(
+ singletonMap(URL_PARAMETER_NAME, gitRepositoryUrl));
+
+ // then
+ assertFalse(result);
+ }
+
@Test
- public void shouldNotAcceptRawDevfileUrl() {
+ public void shouldNotAcceptPrivateGitRepositoryUrl() throws Exception {
+ // given
+ String gitRepositoryUrl = "https://host/user/private-repo.git";
+ when(urlFetcher.fetch(eq(gitRepositoryUrl))).thenThrow(new FileNotFoundException());
+
// when
boolean result =
rawDevfileUrlFactoryParameterResolver.accept(
- singletonMap(URL_PARAMETER_NAME, "https://host/user/repo.git"));
+ singletonMap(URL_PARAMETER_NAME, gitRepositoryUrl));
// then
assertFalse(result);
@@ -201,4 +260,9 @@ private Object[] devfileUrls() {
"https://host/path/any-name.yml?token=TOKEN123"
};
}
+
+ @DataProvider(name = "devfileUrlsWithoutExtension")
+ private Object[] devfileUrlsWithoutExtension() {
+ return new String[] {"https://host/path/any-name", "https://host/path/any-name?token=TOKEN123"};
+ }
}
diff --git a/wsmaster/che-core-api-logger-shared/pom.xml b/wsmaster/che-core-api-logger-shared/pom.xml
index 10da254e9d..31976ed763 100644
--- a/wsmaster/che-core-api-logger-shared/pom.xml
+++ b/wsmaster/che-core-api-logger-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-logger-shared
jar
diff --git a/wsmaster/che-core-api-logger/pom.xml b/wsmaster/che-core-api-logger/pom.xml
index 5177dc9706..92fef2a7cf 100644
--- a/wsmaster/che-core-api-logger/pom.xml
+++ b/wsmaster/che-core-api-logger/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-logger
jar
diff --git a/wsmaster/che-core-api-metrics/pom.xml b/wsmaster/che-core-api-metrics/pom.xml
index 33270913ed..c9a374fa1c 100644
--- a/wsmaster/che-core-api-metrics/pom.xml
+++ b/wsmaster/che-core-api-metrics/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-metrics
jar
diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml
index 33baa5f7fb..8894302489 100644
--- a/wsmaster/che-core-api-ssh-shared/pom.xml
+++ b/wsmaster/che-core-api-ssh-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 d58c693951..d77f55d6d8 100644
--- a/wsmaster/che-core-api-ssh/pom.xml
+++ b/wsmaster/che-core-api-ssh/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 18559e4e64..5efddb4754 100644
--- a/wsmaster/che-core-api-system-shared/pom.xml
+++ b/wsmaster/che-core-api-system-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 8e84e67a16..a5d9bb7c31 100644
--- a/wsmaster/che-core-api-system/pom.xml
+++ b/wsmaster/che-core-api-system/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 549f5594d0..43d51ee77e 100644
--- a/wsmaster/che-core-api-user-shared/pom.xml
+++ b/wsmaster/che-core-api-user-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 104179d486..e7d714ff4e 100644
--- a/wsmaster/che-core-api-user/pom.xml
+++ b/wsmaster/che-core-api-user/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-user
Che Core :: API :: User
diff --git a/wsmaster/che-core-api-workspace-activity/pom.xml b/wsmaster/che-core-api-workspace-activity/pom.xml
index 9220eaf9cc..0bc601606a 100644
--- a/wsmaster/che-core-api-workspace-activity/pom.xml
+++ b/wsmaster/che-core-api-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-api-workspace-activity
jar
diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml
index edef6d0d37..ff4fe1e63f 100644
--- a/wsmaster/che-core-api-workspace-shared/pom.xml
+++ b/wsmaster/che-core-api-workspace-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 f2deb71aa2..46aa3958e4 100644
--- a/wsmaster/che-core-api-workspace/pom.xml
+++ b/wsmaster/che-core-api-workspace/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.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 13c55e41e2..608d94ecc2 100644
--- a/wsmaster/che-core-sql-schema/pom.xml
+++ b/wsmaster/che-core-sql-schema/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
che-core-sql-schema
Che Core :: SQL :: Schema
diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml
index 72c28a2582..e48a2ff01e 100644
--- a/wsmaster/pom.xml
+++ b/wsmaster/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.86.0-SNAPSHOT
+ 7.87.0-SNAPSHOT
../core/pom.xml
che-master-parent