diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bd81b812b0..2cdd3945ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -145,17 +145,17 @@ jobs:
prerelease: false
tag: ${{ github.event.inputs.version }}
token: ${{ secrets.CHE_BOT_GITHUB_TOKEN }}
- - name: Create failure MM message
- if: ${{ failure() }}
- run: |
- echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse-che/che-server/actions/workflows/release.yml\"}" > mattermost.json
- - name: Create success MM message
- run: |
- echo "{\"text\":\":white_check_mark: Che Server ${{ github.event.inputs.version }} has been released: https://quay.io/eclipse/che-server:${{ github.event.inputs.version }}\"}" > mattermost.json
- - name: Send MM message
- if: ${{ success() }} || ${{ failure() }}
- uses: mattermost/action-mattermost-notify@1.1.0
- env:
- MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
- MATTERMOST_CHANNEL: eclipse-che-releases
- MATTERMOST_USERNAME: che-bot
+ #- name: Create failure MM message
+ #if: ${{ failure() }}
+ #run: |
+ #echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse-che/che-server/actions/workflows/release.yml\"}" > mattermost.json
+ #- name: Create success MM message
+ #run: |
+ #echo "{\"text\":\":white_check_mark: Che Server ${{ github.event.inputs.version }} has been released: https://quay.io/eclipse/che-server:${{ github.event.inputs.version }}\"}" > mattermost.json
+ #- name: Send MM message
+ #if: ${{ success() }} || ${{ failure() }}
+ #uses: mattermost/action-mattermost-notify@1.1.0
+ #env:
+ #MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+ #MATTERMOST_CHANNEL: eclipse-che-releases
+ #MATTERMOST_USERNAME: che-bot
diff --git a/assembly/assembly-che-tomcat/pom.xml b/assembly/assembly-che-tomcat/pom.xml
index 094b6be060..f5c81234cb 100644
--- a/assembly/assembly-che-tomcat/pom.xml
+++ b/assembly/assembly-che-tomcat/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
assembly-che-tomcat
jar
diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
index 8c5f524ece..0b96a305e9 100644
--- a/assembly/assembly-main/pom.xml
+++ b/assembly/assembly-main/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
assembly-main
pom
diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml
index c76de79321..36f0315df1 100644
--- a/assembly/assembly-root-war/pom.xml
+++ b/assembly/assembly-root-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
assembly-root-war
war
diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml
index 0b7ee94124..a61a032af9 100644
--- a/assembly/assembly-swagger-war/pom.xml
+++ b/assembly/assembly-swagger-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
assembly-swagger-war
war
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
index c231fef264..75e59b3650 100644
--- a/assembly/assembly-wsmaster-war/pom.xml
+++ b/assembly/assembly-wsmaster-war/pom.xml
@@ -17,7 +17,7 @@
che-assembly-parent
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
assembly-wsmaster-war
war
diff --git a/assembly/pom.xml b/assembly/pom.xml
index cb151feffe..efe41d5a55 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-assembly-parent
diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml
index bb30598867..7c0ffa9636 100644
--- a/core/che-core-api-core/pom.xml
+++ b/core/che-core-api-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-core
jar
diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml
index 3cfc56ca14..ba1dcf4d6e 100644
--- a/core/che-core-api-dto-maven-plugin/pom.xml
+++ b/core/che-core-api-dto-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-dto-maven-plugin
maven-plugin
diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml
index 718a68d2c6..320a249d6f 100644
--- a/core/che-core-api-dto/pom.xml
+++ b/core/che-core-api-dto/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-dto
jar
diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml
index d94b734f73..bc75eb2bfb 100644
--- a/core/che-core-api-model/pom.xml
+++ b/core/che-core-api-model/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-model
jar
diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml
index e82e7a3f77..80032b44e1 100644
--- a/core/che-core-db-vendor-h2/pom.xml
+++ b/core/che-core-db-vendor-h2/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-db-vendor-h2
Che Core :: Commons :: DB :: Vendor H2
diff --git a/core/che-core-db-vendor-mysql/pom.xml b/core/che-core-db-vendor-mysql/pom.xml
index fc8b213916..b92bb670a7 100644
--- a/core/che-core-db-vendor-mysql/pom.xml
+++ b/core/che-core-db-vendor-mysql/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-db-vendor-mysql
Che Core :: Commons :: DB :: Vendor MySQL
diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml
index 6b63b5a394..de89925014 100644
--- a/core/che-core-db-vendor-postgresql/pom.xml
+++ b/core/che-core-db-vendor-postgresql/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-db-vendor-postgresql
Che Core :: Commons :: DB :: Vendor PostgreSQL
diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml
index 9fc7ad03ec..b84498ca4f 100644
--- a/core/che-core-db/pom.xml
+++ b/core/che-core-db/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-db
Che Core :: Commons :: DB
diff --git a/core/che-core-logback/pom.xml b/core/che-core-logback/pom.xml
index d92a72b950..737d4247cb 100644
--- a/core/che-core-logback/pom.xml
+++ b/core/che-core-logback/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-logback
jar
diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml
index af0d5f8346..20009594cb 100644
--- a/core/che-core-metrics-core/pom.xml
+++ b/core/che-core-metrics-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-metrics-core
Che Core :: Commons :: Metrics :: Core
diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml
index ab4e3900ae..75b703e5b5 100644
--- a/core/che-core-tracing-core/pom.xml
+++ b/core/che-core-tracing-core/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-tracing-core
Che Core :: Commons :: Tracing :: Core
diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml
index 47cd7fe74f..088185b477 100644
--- a/core/che-core-tracing-metrics/pom.xml
+++ b/core/che-core-tracing-metrics/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-tracing-metrics
Che Core :: Commons :: Tracing :: Metrics
diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml
index a862156471..974c8f6389 100644
--- a/core/che-core-tracing-web/pom.xml
+++ b/core/che-core-tracing-web/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-tracing-web
Che Core :: Commons :: Tracing :: Web
diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml
index 59cef8ef02..774d06e331 100644
--- a/core/che-core-typescript-dto-maven-plugin/pom.xml
+++ b/core/che-core-typescript-dto-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-typescript-dto-maven-plugin
maven-plugin
diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml
index f79f096147..035bd8afe7 100644
--- a/core/commons/che-core-commons-annotations/pom.xml
+++ b/core/commons/che-core-commons-annotations/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-annotations
jar
diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml
index a4ec8e7a19..de225d55c8 100644
--- a/core/commons/che-core-commons-inject/pom.xml
+++ b/core/commons/che-core-commons-inject/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-inject
jar
diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml
index b52ae033cc..abb99c95b4 100644
--- a/core/commons/che-core-commons-j2ee/pom.xml
+++ b/core/commons/che-core-commons-j2ee/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-j2ee
jar
diff --git a/core/commons/che-core-commons-json/pom.xml b/core/commons/che-core-commons-json/pom.xml
index 131fa323a5..1660496595 100644
--- a/core/commons/che-core-commons-json/pom.xml
+++ b/core/commons/che-core-commons-json/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-json
jar
diff --git a/core/commons/che-core-commons-lang/pom.xml b/core/commons/che-core-commons-lang/pom.xml
index 56b9f61417..08a9a4a68e 100644
--- a/core/commons/che-core-commons-lang/pom.xml
+++ b/core/commons/che-core-commons-lang/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-lang
jar
diff --git a/core/commons/che-core-commons-observability/pom.xml b/core/commons/che-core-commons-observability/pom.xml
index 27b3f9cceb..4ce9237280 100644
--- a/core/commons/che-core-commons-observability/pom.xml
+++ b/core/commons/che-core-commons-observability/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-observability
Che Core :: Commons :: Tracing and Monitoring wrapper
diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml
index 8d1526e2c0..28234240a1 100644
--- a/core/commons/che-core-commons-schedule/pom.xml
+++ b/core/commons/che-core-commons-schedule/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-schedule
jar
diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml
index 7de1eb1e77..1c3390e902 100644
--- a/core/commons/che-core-commons-test/pom.xml
+++ b/core/commons/che-core-commons-test/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-test
jar
diff --git a/core/commons/che-core-commons-tracing/pom.xml b/core/commons/che-core-commons-tracing/pom.xml
index c766f4fc45..8f65721327 100644
--- a/core/commons/che-core-commons-tracing/pom.xml
+++ b/core/commons/che-core-commons-tracing/pom.xml
@@ -17,7 +17,7 @@
che-core-commons-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-commons-tracing
Che Core :: Commons :: Tracing
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index f7a126b7c4..fc9308fe5d 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-core-commons-parent
diff --git a/core/pom.xml b/core/pom.xml
index 0112b04192..088a25fe1e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
org.eclipse.che.core
diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile
index 73c7262246..91e4822ca6 100644
--- a/dockerfiles/che/Dockerfile
+++ b/dockerfiles/che/Dockerfile
@@ -10,7 +10,7 @@
#
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.8-1014
+FROM registry.access.redhat.com/ubi8-minimal:8.8-1037
USER root
ENV CHE_HOME=/home/user/eclipse-che
ENV JAVA_HOME=/usr/lib/jvm/jre
diff --git a/infrastructures/infrastructure-distributed/pom.xml b/infrastructures/infrastructure-distributed/pom.xml
index 6e24cf7e1f..66c493e694 100644
--- a/infrastructures/infrastructure-distributed/pom.xml
+++ b/infrastructures/infrastructure-distributed/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
infrastructure-distributed
jar
diff --git a/infrastructures/infrastructure-factory/pom.xml b/infrastructures/infrastructure-factory/pom.xml
index 143a6ccf4d..57a94af672 100644
--- a/infrastructures/infrastructure-factory/pom.xml
+++ b/infrastructures/infrastructure-factory/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
infrastructure-factory
jar
diff --git a/infrastructures/infrastructure-metrics/pom.xml b/infrastructures/infrastructure-metrics/pom.xml
index dc6ad89539..038f3d723b 100644
--- a/infrastructures/infrastructure-metrics/pom.xml
+++ b/infrastructures/infrastructure-metrics/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
infrastructure-metrics
diff --git a/infrastructures/infrastructure-permission/pom.xml b/infrastructures/infrastructure-permission/pom.xml
index 42347db8a0..a760e0741a 100644
--- a/infrastructures/infrastructure-permission/pom.xml
+++ b/infrastructures/infrastructure-permission/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
infrastructure-permission
Infrastructure :: Kubernetes Permissions
diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml
index 12e1b97366..95aa07d233 100644
--- a/infrastructures/kubernetes/pom.xml
+++ b/infrastructures/kubernetes/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
infrastructure-kubernetes
Infrastructure :: Kubernetes
diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml
index 6f2fa5d10f..03aa3a28ed 100644
--- a/infrastructures/openshift/pom.xml
+++ b/infrastructures/openshift/pom.xml
@@ -17,7 +17,7 @@
che-infrastructures-parent
org.eclipse.che.infrastructure
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
infrastructure-openshift
Infrastructure :: OpenShift
diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml
index 7c8a411597..0d616f77f4 100644
--- a/infrastructures/pom.xml
+++ b/infrastructures/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
org.eclipse.che.infrastructure
diff --git a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
index 2a6e23c7df..f9ec158708 100644
--- a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
+++ b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-authentication-commons
jar
diff --git a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
index 497f90be3c..a12c7c9cb3 100644
--- a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
+++ b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-authorization-impl
jar
diff --git a/multiuser/api/che-multiuser-api-authorization/pom.xml b/multiuser/api/che-multiuser-api-authorization/pom.xml
index 79dcdd2888..87dc6084a4 100644
--- a/multiuser/api/che-multiuser-api-authorization/pom.xml
+++ b/multiuser/api/che-multiuser-api-authorization/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-authorization
jar
diff --git a/multiuser/api/che-multiuser-api-organization-shared/pom.xml b/multiuser/api/che-multiuser-api-organization-shared/pom.xml
index 2da06a8685..8c517f2d5a 100644
--- a/multiuser/api/che-multiuser-api-organization-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-organization-shared
jar
diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml
index fab10b7eb1..e96cca4428 100644
--- a/multiuser/api/che-multiuser-api-organization/pom.xml
+++ b/multiuser/api/che-multiuser-api-organization/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-organization
jar
diff --git a/multiuser/api/che-multiuser-api-permission-shared/pom.xml b/multiuser/api/che-multiuser-api-permission-shared/pom.xml
index dfef2af1a9..07faf0ca39 100644
--- a/multiuser/api/che-multiuser-api-permission-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-permission-shared
jar
diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml
index 9e0ac6b758..5f85bba74f 100644
--- a/multiuser/api/che-multiuser-api-permission/pom.xml
+++ b/multiuser/api/che-multiuser-api-permission/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-permission
jar
diff --git a/multiuser/api/che-multiuser-api-resource-shared/pom.xml b/multiuser/api/che-multiuser-api-resource-shared/pom.xml
index fa1db4fa1b..6794b24719 100644
--- a/multiuser/api/che-multiuser-api-resource-shared/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-resource-shared
jar
diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml
index 4519c5759b..66b70c398f 100644
--- a/multiuser/api/che-multiuser-api-resource/pom.xml
+++ b/multiuser/api/che-multiuser-api-resource/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-resource
jar
diff --git a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
index c93c7b3be2..6e294be270 100644
--- a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
+++ b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-api
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-api-workspace-activity
jar
diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml
index 8ab3ab656c..957589ec63 100644
--- a/multiuser/api/pom.xml
+++ b/multiuser/api/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-multiuser-api
diff --git a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
index 2ec0523475..59202417c5 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 @@
che-multiuser-integration-tests
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-cascade-removal
jar
diff --git a/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml
index fa6c42c9a9..91ad5d7877 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 @@
che-multiuser-integration-tests
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-mysql-tck
jar
diff --git a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
index 8b27226771..0aa8bcdb34 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 @@
che-multiuser-integration-tests
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-postgresql-tck
jar
diff --git a/multiuser/integration-tests/pom.xml b/multiuser/integration-tests/pom.xml
index 7aeab72bec..667c7a8af5 100644
--- a/multiuser/integration-tests/pom.xml
+++ b/multiuser/integration-tests/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-integration-tests
pom
diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
index b7af3554ea..eb27db9720 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-keycloak-server
jar
diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
index f79bc49861..21565d767b 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-keycloak-shared
jar
diff --git a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
index 219b9b41b5..392a95c2af 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-keycloak-token-provider
Che Multiuser :: Keycloak Token Provider
diff --git a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
index f2cb08bd69..a6bd3c1a68 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
+++ b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-keycloak
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-keycloak-user-remover
jar
diff --git a/multiuser/keycloak/pom.xml b/multiuser/keycloak/pom.xml
index e4c69e29b0..553d63536a 100644
--- a/multiuser/keycloak/pom.xml
+++ b/multiuser/keycloak/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-multiuser-keycloak
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
index aa40b09846..644c8840d8 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-machine-auth
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-machine-authentication-shared
jar
diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
index 1282022396..9ec6ffdad2 100644
--- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
+++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-machine-auth
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-machine-authentication
jar
diff --git a/multiuser/machine-auth/pom.xml b/multiuser/machine-auth/pom.xml
index 66077ae0af..f129c5321f 100644
--- a/multiuser/machine-auth/pom.xml
+++ b/multiuser/machine-auth/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-multiuser-machine-auth
diff --git a/multiuser/oidc/pom.xml b/multiuser/oidc/pom.xml
index c00804f16e..c2aa2da352 100644
--- a/multiuser/oidc/pom.xml
+++ b/multiuser/oidc/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-oidc
jar
diff --git a/multiuser/permission/che-multiuser-permission-devfile/pom.xml b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
index 35bbdd8550..c39e655c3f 100644
--- a/multiuser/permission/che-multiuser-permission-devfile/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-devfile/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-devfile
Che Multiuser :: Devfile Permissions
diff --git a/multiuser/permission/che-multiuser-permission-logger/pom.xml b/multiuser/permission/che-multiuser-permission-logger/pom.xml
index e0bd8d3cfc..cbf314d12c 100644
--- a/multiuser/permission/che-multiuser-permission-logger/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-logger/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-logger
Che Multiuser :: Logger Permissions
diff --git a/multiuser/permission/che-multiuser-permission-resource/pom.xml b/multiuser/permission/che-multiuser-permission-resource/pom.xml
index 5816ca51e4..da6194cb9f 100644
--- a/multiuser/permission/che-multiuser-permission-resource/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-resource/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-resource
Che Multiuser :: Resource :: Permissions
diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml
index 2c02a66aad..a420a1cb12 100644
--- a/multiuser/permission/che-multiuser-permission-system/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-system/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-system
Che Multiuser :: System Permissions
diff --git a/multiuser/permission/che-multiuser-permission-user/pom.xml b/multiuser/permission/che-multiuser-permission-user/pom.xml
index d4b3dcb1b9..c013ab9aed 100644
--- a/multiuser/permission/che-multiuser-permission-user/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-user/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-user
Che Multiuser :: User Permissions
diff --git a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
index bf70752d9a..61fca5dffb 100644
--- a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-workspace-activity
Che Multiuser :: Workspace Activity Permissions
diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
index 6f5a7ea553..80c0ae16fe 100644
--- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml
+++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-permission
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-permission-workspace
Che Multiuser :: Workspace Permissions
diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml
index 3feedfaefb..eed4ae3975 100644
--- a/multiuser/permission/pom.xml
+++ b/multiuser/permission/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-multiuser-permission
diff --git a/multiuser/personal-account/pom.xml b/multiuser/personal-account/pom.xml
index 3e790130fe..a582250ae5 100644
--- a/multiuser/personal-account/pom.xml
+++ b/multiuser/personal-account/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-multiuser-personal-account
jar
diff --git a/multiuser/pom.xml b/multiuser/pom.xml
index 6bae24c14f..0fa4cade6f 100644
--- a/multiuser/pom.xml
+++ b/multiuser/pom.xml
@@ -17,7 +17,7 @@
che-server
org.eclipse.che
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
org.eclipse.che.multiuser
diff --git a/multiuser/sql-schema/pom.xml b/multiuser/sql-schema/pom.xml
index 52d2d062b0..b8379a3215 100644
--- a/multiuser/sql-schema/pom.xml
+++ b/multiuser/sql-schema/pom.xml
@@ -17,7 +17,7 @@
che-multiuser-parent
org.eclipse.che.multiuser
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
che-multiuser-sql-schema
diff --git a/pom.xml b/pom.xml
index 4531d77341..bfc7217bba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
4.0.0
org.eclipse.che
che-server
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
pom
Che Server
Eclipse Che Server
@@ -55,14 +55,14 @@
2.32.0
5.0.1
2.3.4
- 31.1-jre
- 1.40.1
+ 32.1.2-jre
+ 1.43.3
1.34.1
2.8.9
2.1.210
0.1.55
3.14.9
- 1.17.2
+ 3.5.0
1.5
2.11.0
2.6
@@ -100,7 +100,7 @@
Red Hat, Inc. - initial API and implementation
${project.version}
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
1.0-beta2
Red Hat, Inc.
diff --git a/typescript-dto/dto-pom.xml b/typescript-dto/dto-pom.xml
index 69facc90b5..72457d72c9 100644
--- a/typescript-dto/dto-pom.xml
+++ b/typescript-dto/dto-pom.xml
@@ -23,7 +23,7 @@
pom
Che TypeScript DTO
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml
index bc9493b0c8..23b5de9401 100644
--- a/wsmaster/che-core-api-account/pom.xml
+++ b/wsmaster/che-core-api-account/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-account
Che Core :: API :: Account
diff --git a/wsmaster/che-core-api-auth-azure-devops/pom.xml b/wsmaster/che-core-api-auth-azure-devops/pom.xml
index d525238c49..127576967a 100644
--- a/wsmaster/che-core-api-auth-azure-devops/pom.xml
+++ b/wsmaster/che-core-api-auth-azure-devops/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-azure-devops
jar
diff --git a/wsmaster/che-core-api-auth-bitbucket/pom.xml b/wsmaster/che-core-api-auth-bitbucket/pom.xml
index ae6c39d18c..d32dc40adc 100644
--- a/wsmaster/che-core-api-auth-bitbucket/pom.xml
+++ b/wsmaster/che-core-api-auth-bitbucket/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-bitbucket
jar
diff --git a/wsmaster/che-core-api-auth-github/pom.xml b/wsmaster/che-core-api-auth-github/pom.xml
index 8352670ffd..04b1abe27b 100644
--- a/wsmaster/che-core-api-auth-github/pom.xml
+++ b/wsmaster/che-core-api-auth-github/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-github
jar
diff --git a/wsmaster/che-core-api-auth-gitlab/pom.xml b/wsmaster/che-core-api-auth-gitlab/pom.xml
index 4c7a8f69d5..dba9b53e2d 100644
--- a/wsmaster/che-core-api-auth-gitlab/pom.xml
+++ b/wsmaster/che-core-api-auth-gitlab/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-gitlab
jar
diff --git a/wsmaster/che-core-api-auth-openshift/pom.xml b/wsmaster/che-core-api-auth-openshift/pom.xml
index f6eb011e77..7fbdd86461 100644
--- a/wsmaster/che-core-api-auth-openshift/pom.xml
+++ b/wsmaster/che-core-api-auth-openshift/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-openshift
jar
diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml
index 2d99d35823..f084f62b11 100644
--- a/wsmaster/che-core-api-auth-shared/pom.xml
+++ b/wsmaster/che-core-api-auth-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth-shared
jar
diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml
index 875d931776..f01db0df93 100644
--- a/wsmaster/che-core-api-auth/pom.xml
+++ b/wsmaster/che-core-api-auth/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-auth
jar
diff --git a/wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth/EmbeddedOAuthAPI.java b/wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth/EmbeddedOAuthAPI.java
index 352d7bbc20..35e0b4a874 100644
--- a/wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth/EmbeddedOAuthAPI.java
+++ b/wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth/EmbeddedOAuthAPI.java
@@ -38,11 +38,6 @@ import org.eclipse.che.api.core.rest.shared.dto.Link;
import org.eclipse.che.api.core.rest.shared.dto.LinkParameter;
import org.eclipse.che.api.core.util.LinksHelper;
import org.eclipse.che.api.factory.server.scm.OAuthTokenFetcher;
-import org.eclipse.che.api.factory.server.scm.PersonalAccessToken;
-import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
-import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException;
-import org.eclipse.che.api.factory.server.scm.exception.ScmConfigurationPersistenceException;
-import org.eclipse.che.api.factory.server.scm.exception.ScmUnauthorizedException;
import org.eclipse.che.commons.env.EnvironmentContext;
import org.eclipse.che.commons.subject.Subject;
import org.eclipse.che.security.oauth.shared.dto.OAuthAuthenticatorDescriptor;
@@ -64,7 +59,6 @@ public class EmbeddedOAuthAPI implements OAuthAPI, OAuthTokenFetcher {
protected String errorPage;
@Inject protected OAuthAuthenticatorProvider providers;
- @Inject protected PersonalAccessTokenManager personalAccessTokenManager;
private String redirectAfterLogin;
@Override
@@ -159,25 +153,11 @@ public class EmbeddedOAuthAPI implements OAuthAPI, OAuthTokenFetcher {
if (token != null) {
return token;
}
- Optional tokenOptional =
- personalAccessTokenManager.get(subject, provider.getEndpointUrl());
- if (tokenOptional.isPresent()) {
- PersonalAccessToken accessToken = tokenOptional.get();
- return newDto(OAuthToken.class).withToken(accessToken.getToken());
- }
throw new UnauthorizedException(
"OAuth token for user " + subject.getUserId() + " was not found");
- } catch (IOException | ScmConfigurationPersistenceException | ScmCommunicationException e) {
+ } catch (IOException e) {
throw new ServerException(e.getLocalizedMessage(), e);
- } catch (ScmUnauthorizedException e) {
- throwUnauthorizedException(subject);
}
- return null;
- }
-
- private void throwUnauthorizedException(Subject subject) throws UnauthorizedException {
- throw new UnauthorizedException(
- "OAuth token for user " + subject.getUserId() + " was not found");
}
@Override
diff --git a/wsmaster/che-core-api-devfile-shared/pom.xml b/wsmaster/che-core-api-devfile-shared/pom.xml
index ab6f7924a1..c6ba4a028f 100644
--- a/wsmaster/che-core-api-devfile-shared/pom.xml
+++ b/wsmaster/che-core-api-devfile-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-devfile-shared
jar
diff --git a/wsmaster/che-core-api-devfile/pom.xml b/wsmaster/che-core-api-devfile/pom.xml
index 70a54b2599..825ec71401 100644
--- a/wsmaster/che-core-api-devfile/pom.xml
+++ b/wsmaster/che-core-api-devfile/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-devfile
jar
diff --git a/wsmaster/che-core-api-factory-azure-devops/pom.xml b/wsmaster/che-core-api-factory-azure-devops/pom.xml
index e6fb299ca2..2ce181bfc6 100644
--- a/wsmaster/che-core-api-factory-azure-devops/pom.xml
+++ b/wsmaster/che-core-api-factory-azure-devops/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-azure-devops
jar
diff --git a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java
index 807c400398..b3e5a4e377 100644
--- a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java
+++ b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java
@@ -81,10 +81,6 @@ public class AzureDevOpsURLParser {
}
String repoName = matcher.group("repoName");
- if (repoName.endsWith(".git")) {
- repoName = repoName.substring(0, repoName.length() - 4);
- }
-
String project = matcher.group("project");
if (project == null) {
// if project is not specified, repo name must be equal to project name
diff --git a/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java b/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java
index 56e29dc0a6..5a5c521fd8 100644
--- a/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java
+++ b/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java
@@ -71,7 +71,7 @@ public class AzureDevOpsURLParserTest {
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.git",
"MyOrg",
"MyProject",
- "MyRepo",
+ "MyRepo.git",
null,
null
},
@@ -79,7 +79,7 @@ public class AzureDevOpsURLParserTest {
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.dot.git",
"MyOrg",
"MyProject",
- "MyRepo.dot",
+ "MyRepo.dot.git",
null,
null
},
@@ -100,7 +100,14 @@ public class AzureDevOpsURLParserTest {
null
},
{"https://dev.azure.com/MyOrg/MyProject/_git/-", "MyOrg", "MyProject", "-", null, null},
- {"https://dev.azure.com/MyOrg/MyProject/_git/-j.git", "MyOrg", "MyProject", "-j", null, null},
+ {
+ "https://dev.azure.com/MyOrg/MyProject/_git/-j.git",
+ "MyOrg",
+ "MyProject",
+ "-j.git",
+ null,
+ null
+ },
{
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo?path=MyFile&version=GBmain&_a=contents",
"MyOrg",
diff --git a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
index d61b1c2a5c..c35f13660d 100644
--- a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
+++ b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-bitbucket-server
jar
diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java
index 5d22669cca..b22878ee63 100644
--- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java
+++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java
@@ -11,6 +11,7 @@
*/
package org.eclipse.che.api.factory.server.bitbucket;
+import static com.google.common.base.Strings.isNullOrEmpty;
import static java.lang.String.format;
import static java.lang.String.valueOf;
@@ -159,6 +160,12 @@ public class BitbucketServerPersonalAccessTokenFetcher implements PersonalAccess
}
}
try {
+ // Token is added manually by a user without token id. Validate only by requesting user info.
+ if (isNullOrEmpty(params.getScmTokenId())) {
+ BitbucketUser user = bitbucketServerApiClient.getUser(params.getToken());
+ return Optional.of(Pair.of(Boolean.TRUE, user.getName()));
+ }
+ // Token is added by OAuth. Token id is available.
BitbucketPersonalAccessToken bitbucketPersonalAccessToken =
bitbucketServerApiClient.getPersonalAccessToken(Long.valueOf(params.getScmTokenId()));
return Optional.of(
diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java
index bff6ca6f30..acdfa4d90c 100644
--- a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java
+++ b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java
@@ -231,6 +231,23 @@ public class BitbucketServerPersonalAccessTokenFetcherTest {
// then
assertFalse(result.isEmpty());
assertTrue(result.get().first);
+ assertEquals(result.get().second, bitbucketUser.getName());
+ }
+
+ @Test
+ public void shouldValidateTokenWithoutId()
+ throws ScmUnauthorizedException, ScmCommunicationException, ScmItemNotFoundException {
+ // given
+ when(personalAccessTokenParams.getScmProviderUrl()).thenReturn(someBitbucketURL);
+ when(personalAccessTokenParams.getToken()).thenReturn("token");
+ when(bitbucketServerApiClient.isConnected(eq(someBitbucketURL))).thenReturn(true);
+ when(bitbucketServerApiClient.getUser(eq("token"))).thenReturn(bitbucketUser);
+ // when
+ Optional> result = fetcher.isValid(personalAccessTokenParams);
+ // then
+ assertFalse(result.isEmpty());
+ assertTrue(result.get().first);
+ assertEquals(result.get().second, bitbucketUser.getName());
}
@DataProvider
diff --git a/wsmaster/che-core-api-factory-bitbucket/pom.xml b/wsmaster/che-core-api-factory-bitbucket/pom.xml
index 9786fefc96..780b5f5c93 100644
--- a/wsmaster/che-core-api-factory-bitbucket/pom.xml
+++ b/wsmaster/che-core-api-factory-bitbucket/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-bitbucket
jar
diff --git a/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcher.java
index e9e6835fc7..6e8bf10e7e 100644
--- a/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcher.java
+++ b/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcher.java
@@ -13,6 +13,7 @@ package org.eclipse.che.api.factory.server.bitbucket;
import com.google.common.collect.Sets;
import java.util.Optional;
+import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.che.api.auth.shared.dto.OAuthToken;
@@ -52,7 +53,13 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
private static final String OAUTH_PROVIDER_NAME = "bitbucket";
/** OAuth scope required to make integration with Bitbucket work. */
- public static final String DEFAULT_TOKEN_SCOPE = "repository:write";
+ public static final String DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE = "repository:write";
+
+ public static final String DEFAULT_PULLREQUEST_WRITE_TOKEN_SCOPE = "pullrequest:write";
+
+ public static final String DEFAULT_ACCOUNT_READ_TOKEN_SCOPE = "account";
+
+ public static final String DEFAULT_ACCOUNT_WRITE_TOKEN_SCOPE = "account:write";
@Inject
public BitbucketPersonalAccessTokenFetcher(
@@ -101,7 +108,9 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
} else if (!valid.get().first) {
throw new ScmCommunicationException(
"Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: "
- + DEFAULT_TOKEN_SCOPE);
+ + DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE
+ + " and "
+ + DEFAULT_ACCOUNT_READ_TOKEN_SCOPE);
}
return new PersonalAccessToken(
scmServerUrl,
@@ -136,7 +145,7 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
try {
String[] scopes = bitbucketApiClient.getTokenScopes(personalAccessToken.getToken()).second;
- return Optional.of(Sets.newHashSet(scopes).contains(DEFAULT_TOKEN_SCOPE));
+ return Optional.of(isValidScope(Sets.newHashSet(scopes)));
} catch (ScmItemNotFoundException | ScmCommunicationException | ScmBadRequestException e) {
return Optional.of(Boolean.FALSE);
}
@@ -153,9 +162,7 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
Pair pair = bitbucketApiClient.getTokenScopes(params.getToken());
return Optional.of(
Pair.of(
- Sets.newHashSet(pair.second).contains(DEFAULT_TOKEN_SCOPE)
- ? Boolean.TRUE
- : Boolean.FALSE,
+ isValidScope(Sets.newHashSet(pair.second)) ? Boolean.TRUE : Boolean.FALSE,
pair.first));
} catch (ScmItemNotFoundException | ScmCommunicationException | ScmBadRequestException e) {
return Optional.empty();
@@ -168,4 +175,15 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
+ OAUTH_PROVIDER_NAME
+ "&scope=repository&request_method=POST&signature_method=rsa";
}
+
+ /**
+ * Checks if the given scopes are valid for Bitbucket. Note: that pullrequest:write is a wider
+ * scope than repository:write, and account:write is a wider scope than account.
+ */
+ private boolean isValidScope(Set scopes) {
+ return (scopes.contains(DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE)
+ || scopes.contains(DEFAULT_PULLREQUEST_WRITE_TOKEN_SCOPE))
+ && (scopes.contains(DEFAULT_ACCOUNT_READ_TOKEN_SCOPE)
+ || scopes.contains(DEFAULT_ACCOUNT_WRITE_TOKEN_SCOPE));
+ }
}
diff --git a/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClientTest.java b/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClientTest.java
index 41ec29586c..ed1b205735 100644
--- a/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClientTest.java
+++ b/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClientTest.java
@@ -87,11 +87,12 @@ public class BitbucketApiClientTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
- BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
+ BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
+ "repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
String[] scopes = client.getTokenScopes("token1").second;
- String[] expectedScopes = {"repository:write"};
+ String[] expectedScopes = {"repository:write", "account"};
assertNotNull(scopes, "Bitbucket API should have returned a non-null scope array");
assertEqualsNoOrder(
scopes, expectedScopes, "Returned scope array does not match expected values");
diff --git a/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcherTest.java b/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcherTest.java
index 49d06e00fa..d5ffdd471c 100644
--- a/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcherTest.java
+++ b/wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcherTest.java
@@ -96,7 +96,7 @@ public class BitbucketPersonalAccessTokenFetcherTest {
@Test(
expectedExceptions = ScmCommunicationException.class,
expectedExceptionsMessageRegExp =
- "Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: repository:write")
+ "Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: repository:write and account")
public void shouldThrowExceptionOnInsufficientTokenScopes() throws Exception {
Subject subject = new SubjectImpl("Username", "id1", "token", false);
OAuthToken oAuthToken = newDto(OAuthToken.class).withToken(bitbucketOauthToken).withScope("");
@@ -140,7 +140,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
- BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
+ BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
+ "repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessToken token =
@@ -158,7 +159,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
- BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
+ BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
+ "repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessTokenParams params =
@@ -179,7 +181,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
- BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
+ BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
+ "repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessTokenParams params =
diff --git a/wsmaster/che-core-api-factory-github/pom.xml b/wsmaster/che-core-api-factory-github/pom.xml
index 7f67f5d040..b40040bdaf 100644
--- a/wsmaster/che-core-api-factory-github/pom.xml
+++ b/wsmaster/che-core-api-factory-github/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-github
jar
diff --git a/wsmaster/che-core-api-factory-gitlab/pom.xml b/wsmaster/che-core-api-factory-gitlab/pom.xml
index 83260e991c..4a85797e4f 100644
--- a/wsmaster/che-core-api-factory-gitlab/pom.xml
+++ b/wsmaster/che-core-api-factory-gitlab/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-gitlab
jar
diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml
index ee17f6694f..8877b08d2e 100644
--- a/wsmaster/che-core-api-factory-shared/pom.xml
+++ b/wsmaster/che-core-api-factory-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory-shared
jar
diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml
index e2252ec26c..737e26c30d 100644
--- a/wsmaster/che-core-api-factory/pom.xml
+++ b/wsmaster/che-core-api-factory/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-factory
jar
diff --git a/wsmaster/che-core-api-logger-shared/pom.xml b/wsmaster/che-core-api-logger-shared/pom.xml
index d515c15e73..a27060dd51 100644
--- a/wsmaster/che-core-api-logger-shared/pom.xml
+++ b/wsmaster/che-core-api-logger-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-logger-shared
jar
diff --git a/wsmaster/che-core-api-logger/pom.xml b/wsmaster/che-core-api-logger/pom.xml
index a76ce28e58..c2a20596c6 100644
--- a/wsmaster/che-core-api-logger/pom.xml
+++ b/wsmaster/che-core-api-logger/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-logger
jar
diff --git a/wsmaster/che-core-api-metrics/pom.xml b/wsmaster/che-core-api-metrics/pom.xml
index 4029b3f459..008ba93c7b 100644
--- a/wsmaster/che-core-api-metrics/pom.xml
+++ b/wsmaster/che-core-api-metrics/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-metrics
jar
diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml
index 7f50c8c543..38d0c4ebf5 100644
--- a/wsmaster/che-core-api-ssh-shared/pom.xml
+++ b/wsmaster/che-core-api-ssh-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-ssh-shared
jar
diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml
index 3cb7e3af54..7510df7e55 100644
--- a/wsmaster/che-core-api-ssh/pom.xml
+++ b/wsmaster/che-core-api-ssh/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-ssh
jar
diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml
index fe30c5bb11..04e878756c 100644
--- a/wsmaster/che-core-api-system-shared/pom.xml
+++ b/wsmaster/che-core-api-system-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-system-shared
jar
diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml
index 973ece02f6..2c3f8d44cd 100644
--- a/wsmaster/che-core-api-system/pom.xml
+++ b/wsmaster/che-core-api-system/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-system
jar
diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml
index 556832cb44..93dd04b885 100644
--- a/wsmaster/che-core-api-user-shared/pom.xml
+++ b/wsmaster/che-core-api-user-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-user-shared
Che Core :: API :: User :: Shared
diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml
index d9327480f8..4e60130ac0 100644
--- a/wsmaster/che-core-api-user/pom.xml
+++ b/wsmaster/che-core-api-user/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-user
Che Core :: API :: User
diff --git a/wsmaster/che-core-api-workspace-activity/pom.xml b/wsmaster/che-core-api-workspace-activity/pom.xml
index 38499fc800..0c8dfd9df5 100644
--- a/wsmaster/che-core-api-workspace-activity/pom.xml
+++ b/wsmaster/che-core-api-workspace-activity/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-workspace-activity
jar
diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml
index 1d38cd7d7c..a4fb61b895 100644
--- a/wsmaster/che-core-api-workspace-shared/pom.xml
+++ b/wsmaster/che-core-api-workspace-shared/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-workspace-shared
jar
diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml
index 02fc8d87c6..a95c0f98ba 100644
--- a/wsmaster/che-core-api-workspace/pom.xml
+++ b/wsmaster/che-core-api-workspace/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-api-workspace
jar
diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml
index 6f44c7ec34..c40e1adef5 100644
--- a/wsmaster/che-core-sql-schema/pom.xml
+++ b/wsmaster/che-core-sql-schema/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
che-core-sql-schema
Che Core :: SQL :: Schema
diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml
index 76a95e20a1..a99e5f093c 100644
--- a/wsmaster/integration-tests/cascade-removal/pom.xml
+++ b/wsmaster/integration-tests/cascade-removal/pom.xml
@@ -17,7 +17,7 @@
integration-tests-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
cascade-removal
Integration Tests :: Cascade Removal
diff --git a/wsmaster/integration-tests/mysql-tck/pom.xml b/wsmaster/integration-tests/mysql-tck/pom.xml
index df6348ca4c..a283748387 100644
--- a/wsmaster/integration-tests/mysql-tck/pom.xml
+++ b/wsmaster/integration-tests/mysql-tck/pom.xml
@@ -17,7 +17,7 @@
integration-tests-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
mysql-tck
jar
diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml
index 6d83b92e29..07c5acfd7a 100644
--- a/wsmaster/integration-tests/pom.xml
+++ b/wsmaster/integration-tests/pom.xml
@@ -17,7 +17,7 @@
che-master-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../pom.xml
integration-tests-parent
diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml
index 57f09aae44..e588a526d0 100644
--- a/wsmaster/integration-tests/postgresql-tck/pom.xml
+++ b/wsmaster/integration-tests/postgresql-tck/pom.xml
@@ -17,7 +17,7 @@
integration-tests-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
postgresql-tck
jar
diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml
index fad46c1a16..80a43b0902 100644
--- a/wsmaster/pom.xml
+++ b/wsmaster/pom.xml
@@ -17,7 +17,7 @@
che-core-parent
org.eclipse.che.core
- 7.73.0-SNAPSHOT
+ 7.74.0-SNAPSHOT
../core/pom.xml
che-master-parent