Skip to content

Commit ebef23d

Browse files
vinokurigvinokurig
authored
chore: Remove redundant maven modules (#993)
1 parent 8598ba3 commit ebef23d

223 files changed

Lines changed: 21 additions & 18957 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,12 @@
179179
| `org.eclipse.che.multiuser/che-multiuser-api-authentication-commons@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
180180
| `org.eclipse.che.multiuser/che-multiuser-api-authorization-impl@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
181181
| `org.eclipse.che.multiuser/che-multiuser-api-authorization@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
182-
| `org.eclipse.che.multiuser/che-multiuser-api-organization-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
183-
| `org.eclipse.che.multiuser/che-multiuser-api-organization@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
184182
| `org.eclipse.che.multiuser/che-multiuser-api-permission-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
185183
| `org.eclipse.che.multiuser/che-multiuser-api-permission@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
186-
| `org.eclipse.che.multiuser/che-multiuser-api-resource-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
187-
| `org.eclipse.che.multiuser/che-multiuser-api-resource@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
188184
| `org.eclipse.che.multiuser/che-multiuser-api-workspace-activity@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
189-
| `org.eclipse.che.multiuser/che-multiuser-keycloak-server@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
190-
| `org.eclipse.che.multiuser/che-multiuser-keycloak-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
191-
| `org.eclipse.che.multiuser/che-multiuser-keycloak-token-provider@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
192-
| `org.eclipse.che.multiuser/che-multiuser-keycloak-user-remover@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
193185
| `org.eclipse.che.multiuser/che-multiuser-machine-authentication-shared@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
194186
| `org.eclipse.che.multiuser/che-multiuser-machine-authentication@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
195187
| `org.eclipse.che.multiuser/che-multiuser-oidc@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
196-
| `org.eclipse.che.multiuser/che-multiuser-permission-devfile@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
197-
| `org.eclipse.che.multiuser/che-multiuser-permission-logger@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
198-
| `org.eclipse.che.multiuser/che-multiuser-permission-resource@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
199-
| `org.eclipse.che.multiuser/che-multiuser-permission-system@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
200-
| `org.eclipse.che.multiuser/che-multiuser-permission-user@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
201-
| `org.eclipse.che.multiuser/che-multiuser-permission-workspace-activity@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
202-
| `org.eclipse.che.multiuser/che-multiuser-permission-workspace@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
203-
| `org.eclipse.che.multiuser/che-multiuser-personal-account@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
204-
| `org.eclipse.che.multiuser/che-multiuser-sql-schema@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che |
205188
| `org.eclipse.persistence/jakarta.persistence@2.2.3` | - | eclipse |
206189
| `org.eclipse.persistence/org.eclipse.persistence.antlr@2.7.9` | - | eclipse |
207190
| `org.eclipse.persistence/org.eclipse.persistence.asm@9.1.0` | - | eclipse |

‎assembly/assembly-wsmaster-war/pom.xml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,6 @@
251251
<groupId>org.eclipse.che.multiuser</groupId>
252252
<artifactId>che-multiuser-api-authorization-impl</artifactId>
253253
</dependency>
254-
<dependency>
255-
<groupId>org.eclipse.che.multiuser</groupId>
256-
<artifactId>che-multiuser-api-permission</artifactId>
257-
</dependency>
258-
<dependency>
259-
<groupId>org.eclipse.che.multiuser</groupId>
260-
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
261-
</dependency>
262254
<dependency>
263255
<groupId>org.eclipse.che.multiuser</groupId>
264256
<artifactId>che-multiuser-machine-authentication</artifactId>
@@ -267,34 +259,6 @@
267259
<groupId>org.eclipse.che.multiuser</groupId>
268260
<artifactId>che-multiuser-oidc</artifactId>
269261
</dependency>
270-
<dependency>
271-
<groupId>org.eclipse.che.multiuser</groupId>
272-
<artifactId>che-multiuser-permission-devfile</artifactId>
273-
</dependency>
274-
<dependency>
275-
<groupId>org.eclipse.che.multiuser</groupId>
276-
<artifactId>che-multiuser-permission-logger</artifactId>
277-
</dependency>
278-
<dependency>
279-
<groupId>org.eclipse.che.multiuser</groupId>
280-
<artifactId>che-multiuser-permission-system</artifactId>
281-
</dependency>
282-
<dependency>
283-
<groupId>org.eclipse.che.multiuser</groupId>
284-
<artifactId>che-multiuser-permission-workspace</artifactId>
285-
</dependency>
286-
<dependency>
287-
<groupId>org.eclipse.che.multiuser</groupId>
288-
<artifactId>che-multiuser-permission-workspace-activity</artifactId>
289-
</dependency>
290-
<dependency>
291-
<groupId>org.eclipse.che.multiuser</groupId>
292-
<artifactId>che-multiuser-personal-account</artifactId>
293-
</dependency>
294-
<dependency>
295-
<groupId>org.eclipse.che.multiuser</groupId>
296-
<artifactId>che-multiuser-sql-schema</artifactId>
297-
</dependency>
298262
<dependency>
299263
<groupId>org.eclipse.persistence</groupId>
300264
<artifactId>org.eclipse.persistence.core</artifactId>
@@ -426,7 +390,6 @@
426390
<dep>io.jaegertracing:jaeger-client</dep>
427391
<dep>io.jaegertracing:jaeger-tracerresolver</dep>
428392
<dep>org.eclipse.che.multiuser:che-multiuser-personal-account</dep>
429-
<dep>org.eclipse.che.multiuser:che-multiuser-keycloak-token-provider</dep>
430393
<dep>org.eclipse.persistence:org.eclipse.persistence.extension</dep>
431394
<dep>org.eclipse.persistence:org.eclipse.persistence.jpa</dep>
432395
<dep>org.jgroups.kubernetes:jgroups-kubernetes</dep>

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

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import static com.google.common.base.Strings.isNullOrEmpty;
1515
import static com.google.inject.matcher.Matchers.subclassesOf;
1616
import static org.eclipse.che.inject.Matchers.names;
17-
import static org.eclipse.che.multiuser.api.permission.server.SystemDomain.SYSTEM_DOMAIN_ACTIONS;
1817

1918
import com.auth0.jwk.JwkProvider;
2019
import com.google.inject.AbstractModule;
@@ -65,6 +64,7 @@
6564
import org.eclipse.che.api.workspace.server.WorkspaceEntityProvider;
6665
import org.eclipse.che.api.workspace.server.devfile.DevfileModule;
6766
import org.eclipse.che.api.workspace.server.hc.ServersCheckerFactory;
67+
import org.eclipse.che.api.workspace.server.jpa.WorkspaceJpaModule;
6868
import org.eclipse.che.api.workspace.server.spi.provision.env.AgentAuthEnableEnvVarProvider;
6969
import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
7070
import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
@@ -270,6 +270,7 @@ protected void configure() {
270270
install(new org.eclipse.che.security.oauth.GitLabModule());
271271
install(new org.eclipse.che.security.oauth.AzureDevOpsModule());
272272
install(new org.eclipse.che.security.oauth.GithubModule());
273+
install(new WorkspaceJpaModule());
273274

274275
configureMultiUserMode(persistenceProperties, infrastructure);
275276

@@ -315,33 +316,6 @@ private void configureMultiUserMode(
315316

316317
bind(KubernetesClientConfigFactory.class).to(KubernetesOidcProviderConfigFactory.class);
317318

318-
persistenceProperties.put(
319-
PersistenceUnitProperties.EXCEPTION_HANDLER_CLASS,
320-
"org.eclipse.che.core.db.postgresql.jpa.eclipselink.PostgreSqlExceptionHandler");
321-
322-
install(
323-
new org.eclipse.che.multiuser.permission.workspace.server.WorkspaceApiPermissionsModule());
324-
install(
325-
new org.eclipse.che.multiuser.permission.workspace.server.jpa
326-
.MultiuserWorkspaceJpaModule());
327-
install(
328-
new org.eclipse.che.multiuser.permission.devfile.server.jpa
329-
.MultiuserUserDevfileJpaModule());
330-
install(
331-
new org.eclipse.che.multiuser.permission.devfile.server.UserDevfileApiPermissionsModule());
332-
333-
// Permission filters
334-
bind(org.eclipse.che.multiuser.permission.system.SystemServicePermissionsFilter.class);
335-
bind(org.eclipse.che.multiuser.permission.system.JvmServicePermissionsFilter.class);
336-
bind(
337-
org.eclipse.che.multiuser.permission.system.SystemEventsSubscriptionPermissionsCheck.class);
338-
339-
Multibinder<String> binder =
340-
Multibinder.newSetBinder(binder(), String.class, Names.named(SYSTEM_DOMAIN_ACTIONS));
341-
bind(org.eclipse.che.multiuser.permission.logger.LoggerServicePermissionsFilter.class);
342-
343-
bind(org.eclipse.che.multiuser.permission.workspace.activity.ActivityPermissionsFilter.class);
344-
345319
bind(RequestTokenExtractor.class).to(HeaderRequestTokenExtractor.class);
346320
if (isOpenShiftOAuthEnabled()) {
347321
bind(AuthorizationChecker.class).to(OpenShiftAuthorizationCheckerImpl.class);

‎infrastructures/infrastructure-permission/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242
<groupId>org.eclipse.che.multiuser</groupId>
4343
<artifactId>che-multiuser-api-permission</artifactId>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.eclipse.che.multiuser</groupId>
47-
<artifactId>che-multiuser-permission-workspace</artifactId>
48-
</dependency>
4945
<dependency>
5046
<groupId>ch.qos.logback</groupId>
5147
<artifactId>logback-classic</artifactId>

‎infrastructures/infrastructure-permission/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2025 Red Hat, Inc.
2+
* Copyright (c) 2012-2026 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,7 +23,6 @@
2323
import org.eclipse.che.commons.env.EnvironmentContext;
2424
import org.eclipse.che.commons.subject.Subject;
2525
import org.eclipse.che.multiuser.api.permission.server.jsonrpc.JsonRpcPermissionsFilterAdapter;
26-
import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
2726
import org.eclipse.che.workspace.infrastructure.kubernetes.wsplugins.events.BrokerService;
2827

2928
/**
@@ -56,8 +55,7 @@ public void doAccept(String method, Object... params) throws ForbiddenException
5655
}
5756

5857
Subject currentSubject = EnvironmentContext.getCurrent().getSubject();
59-
if (!currentSubject.hasPermission(
60-
WorkspaceDomain.DOMAIN_ID, workspaceId, WorkspaceDomain.RUN)) {
58+
if (!currentSubject.hasPermission("workspace", workspaceId, "run")) {
6159
throw new ForbiddenException(
6260
"User doesn't have the required permissions to the specified workspace");
6361
}

‎infrastructures/infrastructure-permission/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2025 Red Hat, Inc.
2+
* Copyright (c) 2012-2026 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,7 +23,6 @@
2323
import org.eclipse.che.commons.env.EnvironmentContext;
2424
import org.eclipse.che.commons.subject.Subject;
2525
import org.eclipse.che.dto.server.DtoFactory;
26-
import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
2726
import org.mockito.Mock;
2827
import org.mockito.testng.MockitoTestNGListener;
2928
import org.testng.annotations.AfterMethod;
@@ -74,8 +73,7 @@ public void shouldRegisterItself() {
7473
"User doesn't have the required permissions to the specified workspace")
7574
public void shouldThrowExceptionIfUserDoesNotHaveRunPermission(String method) throws Exception {
7675
// given
77-
when(subject.hasPermission(eq(WorkspaceDomain.DOMAIN_ID), eq("ws123"), eq(WorkspaceDomain.RUN)))
78-
.thenReturn(false);
76+
when(subject.hasPermission(eq("workspace"), eq("ws123"), eq("run"))).thenReturn(false);
7977

8078
// when
8179
permissionFilter.doAccept(
@@ -87,8 +85,7 @@ public void shouldThrowExceptionIfUserDoesNotHaveRunPermission(String method) th
8785
@Test(dataProvider = "coveredMethods")
8886
public void shouldDoNothingIfUserHasRunPermissions(String method) throws Exception {
8987
// given
90-
when(subject.hasPermission(WorkspaceDomain.DOMAIN_ID, "ws123", WorkspaceDomain.RUN))
91-
.thenReturn(true);
88+
when(subject.hasPermission("workspace", "ws123", "run")).thenReturn(true);
9289

9390
// when
9491
permissionFilter.doAccept(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2012-2025 Red Hat, Inc.
4+
Copyright (c) 2012-2026 Red Hat, Inc.
55
This program and the accompanying materials are made
66
available under the terms of the Eclipse Public License 2.0
77
which is available at https://www.eclipse.org/legal/epl-2.0/

‎multiuser/api/che-multiuser-api-organization-shared/pom.xml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎multiuser/api/che-multiuser-api-organization-shared/src/main/java/org/eclipse/che/multiuser/organization/shared/Constants.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎multiuser/api/che-multiuser-api-organization-shared/src/main/java/org/eclipse/che/multiuser/organization/shared/dto/MemberAddedEventDto.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)