chore: Remove redundant maven modules

assembly/assembly-wsmaster-war/.deps/prod.md

@@ -179,29 +179,12 @@
 | `org.eclipse.che.multiuser/che-multiuser-api-authentication-commons@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-api-authorization-impl@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-api-authorization@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-api-organization-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-api-organization@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-api-permission-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-api-permission@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-api-resource-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-api-resource@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-api-workspace-activity@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-keycloak-server@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-keycloak-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-keycloak-token-provider@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-keycloak-user-remover@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-machine-authentication-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-machine-authentication@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.che.multiuser/che-multiuser-oidc@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-devfile@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-logger@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-resource@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-system@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-user@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-workspace-activity@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-permission-workspace@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-personal-account@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
-| `org.eclipse.che.multiuser/che-multiuser-sql-schema@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
 | `org.eclipse.persistence/jakarta.persistence@2.2.3` | - | eclipse |
 | `org.eclipse.persistence/org.eclipse.persistence.antlr@2.7.9` | - | eclipse |
 | `org.eclipse.persistence/org.eclipse.persistence.asm@9.1.0` | - | eclipse |

assembly/assembly-wsmaster-war/pom.xml

@@ -251,14 +251,6 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-authorization-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-api-permission</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-keycloak-token-provider</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-machine-authentication</artifactId>
@@ -267,34 +259,6 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-oidc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-devfile</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-logger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-system</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-workspace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-workspace-activity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-personal-account</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-sql-schema</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
@@ -426,7 +390,6 @@
                                 <dep>io.jaegertracing:jaeger-client</dep>
                                 <dep>io.jaegertracing:jaeger-tracerresolver</dep>
                                 <dep>org.eclipse.che.multiuser:che-multiuser-personal-account</dep>
-                                <dep>org.eclipse.che.multiuser:che-multiuser-keycloak-token-provider</dep>
                                 <dep>org.eclipse.persistence:org.eclipse.persistence.extension</dep>
                                 <dep>org.eclipse.persistence:org.eclipse.persistence.jpa</dep>
                                 <dep>org.jgroups.kubernetes:jgroups-kubernetes</dep>

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

@@ -14,7 +14,6 @@
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.inject.matcher.Matchers.subclassesOf;
 import static org.eclipse.che.inject.Matchers.names;
-import static org.eclipse.che.multiuser.api.permission.server.SystemDomain.SYSTEM_DOMAIN_ACTIONS;
 
 import com.auth0.jwk.JwkProvider;
 import com.google.inject.AbstractModule;
@@ -65,6 +64,7 @@
 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.jpa.WorkspaceJpaModule;
 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;
@@ -270,6 +270,7 @@ protected void configure() {
     install(new org.eclipse.che.security.oauth.GitLabModule());
     install(new org.eclipse.che.security.oauth.AzureDevOpsModule());
     install(new org.eclipse.che.security.oauth.GithubModule());
+    install(new WorkspaceJpaModule());
 
     configureMultiUserMode(persistenceProperties, infrastructure);
 
@@ -315,33 +316,6 @@ private void configureMultiUserMode(
 
     bind(KubernetesClientConfigFactory.class).to(KubernetesOidcProviderConfigFactory.class);
 
-    persistenceProperties.put(
-        PersistenceUnitProperties.EXCEPTION_HANDLER_CLASS,
-        "org.eclipse.che.core.db.postgresql.jpa.eclipselink.PostgreSqlExceptionHandler");
-
-    install(
-        new org.eclipse.che.multiuser.permission.workspace.server.WorkspaceApiPermissionsModule());
-    install(
-        new org.eclipse.che.multiuser.permission.workspace.server.jpa
-            .MultiuserWorkspaceJpaModule());
-    install(
-        new org.eclipse.che.multiuser.permission.devfile.server.jpa
-            .MultiuserUserDevfileJpaModule());
-    install(
-        new org.eclipse.che.multiuser.permission.devfile.server.UserDevfileApiPermissionsModule());
-
-    // Permission filters
-    bind(org.eclipse.che.multiuser.permission.system.SystemServicePermissionsFilter.class);
-    bind(org.eclipse.che.multiuser.permission.system.JvmServicePermissionsFilter.class);
-    bind(
-        org.eclipse.che.multiuser.permission.system.SystemEventsSubscriptionPermissionsCheck.class);
-
-    Multibinder<String> binder =
-        Multibinder.newSetBinder(binder(), String.class, Names.named(SYSTEM_DOMAIN_ACTIONS));
-    bind(org.eclipse.che.multiuser.permission.logger.LoggerServicePermissionsFilter.class);
-
-    bind(org.eclipse.che.multiuser.permission.workspace.activity.ActivityPermissionsFilter.class);
-
     bind(RequestTokenExtractor.class).to(HeaderRequestTokenExtractor.class);
     if (isOpenShiftOAuthEnabled()) {
       bind(AuthorizationChecker.class).to(OpenShiftAuthorizationCheckerImpl.class);

infrastructures/infrastructure-permission/pom.xml

@@ -42,10 +42,6 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-permission</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-workspace</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

infrastructures/infrastructure-permission/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.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/
@@ -23,7 +23,6 @@
 import org.eclipse.che.commons.env.EnvironmentContext;
 import org.eclipse.che.commons.subject.Subject;
 import org.eclipse.che.multiuser.api.permission.server.jsonrpc.JsonRpcPermissionsFilterAdapter;
-import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
 import org.eclipse.che.workspace.infrastructure.kubernetes.wsplugins.events.BrokerService;
 
 /**
@@ -56,8 +55,7 @@ public void doAccept(String method, Object... params) throws ForbiddenException
     }
 
     Subject currentSubject = EnvironmentContext.getCurrent().getSubject();
-    if (!currentSubject.hasPermission(
-        WorkspaceDomain.DOMAIN_ID, workspaceId, WorkspaceDomain.RUN)) {
+    if (!currentSubject.hasPermission("workspace", workspaceId, "run")) {
       throw new ForbiddenException(
           "User doesn't have the required permissions to the specified workspace");
     }

infrastructures/infrastructure-permission/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.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/
@@ -23,7 +23,6 @@
 import org.eclipse.che.commons.env.EnvironmentContext;
 import org.eclipse.che.commons.subject.Subject;
 import org.eclipse.che.dto.server.DtoFactory;
-import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
 import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
 import org.testng.annotations.AfterMethod;
@@ -74,8 +73,7 @@ public void shouldRegisterItself() {
           "User doesn't have the required permissions to the specified workspace")
   public void shouldThrowExceptionIfUserDoesNotHaveRunPermission(String method) throws Exception {
     // given
-    when(subject.hasPermission(eq(WorkspaceDomain.DOMAIN_ID), eq("ws123"), eq(WorkspaceDomain.RUN)))
-        .thenReturn(false);
+    when(subject.hasPermission(eq("workspace"), eq("ws123"), eq("run"))).thenReturn(false);
 
     // when
     permissionFilter.doAccept(
@@ -87,8 +85,7 @@ public void shouldThrowExceptionIfUserDoesNotHaveRunPermission(String method) th
   @Test(dataProvider = "coveredMethods")
   public void shouldDoNothingIfUserHasRunPermissions(String method) throws Exception {
     // given
-    when(subject.hasPermission(WorkspaceDomain.DOMAIN_ID, "ws123", WorkspaceDomain.RUN))
-        .thenReturn(true);
+    when(subject.hasPermission("workspace", "ws123", "run")).thenReturn(true);
 
     // when
     permissionFilter.doAccept(

infrastructures/infrastructure-permission/src/test/resources/logback-test.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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/