Merge pull request #87 from PizzaFactory/prp-update-to-upstream

Update to the upstream.

Author: monaka

.github/workflows/try-in-web-ide.yaml

@@ -0,0 +1,16 @@
+# Add Web IDE link on PRs
+name: Try in Web IDE
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+jobs:
+  add-link:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Web IDE Pull Request Check
+        uses: redhat-actions/try-in-web-ide@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add_comment: false

assembly/assembly-che-tomcat/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-che-tomcat</artifactId>
     <packaging>jar</packaging>

assembly/assembly-main/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-main</artifactId>
     <packaging>pom</packaging>

assembly/assembly-root-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-root-war</artifactId>
     <packaging>war</packaging>

assembly/assembly-swagger-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-swagger-war</artifactId>
     <packaging>war</packaging>

assembly/assembly-wsmaster-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsmaster-war</artifactId>
     <packaging>war</packaging>
@@ -103,6 +103,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-auth-bitbucket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-auth-gitlab</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-auth-openshift</artifactId>

assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.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/
@@ -105,6 +105,7 @@
 import org.eclipse.che.security.PBKDF2PasswordEncryptor;
 import org.eclipse.che.security.PasswordEncryptor;
 import org.eclipse.che.security.oauth.EmbeddedOAuthAPI;
+import org.eclipse.che.security.oauth.GitLabModule;
 import org.eclipse.che.security.oauth.OAuthAPI;
 import org.eclipse.che.security.oauth.OpenShiftOAuthModule;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesClientConfigFactory;
@@ -284,6 +285,7 @@ protected void configure() {
     install(new FactoryModuleBuilder().build(PassThroughProxyProvisionerFactory.class));
     installDefaultSecureServerExposer(infrastructure);
     install(new org.eclipse.che.security.oauth1.BitbucketModule());
+    install(new GitLabModule());
 
     configureMultiUserMode(persistenceProperties, infrastructure);
 

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties

@@ -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/
@@ -767,3 +767,10 @@ che.integration.gitlab.server_endpoints=NULL
 
 # Address of the GitLab server with configured OAuth 2 integration
 che.integration.gitlab.oauth_endpoint=NULL
+
+# Configuration of GitLab OAuth2 client. Used to obtain Personal access tokens.
+# Location of the file with GitLab client id.
+che.oauth2.gitlab.clientid_filepath=NULL
+
+# Location of the file with GitLab client secret.
+che.oauth2.gitlab.clientsecret_filepath=NULL

assembly/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-assembly-parent</artifactId>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-core</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-dto</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-model</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-h2</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor H2</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-mysql</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor MySQL</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-postgresql</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor PostgreSQL</name>

core/che-core-db/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db</artifactId>
     <name>Che Core :: Commons :: DB</name>

core/che-core-logback/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-logback</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-metrics-core</artifactId>
     <name>Che Core :: Commons :: Metrics :: Core</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-core</artifactId>
     <name>Che Core :: Commons :: Tracing :: Core</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-metrics</artifactId>
     <name>Che Core :: Commons :: Tracing :: Metrics</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-web</artifactId>
     <name>Che Core :: Commons :: Tracing :: Web</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-typescript-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-annotations</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-inject</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-j2ee</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-json</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-lang</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-observability</artifactId>
     <name>Che Core :: Commons :: Tracing and Monitoring wrapper</name>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-schedule</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-test</artifactId>
     <packaging>jar</packaging>

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.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-tracing</artifactId>
     <name>Che Core :: Commons :: Tracing</name>

core/commons/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-core-commons-parent</artifactId>

core/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.che.core</groupId>

dockerfiles/che/rhel.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.5-218
+FROM registry.access.redhat.com/ubi8-minimal:8.5-230
 USER root
 ENV CHE_HOME=/home/user/eclipse-che
 ENV JAVA_HOME=/usr/lib/jvm/jre

infrastructures/infrastructure-distributed/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>infrastructure-distributed</artifactId>
     <packaging>jar</packaging>

infrastructures/infrastructure-factory/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>infrastructure-factory</artifactId>
     <packaging>jar</packaging>

infrastructures/infrastructure-metrics/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>infrastructure-metrics</artifactId>

infrastructures/infrastructure-permission/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
-        <version>7.43.0-SNAPSHOT</version>
+        <version>7.44.0-SNAPSHOT</version>
     </parent>
     <artifactId>infrastructure-permission</artifactId>
     <name>Infrastructure :: Kubernetes Permissions</name>