Update to the upstream.

Author: monaka

assembly/assembly-che-tomcat/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsmaster-war</artifactId>
     <packaging>war</packaging>
@@ -135,10 +135,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-factory-gitlab</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-infraproxy</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-logger</artifactId>

assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java

@@ -44,7 +44,6 @@
 import org.eclipse.che.api.factory.server.github.GithubScmFileResolver;
 import org.eclipse.che.api.factory.server.gitlab.GitlabFactoryParametersResolver;
 import org.eclipse.che.api.factory.server.gitlab.GitlabScmFileResolver;
-import org.eclipse.che.api.infraproxy.server.InfraProxyModule;
 import org.eclipse.che.api.metrics.WsMasterMetricsModule;
 import org.eclipse.che.api.system.server.ServiceTermination;
 import org.eclipse.che.api.system.server.SystemModule;
@@ -420,8 +419,6 @@ private void configureMultiUserMode(
     bind(PermissionChecker.class).to(PermissionCheckerImpl.class);
 
     bindConstant().annotatedWith(Names.named("che.agents.auth_enabled")).to(true);
-
-    install(new InfraProxyModule());
   }
 
   private void configureJwtProxySecureProvisioner(String infrastructure) {

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

@@ -479,20 +479,6 @@ che.infra.kubernetes.pod.security_context.fs_group=NULL
 # the {prod-short} Operator: if `terminationGracePeriodSeconds` have been explicitly set in {orch-name} recipe it will not be overridden.
 che.infra.kubernetes.pod.termination_grace_period_sec=0
 
-# Number of maximum concurrent asynchronous web requests (HTTP requests or ongoing  WebSocket calls) supported in the underlying shared HTTP client of the `KubernetesClient` instances.
-# Default values: `max=64`, and `max_per_host:5`.
-# Default values are not suitable for multi-user scenarios, as {prod-short} keeps open connections, for example for command or ws-agent logs.
-che.infra.kubernetes.client.http.async_requests.max=1000
-
-# Number of maximum concurrent asynchronous web requests per host.
-che.infra.kubernetes.client.http.async_requests.max_per_host=1000
-
-# Max number of idle connections in the connection pool of the Kubernetes-client shared HTTP client.
-che.infra.kubernetes.client.http.connection_pool.max_idle=5
-
-# Keep-alive timeout of the connection pool of the Kubernetes-client shared HTTP client in minutes.
-che.infra.kubernetes.client.http.connection_pool.keep_alive_min=5
-
 # Creates Ingresses with Transport Layer Security (TLS) enabled.
 # In OpenShift infrastructure, Routes will be TLS-enabled.
 che.infra.kubernetes.tls_enabled=false

assembly/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.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.45.0-SNAPSHOT</version>
+        <version>7.46.0-SNAPSHOT</version>
     </parent>
     <artifactId>infrastructure-kubernetes</artifactId>
     <name>Infrastructure :: Kubernetes</name>
@@ -61,18 +61,6 @@
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-persist</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okio</groupId>
-            <artifactId>okio</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>