Merge remote-tracking branch 'origin/main' into revert/remove-develocity

* origin/main:
  chore(deps): bump ch.qos.logback.version from 1.5.25 to 1.5.28 (eclipse-che#955)
  Support the deprecated Azure DevOps oauth apps (eclipse-che#985)
  chore: Add null check to the Bitbucket Server URL parser (eclipse-che#983)
  chore(deps-dev): bump org.apache.maven.plugins:maven-source-plugin (eclipse-che#948)
  chore(deps): bump org.testng:testng from 7.8.0 to 7.12.0 (eclipse-che#950)
  chore: Bump to 7.117.0-SNAPSHOT in main (eclipse-che#984)
  Apply Microsoft Azure OIDC Authentication flow (eclipse-che#968)
  feat: Option to have devspaces operator create namespace instead of p… (eclipse-che#973)
  chore: Remove obsolete code (eclipse-che#972)
  chore: Remove obsolete codebase (eclipse-che#971)
  chore(deps): bump com.sun.mail:jakarta.mail from 2.0.1 to 2.0.2 (eclipse-che#935)
  chore: Update fabric8 kubernetes client maven version (eclipse-che#970)
  feat: enable IPv6 support for factory resolver endpoints (eclipse-che#951)

Author: ribafish

assembly/assembly-che-tomcat/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.116.0-SNAPSHOT</version>
+        <version>7.117.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.116.0-SNAPSHOT</version>
+        <version>7.117.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.116.0-SNAPSHOT</version>
+        <version>7.117.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.116.0-SNAPSHOT</version>
+        <version>7.117.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.116.0-SNAPSHOT</version>
+        <version>7.117.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsmaster-war</artifactId>
     <packaging>war</packaging>
@@ -255,10 +255,6 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-permission</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-api-workspace-activity</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-keycloak-token-provider</artifactId>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2025 Red Hat, Inc.
+ * Copyright (c) 2012-2026 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/
@@ -12,14 +12,11 @@
 package org.eclipse.che.api.deploy;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
 import java.util.Map;
 import org.eclipse.che.api.core.notification.RemoteSubscriptionStorage;
-import org.eclipse.che.api.system.server.ServiceTermination;
 import org.eclipse.che.api.workspace.server.WorkspaceLockService;
 import org.eclipse.che.api.workspace.server.WorkspaceStatusCache;
-import org.eclipse.che.multiuser.api.distributed.JGroupsServiceTermination;
 import org.eclipse.che.multiuser.api.distributed.WorkspaceStopPropagator;
 import org.eclipse.che.multiuser.api.distributed.subscription.DistributedRemoteSubscriptionStorage;
 import org.eclipse.persistence.config.CacheCoordinationProtocol;
@@ -54,10 +51,6 @@ protected void configure() {
     bind(WorkspaceStatusCache.class)
         .to(org.eclipse.che.multiuser.api.distributed.cache.JGroupsWorkspaceStatusCache.class);
 
-    Multibinder.newSetBinder(binder(), ServiceTermination.class)
-        .addBinding()
-        .to(JGroupsServiceTermination.class);
-
     bind(WorkspaceStopPropagator.class).asEagerSingleton();
   }
 }

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

@@ -65,13 +65,10 @@
 import org.eclipse.che.api.workspace.server.WorkspaceEntityProvider;
 import org.eclipse.che.api.workspace.server.devfile.DevfileModule;
 import org.eclipse.che.api.workspace.server.hc.ServersCheckerFactory;
-import org.eclipse.che.api.workspace.server.spi.provision.InternalEnvironmentProvisioner;
-import org.eclipse.che.api.workspace.server.spi.provision.MachineNameProvisioner;
 import org.eclipse.che.api.workspace.server.spi.provision.env.AgentAuthEnableEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
-import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarEnvironmentProvisioner;
 import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.JavaOptsEnvVariableProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.LegacyEnvVarProvider;
@@ -88,7 +85,6 @@
 import org.eclipse.che.multiuser.api.authentication.commons.token.RequestTokenExtractor;
 import org.eclipse.che.multiuser.api.permission.server.PermissionChecker;
 import org.eclipse.che.multiuser.api.permission.server.PermissionCheckerImpl;
-import org.eclipse.che.multiuser.api.workspace.activity.MultiUserWorkspaceActivityModule;
 import org.eclipse.che.multiuser.machine.authentication.server.MachineAuthModule;
 import org.eclipse.che.multiuser.oidc.OIDCInfo;
 import org.eclipse.che.multiuser.oidc.OIDCInfoProvider;
@@ -202,11 +198,6 @@ protected void configure() {
 
     install(new FactoryModuleBuilder().build(ServersCheckerFactory.class));
 
-    Multibinder<InternalEnvironmentProvisioner> internalEnvironmentProvisioners =
-        Multibinder.newSetBinder(binder(), InternalEnvironmentProvisioner.class);
-    internalEnvironmentProvisioners.addBinding().to(EnvVarEnvironmentProvisioner.class);
-    internalEnvironmentProvisioners.addBinding().to(MachineNameProvisioner.class);
-
     Multibinder<EnvVarProvider> envVarProviders =
         Multibinder.newSetBinder(binder(), EnvVarProvider.class);
     envVarProviders.addBinding().to(CheApiEnvVarProvider.class);
@@ -258,9 +249,6 @@ protected void configure() {
     install(new SystemModule());
     Multibinder<ServiceTermination> terminationMultiBinder =
         Multibinder.newSetBinder(binder(), ServiceTermination.class);
-    terminationMultiBinder
-        .addBinding()
-        .to(org.eclipse.che.api.workspace.server.WorkspaceServiceTermination.class);
     terminationMultiBinder
         .addBinding()
         .to(org.eclipse.che.api.system.server.CronThreadPullTermination.class);
@@ -336,7 +324,6 @@ private void configureMultiUserMode(
     install(
         new org.eclipse.che.multiuser.permission.workspace.server.jpa
             .MultiuserWorkspaceJpaModule());
-    install(new MultiUserWorkspaceActivityModule());
     install(
         new org.eclipse.che.multiuser.permission.devfile.server.jpa
             .MultiuserUserDevfileJpaModule());

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

@@ -110,22 +110,27 @@ che.auth.access_denied_error_page=/error-oauth
 che.auth.reserved_user_names=
 
 # Configuration of the Azure DevOps Service OAuth2 client. Used to obtain personal access tokens.
-# Location of the file with Azure DevOps Service Application ID.
+# Location of the file with Microsoft OIDC Directory (tenant) ID.
+che.oauth2.azure.devops.tenantid_filepath=NULL
+
+# Location of the file with Microsoft OIDC Application (client) ID.
 che.oauth2.azure.devops.clientid_filepath=NULL
 
-# Location of the file with Azure DevOps Service Client Secret.
+# Location of the file with Microsoft OIDC Application (client) secret.
 che.oauth2.azure.devops.clientsecret_filepath=NULL
 
 # Azure DevOps Service OAuth2 scopes.
 # Separate multiple values with comma, for example: scope,scope,scope
 # The full list of scopes: https://learn.microsoft.com/en-us/azure/devops/integrate/get-started/authentication/oauth?view=azure-devops#scopes
-che.integration.azure.devops.application_scopes=vso.code_write
+# Entra ID v2.0 requires Azure DevOps App ID URI in the scope, which is 499b84ac-1321-427f-aa17-267ca6975798
+# see https://learn.microsoft.com/en-us/answers/questions/5807316/invalid-scope-error-on-oidc-token-request
+che.integration.azure.devops.application_scopes=499b84ac-1321-427f-aa17-267ca6975798/vso.code_write
 
-# Azure DevOps Service OAuth2 authorization URI.
-che.oauth.azure.devops.authuri=https://app.vssps.visualstudio.com/oauth2/authorize
+# Azure DevOps Service OAuth2 authorization URI template. Tenant-id must be injected.
+che.oauth.azure.devops.authuri.template=https://login.microsoftonline.com/%s/oauth2/v2.0/authorize
 
-# Azure DevOps OAuth Service token URI.
-che.oauth.azure.devops.tokenuri=https://app.vssps.visualstudio.com/oauth2/token
+# Azure DevOps OAuth Service token URI template. Tenant-id must be injected.
+che.oauth.azure.devops.tokenuri.template=https://login.microsoftonline.com/%s/oauth2/v2.0/token
 
 # Azure DevOps Service API server address.
 che.integration.azure.devops.api_endpoint=https://vssps.dev.azure.com

assembly/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.116.0-SNAPSHOT</version>
+        <version>7.117.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.116.0-SNAPSHOT</version>
+        <version>7.117.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-core</artifactId>
     <packaging>jar</packaging>