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

Update to the upstream.

README.md

@@ -2,7 +2,7 @@
 [![Release build Status](https://github.com/eclipse-che/che-theia/actions/workflows/release.yml/badge.svg)]
 
 # 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. 

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>

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>

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>

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>

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>

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.

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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";
 

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>

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>

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>

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>

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>

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>