From ea1897b28986b689dcc5719e418db10bc1141cde Mon Sep 17 00:00:00 2001
From: tmirza <taimoor.mrza@gmail.com>
Date: Wed, 20 Apr 2022 14:27:16 +0500
Subject: [PATCH 1/6] Update README.md (#291)
Fix typo
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4c938e5f6c..08fa62b8d1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[]
# What is Che server
-Che Server is a core component of the [Eclipse Che](https://github.com/eclipse/che/). This component is responsibe for creation and managing of Che workspaces, but will some day be replaced by the [Dev Workspace Operator](https://github.com/devfile/devworkspace-operator).
+Che Server is a core component of the [Eclipse Che](https://github.com/eclipse/che/). This component is responsible for creation and managing of Che workspaces, but will some day be replaced by the [Dev Workspace Operator](https://github.com/devfile/devworkspace-operator).
# Project structure
Che Server is mostly a Java web application deployed on a Apache Tomcat server in a container.
From 855f704ded1f9d54db673bb66aa2fa5711422ddb Mon Sep 17 00:00:00 2001
From: che-bot <39771996+che-bot@users.noreply.github.com>
Date: Thu, 28 Apr 2022 08:22:48 +0200
Subject: [PATCH 2/6] chore: Bump to 7.48.0-SNAPSHOT in main (#296)
Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
Co-authored-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
assembly/assembly-che-tomcat/pom.xml | 2 +-
assembly/assembly-main/pom.xml | 2 +-
assembly/assembly-root-war/pom.xml | 2 +-
assembly/assembly-swagger-war/pom.xml | 2 +-
assembly/assembly-wsmaster-war/pom.xml | 2 +-
assembly/pom.xml | 2 +-
core/che-core-api-core/pom.xml | 2 +-
core/che-core-api-dto-maven-plugin/pom.xml | 2 +-
core/che-core-api-dto/pom.xml | 2 +-
core/che-core-api-model/pom.xml | 2 +-
core/che-core-db-vendor-h2/pom.xml | 2 +-
core/che-core-db-vendor-mysql/pom.xml | 2 +-
core/che-core-db-vendor-postgresql/pom.xml | 2 +-
core/che-core-db/pom.xml | 2 +-
core/che-core-logback/pom.xml | 2 +-
core/che-core-metrics-core/pom.xml | 2 +-
core/che-core-tracing-core/pom.xml | 2 +-
core/che-core-tracing-metrics/pom.xml | 2 +-
core/che-core-tracing-web/pom.xml | 2 +-
core/che-core-typescript-dto-maven-plugin/pom.xml | 2 +-
core/commons/che-core-commons-annotations/pom.xml | 2 +-
core/commons/che-core-commons-inject/pom.xml | 2 +-
core/commons/che-core-commons-j2ee/pom.xml | 2 +-
core/commons/che-core-commons-json/pom.xml | 2 +-
core/commons/che-core-commons-lang/pom.xml | 2 +-
core/commons/che-core-commons-observability/pom.xml | 2 +-
core/commons/che-core-commons-schedule/pom.xml | 2 +-
core/commons/che-core-commons-test/pom.xml | 2 +-
core/commons/che-core-commons-tracing/pom.xml | 2 +-
core/commons/pom.xml | 2 +-
core/pom.xml | 2 +-
infrastructures/infrastructure-distributed/pom.xml | 2 +-
infrastructures/infrastructure-factory/pom.xml | 2 +-
infrastructures/infrastructure-metrics/pom.xml | 2 +-
infrastructures/infrastructure-permission/pom.xml | 2 +-
infrastructures/kubernetes/pom.xml | 2 +-
infrastructures/openshift/pom.xml | 2 +-
infrastructures/pom.xml | 2 +-
.../api/che-multiuser-api-authentication-commons/pom.xml | 2 +-
multiuser/api/che-multiuser-api-authorization-impl/pom.xml | 2 +-
multiuser/api/che-multiuser-api-authorization/pom.xml | 2 +-
multiuser/api/che-multiuser-api-organization-shared/pom.xml | 2 +-
multiuser/api/che-multiuser-api-organization/pom.xml | 2 +-
multiuser/api/che-multiuser-api-permission-shared/pom.xml | 2 +-
multiuser/api/che-multiuser-api-permission/pom.xml | 2 +-
multiuser/api/che-multiuser-api-resource-shared/pom.xml | 2 +-
multiuser/api/che-multiuser-api-resource/pom.xml | 2 +-
multiuser/api/che-multiuser-api-workspace-activity/pom.xml | 2 +-
multiuser/api/pom.xml | 2 +-
.../integration-tests/che-multiuser-cascade-removal/pom.xml | 2 +-
multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml | 2 +-
.../integration-tests/che-multiuser-postgresql-tck/pom.xml | 2 +-
multiuser/integration-tests/pom.xml | 2 +-
multiuser/keycloak/che-multiuser-keycloak-server/pom.xml | 2 +-
multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml | 2 +-
.../keycloak/che-multiuser-keycloak-token-provider/pom.xml | 2 +-
.../keycloak/che-multiuser-keycloak-user-remover/pom.xml | 2 +-
multiuser/keycloak/pom.xml | 2 +-
.../che-multiuser-machine-authentication-shared/pom.xml | 2 +-
.../machine-auth/che-multiuser-machine-authentication/pom.xml | 2 +-
multiuser/machine-auth/pom.xml | 2 +-
multiuser/oidc/pom.xml | 2 +-
multiuser/permission/che-multiuser-permission-devfile/pom.xml | 2 +-
multiuser/permission/che-multiuser-permission-logger/pom.xml | 2 +-
.../permission/che-multiuser-permission-resource/pom.xml | 2 +-
multiuser/permission/che-multiuser-permission-system/pom.xml | 2 +-
multiuser/permission/che-multiuser-permission-user/pom.xml | 2 +-
.../che-multiuser-permission-workspace-activity/pom.xml | 2 +-
.../permission/che-multiuser-permission-workspace/pom.xml | 2 +-
multiuser/permission/pom.xml | 2 +-
multiuser/personal-account/pom.xml | 2 +-
multiuser/pom.xml | 2 +-
multiuser/sql-schema/pom.xml | 2 +-
pom.xml | 4 ++--
typescript-dto/dto-pom.xml | 2 +-
wsmaster/che-core-api-account/pom.xml | 2 +-
wsmaster/che-core-api-auth-bitbucket/pom.xml | 2 +-
wsmaster/che-core-api-auth-github/pom.xml | 2 +-
wsmaster/che-core-api-auth-gitlab/pom.xml | 2 +-
wsmaster/che-core-api-auth-openshift/pom.xml | 2 +-
wsmaster/che-core-api-auth-shared/pom.xml | 2 +-
wsmaster/che-core-api-auth/pom.xml | 2 +-
wsmaster/che-core-api-devfile-shared/pom.xml | 2 +-
wsmaster/che-core-api-devfile/pom.xml | 2 +-
wsmaster/che-core-api-factory-bitbucket-server/pom.xml | 2 +-
wsmaster/che-core-api-factory-github/pom.xml | 2 +-
wsmaster/che-core-api-factory-gitlab/pom.xml | 2 +-
wsmaster/che-core-api-factory-shared/pom.xml | 2 +-
wsmaster/che-core-api-factory/pom.xml | 2 +-
wsmaster/che-core-api-logger-shared/pom.xml | 2 +-
wsmaster/che-core-api-logger/pom.xml | 2 +-
wsmaster/che-core-api-metrics/pom.xml | 2 +-
wsmaster/che-core-api-ssh-shared/pom.xml | 2 +-
wsmaster/che-core-api-ssh/pom.xml | 2 +-
wsmaster/che-core-api-system-shared/pom.xml | 2 +-
wsmaster/che-core-api-system/pom.xml | 2 +-
wsmaster/che-core-api-user-shared/pom.xml | 2 +-
wsmaster/che-core-api-user/pom.xml | 2 +-
wsmaster/che-core-api-workspace-activity/pom.xml | 2 +-
wsmaster/che-core-api-workspace-shared/pom.xml | 2 +-
wsmaster/che-core-api-workspace/pom.xml | 2 +-
wsmaster/che-core-sql-schema/pom.xml | 2 +-
wsmaster/integration-tests/cascade-removal/pom.xml | 2 +-
wsmaster/integration-tests/mysql-tck/pom.xml | 2 +-
wsmaster/integration-tests/pom.xml | 2 +-
wsmaster/integration-tests/postgresql-tck/pom.xml | 2 +-
wsmaster/pom.xml | 2 +-
107 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/assembly/assembly-che-tomcat/pom.xml b/assembly/assembly-che-tomcat/pom.xml
index c488a8d88d..ca0dfb1368 100644
--- a/assembly/assembly-che-tomcat/pom.xml
+++ b/assembly/assembly-che-tomcat/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-che-tomcat</artifactId>
<packaging>jar</packaging>
diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
index 8f299bea24..91498347a2 100644
--- a/assembly/assembly-main/pom.xml
+++ b/assembly/assembly-main/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>
diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml
index a63ab3edea..1dd3ac63ca 100644
--- a/assembly/assembly-root-war/pom.xml
+++ b/assembly/assembly-root-war/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-root-war</artifactId>
<packaging>war</packaging>
diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml
index 6420e63a9e..91c587b95a 100644
--- a/assembly/assembly-swagger-war/pom.xml
+++ b/assembly/assembly-swagger-war/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-swagger-war</artifactId>
<packaging>war</packaging>
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
index dea5789490..3def1333e2 100644
--- a/assembly/assembly-wsmaster-war/pom.xml
+++ b/assembly/assembly-wsmaster-war/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7ec1ce4b52..dbdcaba6b0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-assembly-parent</artifactId>
diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml
index d7ecc6c8ae..c0e0e0f33d 100644
--- a/core/che-core-api-core/pom.xml
+++ b/core/che-core-api-core/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>
diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml
index ae78ab777d..031c57483d 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 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml
index b0c80d5706..c822212167 100644
--- a/core/che-core-api-dto/pom.xml
+++ b/core/che-core-api-dto/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>
diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml
index 1588a88d42..10744e3d0c 100644
--- a/core/che-core-api-model/pom.xml
+++ b/core/che-core-api-model/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>
diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml
index f451a110a6..fb5d1b3188 100644
--- a/core/che-core-db-vendor-h2/pom.xml
+++ b/core/che-core-db-vendor-h2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: Commons :: DB :: Vendor H2</name>
diff --git a/core/che-core-db-vendor-mysql/pom.xml b/core/che-core-db-vendor-mysql/pom.xml
index bd847bac81..254dbe8f1c 100644
--- a/core/che-core-db-vendor-mysql/pom.xml
+++ b/core/che-core-db-vendor-mysql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-mysql</artifactId>
<name>Che Core :: Commons :: DB :: Vendor MySQL</name>
diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml
index d5c48d6894..9f50cebc12 100644
--- a/core/che-core-db-vendor-postgresql/pom.xml
+++ b/core/che-core-db-vendor-postgresql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: Commons :: DB :: Vendor PostgreSQL</name>
diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml
index 44d6e02fc7..e66591d046 100644
--- a/core/che-core-db/pom.xml
+++ b/core/che-core-db/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: Commons :: DB</name>
diff --git a/core/che-core-logback/pom.xml b/core/che-core-logback/pom.xml
index 7460ef13d5..72ff143a2c 100644
--- a/core/che-core-logback/pom.xml
+++ b/core/che-core-logback/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-logback</artifactId>
<packaging>jar</packaging>
diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml
index 4142549a70..b44fdb1a2d 100644
--- a/core/che-core-metrics-core/pom.xml
+++ b/core/che-core-metrics-core/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-metrics-core</artifactId>
<name>Che Core :: Commons :: Metrics :: Core</name>
diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml
index fcdd5f4cb9..02b17c30f9 100644
--- a/core/che-core-tracing-core/pom.xml
+++ b/core/che-core-tracing-core/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-core</artifactId>
<name>Che Core :: Commons :: Tracing :: Core</name>
diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml
index d8fdff23d9..4fe1988154 100644
--- a/core/che-core-tracing-metrics/pom.xml
+++ b/core/che-core-tracing-metrics/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-metrics</artifactId>
<name>Che Core :: Commons :: Tracing :: Metrics</name>
diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml
index c5c597b12b..ae51df8f57 100644
--- a/core/che-core-tracing-web/pom.xml
+++ b/core/che-core-tracing-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-web</artifactId>
<name>Che Core :: Commons :: Tracing :: Web</name>
diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml
index 10aeb77cee..5a32481074 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 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml
index 2447f255d3..9200a4a33f 100644
--- a/core/commons/che-core-commons-annotations/pom.xml
+++ b/core/commons/che-core-commons-annotations/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml
index 4b65635ab5..e5b3ecee09 100644
--- a/core/commons/che-core-commons-inject/pom.xml
+++ b/core/commons/che-core-commons-inject/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml
index 6a06ee103d..7b48283f06 100644
--- a/core/commons/che-core-commons-j2ee/pom.xml
+++ b/core/commons/che-core-commons-j2ee/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-json/pom.xml b/core/commons/che-core-commons-json/pom.xml
index 4bcc83c0d7..b9c07395f1 100644
--- a/core/commons/che-core-commons-json/pom.xml
+++ b/core/commons/che-core-commons-json/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-lang/pom.xml b/core/commons/che-core-commons-lang/pom.xml
index 40b5c386a5..7c3ba5afb6 100644
--- a/core/commons/che-core-commons-lang/pom.xml
+++ b/core/commons/che-core-commons-lang/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-observability/pom.xml b/core/commons/che-core-commons-observability/pom.xml
index 3440d96765..5fe2b00070 100644
--- a/core/commons/che-core-commons-observability/pom.xml
+++ b/core/commons/che-core-commons-observability/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-observability</artifactId>
<name>Che Core :: Commons :: Tracing and Monitoring wrapper</name>
diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml
index d2768c2d76..2186419ded 100644
--- a/core/commons/che-core-commons-schedule/pom.xml
+++ b/core/commons/che-core-commons-schedule/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml
index f1a93d3492..80ce80c73f 100644
--- a/core/commons/che-core-commons-test/pom.xml
+++ b/core/commons/che-core-commons-test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>
diff --git a/core/commons/che-core-commons-tracing/pom.xml b/core/commons/che-core-commons-tracing/pom.xml
index 859434ed42..303aaffe7e 100644
--- a/core/commons/che-core-commons-tracing/pom.xml
+++ b/core/commons/che-core-commons-tracing/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-tracing</artifactId>
<name>Che Core :: Commons :: Tracing</name>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index b1bebfecd5..e357b3364e 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 3a8c35ef85..5b2319917e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>
diff --git a/infrastructures/infrastructure-distributed/pom.xml b/infrastructures/infrastructure-distributed/pom.xml
index ff2c6ddee8..bead1328d3 100644
--- a/infrastructures/infrastructure-distributed/pom.xml
+++ b/infrastructures/infrastructure-distributed/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-distributed</artifactId>
<packaging>jar</packaging>
diff --git a/infrastructures/infrastructure-factory/pom.xml b/infrastructures/infrastructure-factory/pom.xml
index 122f62dc95..ec32e0b68c 100644
--- a/infrastructures/infrastructure-factory/pom.xml
+++ b/infrastructures/infrastructure-factory/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-factory</artifactId>
<packaging>jar</packaging>
diff --git a/infrastructures/infrastructure-metrics/pom.xml b/infrastructures/infrastructure-metrics/pom.xml
index ad043f0140..b61de6c70a 100644
--- a/infrastructures/infrastructure-metrics/pom.xml
+++ b/infrastructures/infrastructure-metrics/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infrastructure-metrics</artifactId>
diff --git a/infrastructures/infrastructure-permission/pom.xml b/infrastructures/infrastructure-permission/pom.xml
index 4857056ab8..2a4c7d5a11 100644
--- a/infrastructures/infrastructure-permission/pom.xml
+++ b/infrastructures/infrastructure-permission/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-permission</artifactId>
<name>Infrastructure :: Kubernetes Permissions</name>
diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml
index 85f86bf67d..77509eccdd 100644
--- a/infrastructures/kubernetes/pom.xml
+++ b/infrastructures/kubernetes/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-kubernetes</artifactId>
<name>Infrastructure :: Kubernetes</name>
diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml
index 0e1a8ba0c6..016440cfac 100644
--- a/infrastructures/openshift/pom.xml
+++ b/infrastructures/openshift/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-openshift</artifactId>
<name>Infrastructure :: OpenShift</name>
diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml
index a28cd55a0c..f241b12de1 100644
--- a/infrastructures/pom.xml
+++ b/infrastructures/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.infrastructure</groupId>
diff --git a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
index b08af4ee2b..52349e72e8 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authentication-commons</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
index 82bc69cbf2..e72a0de08f 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization-impl</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-authorization/pom.xml b/multiuser/api/che-multiuser-api-authorization/pom.xml
index 9304581c06..e3f435e0c3 100644
--- a/multiuser/api/che-multiuser-api-authorization/pom.xml
+++ b/multiuser/api/che-multiuser-api-authorization/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-organization-shared/pom.xml b/multiuser/api/che-multiuser-api-organization-shared/pom.xml
index 6da5755ad5..1794371a89 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-organization-shared</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml
index 254fbc664a..42f0ec2f20 100644
--- a/multiuser/api/che-multiuser-api-organization/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-organization</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-permission-shared/pom.xml b/multiuser/api/che-multiuser-api-permission-shared/pom.xml
index d3da78e772..20c7ee84c1 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission-shared</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml
index 61357fe0f0..0a59714e45 100644
--- a/multiuser/api/che-multiuser-api-permission/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-resource-shared/pom.xml b/multiuser/api/che-multiuser-api-resource-shared/pom.xml
index 9e3a878986..1140d17ee5 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-resource-shared</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml
index e7e32b2206..13914e069b 100644
--- a/multiuser/api/che-multiuser-api-resource/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-resource</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
index 815f4fee9b..ee34bcf199 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 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-workspace-activity</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml
index 11463d0367..b6d2f0cab7 100644
--- a/multiuser/api/pom.xml
+++ b/multiuser/api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-api</artifactId>
diff --git a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
index da980f8b23..2b0da379fe 100644
--- a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
+++ b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-cascade-removal</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml
index 538486e82e..340df90023 100644
--- a/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml
+++ b/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-mysql-tck</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
index df2a76fc92..ba97e18ea1 100644
--- a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
+++ b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-postgresql-tck</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/integration-tests/pom.xml b/multiuser/integration-tests/pom.xml
index 89017737be..f5eb03a71e 100644
--- a/multiuser/integration-tests/pom.xml
+++ b/multiuser/integration-tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<packaging>pom</packaging>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
index 92bb321b4d..e10c3064c9 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-server</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
index 85caf9d731..a015783849 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-shared</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
index 71a74637cf..b24dc3c4d1 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 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
<name>Che Multiuser :: Keycloak Token Provider</name>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
index 4d169a9ea8..b91e430e04 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 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-user-remover</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/keycloak/pom.xml b/multiuser/keycloak/pom.xml
index b2289f65a5..f7f423e3dc 100644
--- a/multiuser/keycloak/pom.xml
+++ b/multiuser/keycloak/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-keycloak</artifactId>
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 2f161cab10..174f7c035a 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 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication-shared</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
index 9e6fe141db..824a3dea0a 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 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/machine-auth/pom.xml b/multiuser/machine-auth/pom.xml
index 9ee163f7ed..ae545d16f9 100644
--- a/multiuser/machine-auth/pom.xml
+++ b/multiuser/machine-auth/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-machine-auth</artifactId>
diff --git a/multiuser/oidc/pom.xml b/multiuser/oidc/pom.xml
index c3ece0bcb3..2474577e34 100644
--- a/multiuser/oidc/pom.xml
+++ b/multiuser/oidc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-oidc</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/permission/che-multiuser-permission-devfile/pom.xml b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
index 5ff0dc657f..21f9f9ecf5 100644
--- a/multiuser/permission/che-multiuser-permission-devfile/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-devfile</artifactId>
<name>Che Multiuser :: Devfile Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-logger/pom.xml b/multiuser/permission/che-multiuser-permission-logger/pom.xml
index 59db6981c1..9fdb418875 100644
--- a/multiuser/permission/che-multiuser-permission-logger/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-logger/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-logger</artifactId>
<name>Che Multiuser :: Logger Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-resource/pom.xml b/multiuser/permission/che-multiuser-permission-resource/pom.xml
index 2c40f634c8..501f898e38 100644
--- a/multiuser/permission/che-multiuser-permission-resource/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-resource/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-resource</artifactId>
<name>Che Multiuser :: Resource :: Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml
index e38c17486d..3fe380c128 100644
--- a/multiuser/permission/che-multiuser-permission-system/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-system/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-system</artifactId>
<name>Che Multiuser :: System Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-user/pom.xml b/multiuser/permission/che-multiuser-permission-user/pom.xml
index 60e047a804..f7332e3864 100644
--- a/multiuser/permission/che-multiuser-permission-user/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-user/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-user</artifactId>
<name>Che Multiuser :: User Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
index bc62509b65..32a9841d52 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 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-workspace-activity</artifactId>
<name>Che Multiuser :: Workspace Activity Permissions</name>
diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
index bf2b3c83c4..ab8050c924 100644
--- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-workspace</artifactId>
<name>Che Multiuser :: Workspace Permissions</name>
diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml
index a08ccee2f3..9dda2c1ae6 100644
--- a/multiuser/permission/pom.xml
+++ b/multiuser/permission/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-permission</artifactId>
diff --git a/multiuser/personal-account/pom.xml b/multiuser/personal-account/pom.xml
index 07f4c71b9c..d68532ed83 100644
--- a/multiuser/personal-account/pom.xml
+++ b/multiuser/personal-account/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-personal-account</artifactId>
<packaging>jar</packaging>
diff --git a/multiuser/pom.xml b/multiuser/pom.xml
index d087dc14d8..cfe0910761 100644
--- a/multiuser/pom.xml
+++ b/multiuser/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.multiuser</groupId>
diff --git a/multiuser/sql-schema/pom.xml b/multiuser/sql-schema/pom.xml
index b875bc00ac..0f1429c6dd 100644
--- a/multiuser/sql-schema/pom.xml
+++ b/multiuser/sql-schema/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-sql-schema</artifactId>
diff --git a/pom.xml b/pom.xml
index 498bac679e..dbd82a4feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.che</groupId>
<artifactId>che-server</artifactId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Server</name>
<description>Eclipse Che Server</description>
@@ -99,7 +99,7 @@
<license_contributor>Red Hat, Inc. - initial API and implementation</license_contributor>
<?SORTPOM IGNORE?>
<build.info>${project.version}</build.info>
- <che.version>7.47.0-SNAPSHOT</che.version>
+ <che.version>7.48.0-SNAPSHOT</che.version>
<specification.version>1.0-beta2</specification.version>
<?SORTPOM RESUME?>
<license_copyrightOwner>Red Hat, Inc.</license_copyrightOwner>
diff --git a/typescript-dto/dto-pom.xml b/typescript-dto/dto-pom.xml
index 8735c8c01f..04f3f09dc3 100644
--- a/typescript-dto/dto-pom.xml
+++ b/typescript-dto/dto-pom.xml
@@ -23,7 +23,7 @@
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
- <che.version>7.47.0-SNAPSHOT</che.version>
+ <che.version>7.48.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>
diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml
index aa4e03579f..78f253f3e9 100644
--- a/wsmaster/che-core-api-account/pom.xml
+++ b/wsmaster/che-core-api-account/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-account</artifactId>
<name>Che Core :: API :: Account</name>
diff --git a/wsmaster/che-core-api-auth-bitbucket/pom.xml b/wsmaster/che-core-api-auth-bitbucket/pom.xml
index d32e054093..3a6a8ea88e 100644
--- a/wsmaster/che-core-api-auth-bitbucket/pom.xml
+++ b/wsmaster/che-core-api-auth-bitbucket/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-bitbucket</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-auth-github/pom.xml b/wsmaster/che-core-api-auth-github/pom.xml
index 870f941321..5c8f53c7d0 100644
--- a/wsmaster/che-core-api-auth-github/pom.xml
+++ b/wsmaster/che-core-api-auth-github/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-github</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-auth-gitlab/pom.xml b/wsmaster/che-core-api-auth-gitlab/pom.xml
index 2c55264e3a..dd91410194 100644
--- a/wsmaster/che-core-api-auth-gitlab/pom.xml
+++ b/wsmaster/che-core-api-auth-gitlab/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-gitlab</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-auth-openshift/pom.xml b/wsmaster/che-core-api-auth-openshift/pom.xml
index b3e5cf1a52..3fa224ccdf 100644
--- a/wsmaster/che-core-api-auth-openshift/pom.xml
+++ b/wsmaster/che-core-api-auth-openshift/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-openshift</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml
index 43820bbe55..891290e4c0 100644
--- a/wsmaster/che-core-api-auth-shared/pom.xml
+++ b/wsmaster/che-core-api-auth-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml
index 171bbfd6c4..65a7cab277 100644
--- a/wsmaster/che-core-api-auth/pom.xml
+++ b/wsmaster/che-core-api-auth/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-devfile-shared/pom.xml b/wsmaster/che-core-api-devfile-shared/pom.xml
index 3b6b1ba064..41544982e2 100644
--- a/wsmaster/che-core-api-devfile-shared/pom.xml
+++ b/wsmaster/che-core-api-devfile-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-devfile-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-devfile/pom.xml b/wsmaster/che-core-api-devfile/pom.xml
index 2f6863698b..52bdd0a9a6 100644
--- a/wsmaster/che-core-api-devfile/pom.xml
+++ b/wsmaster/che-core-api-devfile/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-devfile</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
index 851a422034..af31de8a6e 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 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-bitbucket-server</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-factory-github/pom.xml b/wsmaster/che-core-api-factory-github/pom.xml
index 1272bdb507..505a33bfc1 100644
--- a/wsmaster/che-core-api-factory-github/pom.xml
+++ b/wsmaster/che-core-api-factory-github/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-github</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-factory-gitlab/pom.xml b/wsmaster/che-core-api-factory-gitlab/pom.xml
index 2e697aeb60..6a703607cf 100644
--- a/wsmaster/che-core-api-factory-gitlab/pom.xml
+++ b/wsmaster/che-core-api-factory-gitlab/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-gitlab</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml
index 8176167c26..d7b714a3f0 100644
--- a/wsmaster/che-core-api-factory-shared/pom.xml
+++ b/wsmaster/che-core-api-factory-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml
index 5ca00205e8..ad24302f1a 100644
--- a/wsmaster/che-core-api-factory/pom.xml
+++ b/wsmaster/che-core-api-factory/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-logger-shared/pom.xml b/wsmaster/che-core-api-logger-shared/pom.xml
index dfb7fa3207..e3bf5c119a 100644
--- a/wsmaster/che-core-api-logger-shared/pom.xml
+++ b/wsmaster/che-core-api-logger-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-logger-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-logger/pom.xml b/wsmaster/che-core-api-logger/pom.xml
index 76e527e1b3..9b9e087926 100644
--- a/wsmaster/che-core-api-logger/pom.xml
+++ b/wsmaster/che-core-api-logger/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-logger</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-metrics/pom.xml b/wsmaster/che-core-api-metrics/pom.xml
index ca33f6757d..2320ecb1d3 100644
--- a/wsmaster/che-core-api-metrics/pom.xml
+++ b/wsmaster/che-core-api-metrics/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-metrics</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml
index 97639c0209..4bbb984464 100644
--- a/wsmaster/che-core-api-ssh-shared/pom.xml
+++ b/wsmaster/che-core-api-ssh-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-ssh-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml
index df5fd0da97..69a41f3c2e 100644
--- a/wsmaster/che-core-api-ssh/pom.xml
+++ b/wsmaster/che-core-api-ssh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-ssh</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml
index 8bde7cf027..31421bf8aa 100644
--- a/wsmaster/che-core-api-system-shared/pom.xml
+++ b/wsmaster/che-core-api-system-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-system-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml
index 953cfb67c2..82cff45ee7 100644
--- a/wsmaster/che-core-api-system/pom.xml
+++ b/wsmaster/che-core-api-system/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-system</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml
index c59bf50553..d942606f27 100644
--- a/wsmaster/che-core-api-user-shared/pom.xml
+++ b/wsmaster/che-core-api-user-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-user-shared</artifactId>
<name>Che Core :: API :: User :: Shared</name>
diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml
index 692342596b..7066ab1f83 100644
--- a/wsmaster/che-core-api-user/pom.xml
+++ b/wsmaster/che-core-api-user/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-user</artifactId>
<name>Che Core :: API :: User</name>
diff --git a/wsmaster/che-core-api-workspace-activity/pom.xml b/wsmaster/che-core-api-workspace-activity/pom.xml
index b616e35c36..6d510753da 100644
--- a/wsmaster/che-core-api-workspace-activity/pom.xml
+++ b/wsmaster/che-core-api-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-workspace-activity</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml
index 2dc1d25821..8b692a68c7 100644
--- a/wsmaster/che-core-api-workspace-shared/pom.xml
+++ b/wsmaster/che-core-api-workspace-shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-workspace-shared</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml
index fdc886bd9f..0ad904f880 100644
--- a/wsmaster/che-core-api-workspace/pom.xml
+++ b/wsmaster/che-core-api-workspace/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-workspace</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml
index e6c3daf5b2..0d35883911 100644
--- a/wsmaster/che-core-sql-schema/pom.xml
+++ b/wsmaster/che-core-sql-schema/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-sql-schema</artifactId>
<name>Che Core :: SQL :: Schema</name>
diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml
index fd070d68c9..d9e039590b 100644
--- a/wsmaster/integration-tests/cascade-removal/pom.xml
+++ b/wsmaster/integration-tests/cascade-removal/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>integration-tests-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>cascade-removal</artifactId>
<name>Integration Tests :: Cascade Removal</name>
diff --git a/wsmaster/integration-tests/mysql-tck/pom.xml b/wsmaster/integration-tests/mysql-tck/pom.xml
index fdc1ee2bcc..9a790f4244 100644
--- a/wsmaster/integration-tests/mysql-tck/pom.xml
+++ b/wsmaster/integration-tests/mysql-tck/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>integration-tests-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>mysql-tck</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml
index 6fd23e960a..3449dd8809 100644
--- a/wsmaster/integration-tests/pom.xml
+++ b/wsmaster/integration-tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>integration-tests-parent</artifactId>
diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml
index cbf81f02b5..bede02e966 100644
--- a/wsmaster/integration-tests/postgresql-tck/pom.xml
+++ b/wsmaster/integration-tests/postgresql-tck/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>integration-tests-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
</parent>
<artifactId>postgresql-tck</artifactId>
<packaging>jar</packaging>
diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml
index de59d065ae..1999ee54dc 100644
--- a/wsmaster/pom.xml
+++ b/wsmaster/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
- <version>7.47.0-SNAPSHOT</version>
+ <version>7.48.0-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>che-master-parent</artifactId>
From 67b5a871f11745a638b01b3a4d86d71c3b84e802 Mon Sep 17 00:00:00 2001
From: Florent Benoit <fbenoit@redhat.com>
Date: Mon, 2 May 2022 09:49:28 +0200
Subject: [PATCH 3/6] fix: update regexp to extract the PR information
---
.../server/github/GithubURLParser.java | 4 +-
.../server/github/GithubURLParserTest.java | 179 ++++++++++--------
2 files changed, 103 insertions(+), 80 deletions(-)
diff --git a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubURLParser.java b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubURLParser.java
index c9ee2b8473..41fd74ed40 100644
--- a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubURLParser.java
+++ b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubURLParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2021 Red Hat, Inc.
+ * Copyright (c) 2012-2022 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/
@@ -49,7 +49,7 @@ public GithubURLParser(URLFetcher urlFetcher, DevfileFilenamesProvider devfileFi
/** Regexp to find repository and branch name from PR link */
protected static final Pattern PR_DATA_PATTERN =
Pattern.compile(
- ".*<div class=\"State[\\s|\\S]+(?<prState>Closed|Open|Merged)[\\s|\\S]+<\\/div>[\\s|\\S]+into[\\s]+(from[\\s]*)*<span title=\"(?<prRepoUser>[^\\\\/]+)\\/(?<prRepoName>[^\\:]+):(?<prBranch>[^\\\"]+).*",
+ ".*class=\"State[\\s]State--(?<prState>closed|open|merged).*<span title=\"(?<prRepoUser>[^\\\\/]+)\\/(?<prRepoName>[^\\:]+):(?<prBranch>[^\\\"]+).*",
Pattern.DOTALL);
public boolean isValid(@NotNull String url) {
diff --git a/wsmaster/che-core-api-factory-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java b/wsmaster/che-core-api-factory-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java
index 777b38ae22..ada9f50af8 100644
--- a/wsmaster/che-core-api-factory-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java
+++ b/wsmaster/che-core-api-factory-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubURLParserTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2021 Red Hat, Inc.
+ * Copyright (c) 2012-2022 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/
@@ -146,154 +146,177 @@ public Object[][] parsingBadRepository() {
@Test
public void checkPullRequestFromRepository() {
- String url = "https://github.com/eclipse/che/pull/11103";
+ String url = "https://github.com/eclipse/che/pull/21276";
when(urlFetcher.fetchSafely(url))
.thenReturn(
- "<div class=\"TableObject gh-header-meta\">\n"
- + " <div class=\"TableObject-item\">\n"
- + " <div class=\"State State--green\">\n"
- + " <svg class=\"octicon octicon-git-pull-request\" viewBox=\"0 0 12 16\" version=\"1.1\" width=\"12\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/></svg>\n"
- + " Open\n"
- + " </div>\n"
- + "\n"
+ " </div>\n"
+ + " <div class=\"d-flex flex-items-center flex-wrap mt-0 gh-header-meta\">\n"
+ + " <div class=\"flex-shrink-0 mb-2 flex-self-start flex-md-self-center\">\n"
+ + " <span reviewable_state=\"ready\" title=\"Status: Open\" data-view-component=\"true\" class=\"State State--open\">\n"
+ + " <svg height=\"16\" class=\"octicon octicon-git-pull-request\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z\"></path></svg> Open\n"
+ + "</span>\n"
+ " </div>\n"
- + " <div class=\"TableObject-item TableObject-item--primary\">\n"
- + " <a class=\"author pull-header-username css-truncate css-truncate-target expandable\" data-hovercard-type=\"user\" data-hovercard-url=\"/hovercards?user_id=1651062\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/mshaposhnik\">mshaposhnik</a>\n"
- + " wants to merge 1 commit into\n"
+ "\n"
+ "\n"
+ "\n"
- + " <span title=\"eclipse/che:cleanup-e2e-theia\" class=\"commit-ref css-truncate user-select-contain expandable \"><span class=\"css-truncate-target\">master</span></span>\n"
+ + " <div class=\"flex-auto min-width-0 mb-2\">\n"
+ + " <a class=\"author Link--secondary text-bold css-truncate css-truncate-target expandable\" data-hovercard-type=\"user\" data-hovercard-url=\"/users/che-bot/hovercard\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/che-bot\">che-bot</a>\n"
+ "\n"
- + "from\n"
+ + " wants to merge\n"
+ + " <span class=\"js-updating-pull-request-commits-count\">1</span>\n"
+ + " commit into\n"
+ "\n"
- + "<span title=\"eclipse/che:cleanup-e2e-theia\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><span class=\"css-truncate-target\">cleanup-e2e-theia</span></span>\n"
+ "\n"
+ "\n"
- + " <relative-time datetime=\"2018-09-07T08:00:49Z\">Sep 7, 2018</relative-time>\n"
+ + " <span title=\"eclipse/che:main\" class=\"commit-ref css-truncate user-select-contain expandable base-ref\"><a title=\"eclipse/che:main\" class=\"no-underline \" href=\"/eclipse/che\"><span class=\"css-truncate-target\">main</span></a></span><span></span>\n"
+ "\n"
- + " </div>\n"
- + " </div>\n"
- + "</div>");
+ + " <div class=\"commit-ref-dropdown\">\n"
+ + " <details class=\"details-reset details-overlay select-menu commitish-suggester\" id=\"branch-select-menu\">\n"
+ + " <summary class=\"btn btn-sm select-menu-button branch\" title=\"Choose a base branch\">\n"
+ + " <i>base:</i>\n"
+ + " <span class=\"css-truncate css-truncate-target\" title=\"main\">main</span>\n"
+ + " </summary>\n"
+ + " <input-demux-context-wrapper data-context-type=\"baseChange\">");
GithubUrl githubUrl = githubUrlParser.parse(url);
assertEquals(githubUrl.getUsername(), "eclipse");
assertEquals(githubUrl.getRepository(), "che");
- assertEquals(githubUrl.getBranch(), "cleanup-e2e-theia");
+ assertEquals(githubUrl.getBranch(), "main");
}
/** Check Pull Request with data outside the repository (fork) */
@Test
public void checkPullRequestFromForkedRepository() {
- String url = "https://github.com/eclipse/che/pull/11103";
+ String url = "https://github.com/eclipse/che/pull/20189";
when(urlFetcher.fetchSafely(url))
.thenReturn(
- "<div class=\"TableObject gh-header-meta\">\n"
- + " <div class=\"TableObject-item\">\n"
- + " <div class=\"State State--green\">\n"
- + " <svg class=\"octicon octicon-git-pull-request\" viewBox=\"0 0 12 16\" version=\"1.1\" width=\"12\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/></svg>\n"
- + " Open\n"
- + " </div>\n"
- + " </div>"
- + " <div class=\"TableObject-item TableObject-item--primary\">\n"
- + " <a class=\"author pull-header-username css-truncate css-truncate-target expandable\" data-hovercard-user-id=\"436777\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/benoitf\">benoitf</a>\n"
- + " merged 1 commit into\n"
- + "from\n"
+ " <div class=\"d-flex flex-items-center flex-wrap mt-0 gh-header-meta\">\n"
+ + " <div class=\"flex-shrink-0 mb-2 flex-self-start flex-md-self-center\">\n"
+ + " <span reviewable_state=\"ready\" title=\"Status: Open\" data-view-component=\"true\" class=\"State State--open\">\n"
+ + " <svg height=\"16\" class=\"octicon octicon-git-pull-request\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z\"></path></svg> Open\n"
+ + "</span>\n"
+ + " </div>\n"
+ + "\n"
+ + "\n"
+ + "\n"
+ + " <div class=\"flex-auto min-width-0 mb-2\">\n"
+ + " <a class=\"author Link--secondary text-bold css-truncate css-truncate-target expandable\" data-hovercard-type=\"user\" data-hovercard-url=\"/users/apupier/hovercard\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/apupier\">apupier</a>\n"
+ + "\n"
+ + " wants to merge\n"
+ + " <span class=\"js-updating-pull-request-commits-count\">1</span>\n"
+ + " commit into\n"
+ + "\n"
+ + "\n"
+ "\n"
- + "<span title=\"garagatyi/che:fixDeployment\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><span class=\"css-truncate-target user\">garagatyi</span>:<span class=\"css-truncate-target\">fixDeployment</span></span>\n"
- + "\n");
+ + " <span title=\"eclipse/che:main\" class=\"commit-ref css-truncate user-select-contain expandable base-ref\"><a title=\"eclipse/che:main\" class=\"no-underline \" href=\"/eclipse/che\"><span class=\"css-truncate-target\">eclipse</span>:<span class=\"css-truncate-target\">main</span></a></span><span></span>\n"
+ + "\n"
+ + " <div class=\"commit-ref-dropdown\">\n"
+ + " <details class=\"details-reset details-overlay select-menu commitish-suggester\" id=\"branch-select-menu\">\n"
+ + " <summary class=\"btn btn-sm select-menu-button branch\" title=\"Choose a base branch\">\n"
+ + " <i>base:</i>\n"
+ + " <span class=\"css-truncate css-truncate-target\" title=\"main\">main</span>\n"
+ + " </summary>\n"
+ + " <input-demux-context-wrapper data-context-type=\"baseChange\">");
GithubUrl githubUrl = githubUrlParser.parse(url);
- assertEquals(githubUrl.getUsername(), "garagatyi");
+ assertEquals(githubUrl.getUsername(), "eclipse");
assertEquals(githubUrl.getRepository(), "che");
- assertEquals(githubUrl.getBranch(), "fixDeployment");
+ assertEquals(githubUrl.getBranch(), "main");
}
/** Check Pull Request is failing with Merged state */
@Test(
expectedExceptions = IllegalArgumentException.class,
- expectedExceptionsMessageRegExp = ".*found Merged.*")
+ expectedExceptionsMessageRegExp = ".*found merged.*")
public void checkPullRequestMergedState() {
String url = "https://github.com/eclipse/che/pull/11103";
when(urlFetcher.fetchSafely(url))
.thenReturn(
- "\n"
- + " <div class=\"TableObject gh-header-meta\">\n"
- + " <div class=\"TableObject-item\">\n"
- + " <div class=\"State State--purple\">\n"
- + " <svg class=\"octicon octicon-git-merge\" viewBox=\"0 0 12 16\" version=\"1.1\" width=\"12\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M10 7c-.73 0-1.38.41-1.73 1.02V8C7.22 7.98 6 7.64 5.14 6.98c-.75-.58-1.5-1.61-1.89-2.44A1.993 1.993 0 0 0 2 .99C.89.99 0 1.89 0 3a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2a1.993 1.993 0 0 0 1-3.72V7.67c.67.7 1.44 1.27 2.3 1.69.86.42 2.03.63 2.97.64v-.02c.36.61 1 1.02 1.73 1.02 1.11 0 2-.89 2-2 0-1.11-.89-2-2-2zm-6.8 6c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm8 6c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/></svg>\n"
- + " Merged\n"
- + " </div>\n"
+ " <div class=\"d-flex flex-items-center flex-wrap mt-0 gh-header-meta\">\n"
+ + " <div class=\"flex-shrink-0 mb-2 flex-self-start flex-md-self-center\">\n"
+ + " <span reviewable_state=\"ready\" title=\"Status: Merged\" data-view-component=\"true\" class=\"State State--merged\">\n"
+ + " <svg height=\"16\" class=\"octicon octicon-git-merge\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M5 3.254V3.25v.005a.75.75 0 110-.005v.004zm.45 1.9a2.25 2.25 0 10-1.95.218v5.256a2.25 2.25 0 101.5 0V7.123A5.735 5.735 0 009.25 9h1.378a2.251 2.251 0 100-1.5H9.25a4.25 4.25 0 01-3.8-2.346zM12.75 9a.75.75 0 100-1.5.75.75 0 000 1.5zm-8.5 4.5a.75.75 0 100-1.5.75.75 0 000 1.5z\"></path></svg> Merged\n"
+ + "</span>\n"
+ " </div>\n"
- + " <div class=\"TableObject-item TableObject-item--primary\">\n"
- + " <a class=\"author pull-header-username css-truncate css-truncate-target expandable\" data-hovercard-user-id=\"436777\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/benoitf\">benoitf</a>\n"
+ + "\n"
+ + "\n"
+ + "\n"
+ + " <div class=\"flex-auto min-width-0 mb-2\">\n"
+ + " <a class=\"author Link--secondary text-bold css-truncate css-truncate-target expandable\" data-hovercard-type=\"user\" data-hovercard-url=\"/users/benoitf/hovercard\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/benoitf\">benoitf</a>\n"
+ " merged 1 commit into\n"
+ "\n"
+ "\n"
+ "\n"
- + " <span title=\"eclipse/che:master\" class=\"commit-ref css-truncate user-select-contain expandable \"><span class=\"css-truncate-target\">master</span></span>\n"
+ + " <span title=\"eclipse/che:master\" class=\"commit-ref css-truncate user-select-contain expandable \"><a title=\"eclipse/che:master\" class=\"no-underline \" href=\"/eclipse/che/tree/master\"><span class=\"css-truncate-target\">master</span></a></span><span></span>\n"
+ "\n"
+ "from\n"
+ "\n"
- + "<span title=\"eclipse/che:stack-theia\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><span class=\"css-truncate-target\">stack-theia</span></span>\n"
+ + "<span title=\"eclipse/che:cleanup-e2e-theia\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><a title=\"eclipse/che:cleanup-e2e-theia\" class=\"no-underline \" href=\"/eclipse/che/tree/cleanup-e2e-theia\"><span class=\"css-truncate-target\">cleanup-e2e-theia</span></a></span><span><clipboard-copy aria-label=\"Copy\" data-copy-feedback=\"Copied!\" value=\"cleanup-e2e-theia\" data-view-component=\"true\" class=\"Link--onHover js-copy-branch color-fg-muted d-inline-block ml-1\">\n"
+ + " <svg aria-hidden=\"true\" height=\"16\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" data-view-component=\"true\" class=\"octicon octicon-copy\">\n"
+ + " <path fill-rule=\"evenodd\" d=\"M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 010 1.5h-1.5a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 00.25-.25v-1.5a.75.75 0 011.5 0v1.5A1.75 1.75 0 019.25 16h-7.5A1.75 1.75 0 010 14.25v-7.5z\"></path><path fill-rule=\"evenodd\" d=\"M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0114.25 11h-7.5A1.75 1.75 0 015 9.25v-7.5zm1.75-.25a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 00.25-.25v-7.5a.25.25 0 00-.25-.25h-7.5z\"></path>\n"
+ + "</svg>\n"
+ + " <svg style=\"display: none;\" aria-hidden=\"true\" height=\"16\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" data-view-component=\"true\" class=\"octicon octicon-check color-fg-success\">\n"
+ + " <path fill-rule=\"evenodd\" d=\"M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z\"></path>\n"
+ + "</svg>\n"
+ + "</clipboard-copy></span>\n"
+ "\n"
+ "\n"
- + " <relative-time datetime=\"2018-09-06T09:29:33Z\">Sep 6, 2018</relative-time>\n"
+ + " <relative-time datetime=\"2018-09-07T08:00:49Z\" class=\"no-wrap\">Sep 7, 2018</relative-time>\n"
+ "\n"
+ " </div>\n"
+ " </div>\n"
- + "</div>\n");
+ + "");
githubUrlParser.parse(url);
}
/** Check Pull Request is failing with Closed state */
@Test(
expectedExceptions = IllegalArgumentException.class,
- expectedExceptionsMessageRegExp = ".*found Closed.*")
+ expectedExceptionsMessageRegExp = ".*found closed.*")
public void checkPullRequestClosedState() {
- String url = "https://github.com/eclipse/che/pull/11103";
+ String url = "https://github.com/eclipse/che/pull/20754";
when(urlFetcher.fetchSafely(url))
.thenReturn(
- " <div class=\"TableObject gh-header-meta\">\n"
- + " <div class=\"TableObject-item\">\n"
- + " <div class=\"State State--red\">\n"
- + " <svg class=\"octicon octicon-git-pull-request\" viewBox=\"0 0 12 16\" version=\"1.1\" width=\"12\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"/></svg>\n"
- + " Closed\n"
- + " </div>\n"
+ " </div>\n"
+ + " <div class=\"d-flex flex-items-center flex-wrap mt-0 gh-header-meta\">\n"
+ + " <div class=\"flex-shrink-0 mb-2 flex-self-start flex-md-self-center\">\n"
+ + " <span reviewable_state=\"ready\" title=\"Status: Closed\" data-view-component=\"true\" class=\"State State--closed\">\n"
+ + " <svg height=\"16\" class=\"octicon octicon-git-pull-request-closed\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M10.72 1.227a.75.75 0 011.06 0l.97.97.97-.97a.75.75 0 111.06 1.061l-.97.97.97.97a.75.75 0 01-1.06 1.06l-.97-.97-.97.97a.75.75 0 11-1.06-1.06l.97-.97-.97-.97a.75.75 0 010-1.06zM12.75 6.5a.75.75 0 00-.75.75v3.378a2.251 2.251 0 101.5 0V7.25a.75.75 0 00-.75-.75zm0 5.5a.75.75 0 100 1.5.75.75 0 000-1.5zM2.5 3.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.25 1a2.25 2.25 0 00-.75 4.372v5.256a2.251 2.251 0 101.5 0V5.372A2.25 2.25 0 003.25 1zm0 11a.75.75 0 100 1.5.75.75 0 000-1.5z\"></path></svg> Closed\n"
+ + "</span>\n"
+ " </div>\n"
- + " <div class=\"TableObject-item TableObject-item--primary\">\n"
- + " <a class=\"author pull-header-username css-truncate css-truncate-target expandable\" data-hovercard-user-id=\"436777\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/benoitf\">benoitf</a>\n"
- + " wants to merge 1 commit into\n"
+ "\n"
+ "\n"
+ "\n"
- + " <span title=\"eclipse/che:che6\" class=\"commit-ref css-truncate user-select-contain expandable base-ref\"><span class=\"css-truncate-target\">che6</span></span>\n"
+ + " <div class=\"flex-auto min-width-0 mb-2\">\n"
+ + " <a class=\"author Link--secondary text-bold css-truncate css-truncate-target expandable\" data-hovercard-type=\"user\" data-hovercard-url=\"/users/Ohrimenko1988/hovercard\" data-octo-click=\"hovercard-link-click\" data-octo-dimensions=\"link_type:self\" href=\"/Ohrimenko1988\">Ohrimenko1988</a>\n"
+ + "\n"
+ + " wants to merge\n"
+ + " <span class=\"js-updating-pull-request-commits-count\">10</span>\n"
+ + " commits into\n"
+ "\n"
- + " <div class=\"commit-ref-dropdown\">\n"
- + " <details class=\"details-reset details-overlay select-menu js-select-menu commitish-suggester js-load-contents\" data-contents-url=\"/eclipse/che/pull/7923/show_partial?partial=pull_requests%2Fdescription_branches_dropdown\">\n"
- + " <summary class=\"btn btn-sm select-menu-button branch\" title=\"Choose a base branch\" aria-haspopup=\"true\">\n"
- + " <i>base:</i>\n"
- + " <span class=\"js-select-button css-truncate css-truncate-target\" title=\"che6\">che6</span>\n"
- + " </summary>\n"
- + " <details-menu class=\"select-menu-modal position-absolute\" style=\"z-index: 90;\">\n"
- + " <div class=\"js-select-menu-deferred-content\"></div>\n"
- + " <div class=\"select-menu-loading-overlay anim-pulse\">\n"
- + " <svg height=\"32\" class=\"octicon octicon-octoface\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"32\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M14.7 5.34c.13-.32.55-1.59-.13-3.31 0 0-1.05-.33-3.44 1.3-1-.28-2.07-.32-3.13-.32s-2.13.04-3.13.32c-2.39-1.64-3.44-1.3-3.44-1.3-.68 1.72-.26 2.99-.13 3.31C.49 6.21 0 7.33 0 8.69 0 13.84 3.33 15 7.98 15S16 13.84 16 8.69c0-1.36-.49-2.48-1.3-3.35zM8 14.02c-3.3 0-5.98-.15-5.98-3.35 0-.76.38-1.48 1.02-2.07 1.07-.98 2.9-.46 4.96-.46 2.07 0 3.88-.52 4.96.46.65.59 1.02 1.3 1.02 2.07 0 3.19-2.68 3.35-5.98 3.35zM5.49 9.01c-.66 0-1.2.8-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.54-1.78-1.2-1.78zm5.02 0c-.66 0-1.2.79-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.53-1.78-1.2-1.78z\"/></svg>\n"
- + " </div>\n"
- + " </details-menu>\n"
- + " </details>\n"
- + " </div>\n"
+ + "\n"
+ + "\n"
+ + " <span title=\"eclipse/che:7.38.x\" class=\"commit-ref css-truncate user-select-contain expandable \"><a title=\"eclipse/che:7.38.x\" class=\"no-underline \" href=\"/eclipse/che/tree/7.38.x\"><span class=\"css-truncate-target\">eclipse</span>:<span class=\"css-truncate-target\">7.38.x</span></a></span><span></span>\n"
+ "\n"
+ "from\n"
+ "\n"
- + "<span title=\"eclipse/che:gwt-mockito\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><span class=\"css-truncate-target\">gwt-mockito</span></span>\n"
+ + "<span title=\"Ohrimenko1988/che:iokhrime-chromedriver-7.38.x\" class=\"commit-ref css-truncate user-select-contain expandable head-ref\"><a title=\"Ohrimenko1988/che:iokhrime-chromedriver-7.38.x\" class=\"no-underline \" href=\"/Ohrimenko1988/che/tree/iokhrime-chromedriver-7.38.x\"><span class=\"css-truncate-target\">Ohrimenko1988</span>:<span class=\"css-truncate-target\">iokhrime-chromedriver-7.38.x</span></a></span><span><clipboard-copy aria-label=\"Copy\" data-copy-feedback=\"Copied!\" value=\"Ohrimenko1988:iokhrime-chromedriver-7.38.x\" data-view-component=\"true\" class=\"Link--onHover js-copy-branch color-fg-muted d-inline-block ml-1\">\n"
+ + " <svg aria-hidden=\"true\" height=\"16\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" data-view-component=\"true\" class=\"octicon octicon-copy\">\n"
+ + " <path fill-rule=\"evenodd\" d=\"M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 010 1.5h-1.5a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 00.25-.25v-1.5a.75.75 0 011.5 0v1.5A1.75 1.75 0 019.25 16h-7.5A1.75 1.75 0 010 14.25v-7.5z\"></path><path fill-rule=\"evenodd\" d=\"M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0114.25 11h-7.5A1.75 1.75 0 015 9.25v-7.5zm1.75-.25a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 00.25-.25v-7.5a.25.25 0 00-.25-.25h-7.5z\"></path>\n"
+ + "</svg>\n"
+ + " <svg style=\"display: none;\" aria-hidden=\"true\" height=\"16\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" data-view-component=\"true\" class=\"octicon octicon-check color-fg-success\">\n"
+ + " <path fill-rule=\"evenodd\" d=\"M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z\"></path>\n"
+ + "</svg>\n"
+ + "</clipboard-copy></span>\n"
+ "\n"
+ "\n"
+ "\n"
- + " </div>");
+ + " </div>\n"
+ + " </div>\n"
+ + "");
githubUrlParser.parse(url);
}
}
From 2eb0a6e0184e255b0cf0afa61b9dd9809aea8c2a Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@redhat.com>
Date: Mon, 2 May 2022 16:29:27 +0300
Subject: [PATCH 4/6] chore: Change mount path in the git-credentials-secret
(#292)
In order to have a common credentials path for all editors, remove theia specific path segment from the git-credentials-secret mount path.
---
.../server/scm/kubernetes/KubernetesGitCredentialManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesGitCredentialManager.java b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesGitCredentialManager.java
index cde1e4cbc8..a2cf8763d4 100644
--- a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesGitCredentialManager.java
+++ b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesGitCredentialManager.java
@@ -57,7 +57,7 @@ public class KubernetesGitCredentialManager implements GitCredentialManager {
public static final String ANNOTATION_SCM_URL = "che.eclipse.org/scm-url";
public static final String ANNOTATION_SCM_USERNAME = "che.eclipse.org/scm-username";
public static final String ANNOTATION_CHE_USERID = "che.eclipse.org/che-userid";
- public static final String CREDENTIALS_MOUNT_PATH = "/home/theia/.git-credentials";
+ public static final String CREDENTIALS_MOUNT_PATH = "/.git-credentials";
public static final String LABEL_DEV_WORKSPACE_CREDENTIAL =
DEV_WORKSPACE_PREFIX + "/git-credential";
From d64d9a1ac3658e5fe953e79dabf7e4a77e4ed3fe Mon Sep 17 00:00:00 2001
From: Lukas Krejci <metlos@users.noreply.github.com>
Date: Mon, 2 May 2022 16:02:45 +0200
Subject: [PATCH 5/6] fix: Add a note about the importance of the namespace
labels for DevWorkspaces. (#286)
Signed-off-by: Lukas Krejci <lkrejci@redhat.com>
---
.../main/webapp/WEB-INF/classes/che/che.properties | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
index b9c83585f5..50ba786ecd 100644
--- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
+++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
@@ -306,6 +306,14 @@ che.infra.kubernetes.namespace.creation_allowed=true
che.infra.kubernetes.namespace.default=<username>-che
# Defines whether che-server should try to label the workspace namespaces.
+# NOTE: It is strongly recommended to keep the value of this property set to true. If false, the new workspace namespaces will not be labeled
+# automatically and therefore not recognized by the Che operator making some features of DevWorkspaces not working.
+# If false, an administrator is required to label the namespaces manually using the labels specified in che.infra.kubernetes.namespace.labels.
+# If you want to manage the namespaces yourself, make sure to follow
+# https://www.eclipse.org/che/docs/stable/administration-guide/provisioning-namespaces-in-advance/.
+# Any additional labels present on the namespace are kept in place and do not affect the functionality.
+# Also note that the the administrator is free to pre-create and label the namespaces manually even if this property is
+# true. No updates to the namespaces are done if they already conform to the labeling requirements.
che.infra.kubernetes.namespace.label=true
# Defines whether che-server should try to annotate the workspace namespaces.
@@ -315,6 +323,10 @@ che.infra.kubernetes.namespace.annotate=true
# They are used to:
# - find prepared {orch-namespace} for users in combination with `che.infra.kubernetes.namespace.annotations`.
# - actively label {orch-namespace} with any workspace.
+# NOTE: It is strongly recommended not to change the value of this property because the Che operator relies on these labels
+# and their precise values when reconciling DevWorkspaces. If this configuration is changed, the namespaces will not be automatically
+# recognized by the Che operator as workspace namespaces unless manually labeled as such using the default labels and values.
+# Additional labels on the namespace do not affect the functionality.
che.infra.kubernetes.namespace.labels=app.kubernetes.io/part-of=che.eclipse.org,app.kubernetes.io/component=workspaces-namespace
# List of annotations to find {orch-namespace} prepared for {prod-short} users workspaces.
From 4d82519fbfb2b20fcc664a2dfb7647e7edf9e38a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 03:07:16 +0000
Subject: [PATCH 6/6] build(deps): bump io.prometheus.simpleclient.version
Bumps `io.prometheus.simpleclient.version` from 0.7.0 to 0.15.0.
Updates `simpleclient` from 0.7.0 to 0.15.0
- [Release notes](https://github.com/prometheus/client_java/releases)
- [Commits](https://github.com/prometheus/client_java/compare/parent-0.7.0...parent-0.15.0)
Updates `simpleclient_httpserver` from 0.7.0 to 0.15.0
- [Release notes](https://github.com/prometheus/client_java/releases)
- [Commits](https://github.com/prometheus/client_java/compare/parent-0.7.0...parent-0.15.0)
---
updated-dependencies:
- dependency-name: io.prometheus:simpleclient
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.prometheus:simpleclient_httpserver
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dbd82a4feb..c4012e7b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<io.opentracing.tracerresolver.version>0.1.8</io.opentracing.tracerresolver.version>
<io.opentracing.version>0.33.0</io.opentracing.version>
<io.opentracing.web-servlet-filter.version>0.4.1</io.opentracing.web-servlet-filter.version>
- <io.prometheus.simpleclient.version>0.7.0</io.prometheus.simpleclient.version>
+ <io.prometheus.simpleclient.version>0.15.0</io.prometheus.simpleclient.version>
<io.rest-assured.version>4.4.0</io.rest-assured.version>
<io.swagger.version>2.1.11</io.swagger.version>
<jakarta.activation.version>2.0.1</jakarta.activation.version>