From 93ba5ef2f36a52206e8bb7bc7e8827a75de1022d Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Wed, 6 May 2020 14:54:38 +0200 Subject: [PATCH] Rebalancing maven module execution order (#16497) Signed-off-by: Sergii Kabashniuk --- assembly/assembly-che-tomcat8/pom.xml | 2 +- assembly/assembly-dashboard-war/pom.xml | 2 +- assembly/assembly-main/pom.xml | 2 +- assembly/assembly-root-war/pom.xml | 6 +-- assembly/assembly-swagger-war/pom.xml | 2 +- .../assembly-workspace-loader-war/pom.xml | 2 +- assembly/assembly-wsmaster-war/pom.xml | 26 +++++------ core/che-core-api-core/pom.xml | 3 +- core/che-core-api-dto-maven-plugin/pom.xml | 2 +- core/che-core-api-dto/pom.xml | 2 +- core/che-core-api-model/pom.xml | 2 +- core/che-core-db-vendor-h2/pom.xml | 2 +- core/che-core-db-vendor-mysql/pom.xml | 2 +- core/che-core-db-vendor-postgresql/pom.xml | 2 +- core/che-core-db/pom.xml | 2 +- .../pom.xml | 6 +-- ...nvironmentVariablesLogLevelPropagator.java | 0 .../filter/IdentityIdLoggerFilter.java | 0 .../logback/filter/RequestIdLoggerFilter.java | 0 core/che-core-metrics-core/pom.xml | 2 +- core/che-core-tracing-core/pom.xml | 2 +- core/che-core-tracing-metrics/pom.xml | 2 +- core/che-core-tracing-web/pom.xml | 2 +- .../pom.xml | 2 +- core/commons/pom.xml | 1 - core/pom.xml | 1 + .../infrastructure-distributed}/pom.xml | 8 ++-- .../JGroupsServiceTermination.java | 0 .../distributed/WorkspaceStopPropagator.java | 0 .../cache/JGroupsWorkspaceStatusCache.java | 0 .../ReplicatedMapNotificationAdapter.java | 0 .../cache/StatusChangeListener.java | 0 .../lock/JGroupsWorkspaceLockService.java | 0 .../DistributedRemoteSubscriptionStorage.java | 0 .../src/test/resources/logback-test.xml | 0 .../infrastructure-permission}/pom.xml | 8 ++-- .../BrokerServicePermissionFilter.java | 0 .../BrokerServicePermissionFilterTest.java | 0 .../src/test/resources/logback-test.xml | 0 infrastructures/kubernetes/pom.xml | 1 - infrastructures/openshift/pom.xml | 1 - infrastructures/pom.xml | 4 +- multiuser/api/pom.xml | 1 - .../che-multiuser-keycloak-server/pom.xml | 2 +- multiuser/permission/pom.xml | 1 - pom.xml | 31 +++++++------ wsmaster/che-core-api-factory/pom.xml | 46 +++++++------------ .../che-core-api-workspace-activity/pom.xml | 12 +---- wsmaster/pom.xml | 3 +- 49 files changed, 84 insertions(+), 111 deletions(-) rename core/{commons/che-core-commons-logback => che-core-logback}/pom.xml (91%) rename core/{commons/che-core-commons-logback => che-core-logback}/src/main/java/org/eclipse/che/commons/logback/EnvironmentVariablesLogLevelPropagator.java (100%) rename core/{commons/che-core-commons-logback => che-core-logback}/src/main/java/org/eclipse/che/commons/logback/filter/IdentityIdLoggerFilter.java (100%) rename core/{commons/che-core-commons-logback => che-core-logback}/src/main/java/org/eclipse/che/commons/logback/filter/RequestIdLoggerFilter.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/pom.xml (91%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/JGroupsServiceTermination.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/WorkspaceStopPropagator.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/ReplicatedMapNotificationAdapter.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/StatusChangeListener.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/lock/JGroupsWorkspaceLockService.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/main/java/org/eclipse/che/multiuser/api/distributed/subscription/DistributedRemoteSubscriptionStorage.java (100%) rename {multiuser/api/che-multiuser-api-jgroups => infrastructures/infrastructure-distributed}/src/test/resources/logback-test.xml (100%) rename {multiuser/permission/che-multiuser-permission-infra-kubernetes => infrastructures/infrastructure-permission}/pom.xml (90%) rename {multiuser/permission/che-multiuser-permission-infra-kubernetes => infrastructures/infrastructure-permission}/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java (100%) rename {multiuser/permission/che-multiuser-permission-infra-kubernetes => infrastructures/infrastructure-permission}/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java (100%) rename {multiuser/permission/che-multiuser-permission-infra-kubernetes => infrastructures/infrastructure-permission}/src/test/resources/logback-test.xml (100%) diff --git a/assembly/assembly-che-tomcat8/pom.xml b/assembly/assembly-che-tomcat8/pom.xml index 3a080120926..12aeb4e825c 100644 --- a/assembly/assembly-che-tomcat8/pom.xml +++ b/assembly/assembly-che-tomcat8/pom.xml @@ -21,7 +21,7 @@ assembly-che-tomcat8 jar - Che IDE :: Assemblies Che Tomcat8 + Che Assembly :: Assemblies Che Tomcat8 assembly-che-tomcat8 diff --git a/assembly/assembly-dashboard-war/pom.xml b/assembly/assembly-dashboard-war/pom.xml index 08eba9a95ab..b3cf3cc5428 100644 --- a/assembly/assembly-dashboard-war/pom.xml +++ b/assembly/assembly-dashboard-war/pom.xml @@ -21,7 +21,7 @@ assembly-dashboard-war war - Che IDE :: Dashboard Packaging + Che Assembly :: Dashboard war Packages Dashboard application as a Java web app 2018 diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml index 9bb66ceb942..d021ce2a8ec 100644 --- a/assembly/assembly-main/pom.xml +++ b/assembly/assembly-main/pom.xml @@ -21,7 +21,7 @@ assembly-main pom - Che IDE :: Assemblies Tomcat + Che Assembly :: Assemblies Che Server Tomcat org.eclipse.che diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml index a913674f7be..23e2456a3bd 100644 --- a/assembly/assembly-root-war/pom.xml +++ b/assembly/assembly-root-war/pom.xml @@ -21,7 +21,7 @@ assembly-root-war war - Che IDE :: War Packaging + Che Assembly :: Root war Packages Che root web app UTF-8 @@ -53,7 +53,7 @@ org.eclipse.che.core - che-core-commons-logback + che-core-logback che-core-api-core @@ -105,7 +105,7 @@ net.logstash.logback:logstash-logback-encoder ch.qos.logback:logback-classic org.eclipse.che.core:che-core-commons-j2ee - org.eclipse.che.core:che-core-commons-logback + org.eclipse.che.core:che-core-logback diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml index 2e9a41468ff..b0ace8c66e0 100644 --- a/assembly/assembly-swagger-war/pom.xml +++ b/assembly/assembly-swagger-war/pom.xml @@ -21,7 +21,7 @@ assembly-swagger-war war - Che IDE :: Assemblies Swagger WAR + Che Assembly :: Swagger war che-swagger-ui diff --git a/assembly/assembly-workspace-loader-war/pom.xml b/assembly/assembly-workspace-loader-war/pom.xml index 06420ec2fc4..8ff7673cad8 100644 --- a/assembly/assembly-workspace-loader-war/pom.xml +++ b/assembly/assembly-workspace-loader-war/pom.xml @@ -21,7 +21,7 @@ assembly-workspace-loader-war war - Che Workspace Loader :: War Packaging + Che Assembly :: Workspace Loader war Packages Che Workspace Loader application as a Java web app 2018 diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 3fdd363c5d2..fec71e7500f 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -21,7 +21,7 @@ assembly-wsmaster-war war - Che IDE :: Compiling WS Master WAR + Che Assembly :: WS Master war ${project.build.directory}/generated-sources/gen UTF-8 @@ -171,10 +171,6 @@ org.eclipse.che.core che-core-commons-lang - - org.eclipse.che.core - che-core-commons-logback - org.eclipse.che.core che-core-commons-mail @@ -203,6 +199,10 @@ org.eclipse.che.core che-core-db-vendor-postgresql + + org.eclipse.che.core + che-core-logback + org.eclipse.che.core che-core-metrics-core @@ -227,6 +227,10 @@ org.eclipse.che.core wsmaster-local + + org.eclipse.che.infrastructure + infrastructure-distributed + org.eclipse.che.infrastructure infrastructure-kubernetes @@ -239,6 +243,10 @@ org.eclipse.che.infrastructure infrastructure-openshift + + org.eclipse.che.infrastructure + infrastructure-permission + org.eclipse.che.multiuser che-multiuser-api-authentication-commons @@ -251,10 +259,6 @@ org.eclipse.che.multiuser che-multiuser-api-authorization-impl - - org.eclipse.che.multiuser - che-multiuser-api-jgroups - org.eclipse.che.multiuser che-multiuser-api-organization @@ -291,10 +295,6 @@ org.eclipse.che.multiuser che-multiuser-permission-factory - - org.eclipse.che.multiuser - che-multiuser-permission-infra-kubernetes - org.eclipse.che.multiuser che-multiuser-permission-logger diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index d0896788b06..a0b3c6e7cc7 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -21,7 +21,7 @@ che-core-api-core jar - Che Core :: API :: Core + Che Core :: Commons :: API :: Core ${project.build.directory}/generated-sources/dto/ false @@ -317,7 +317,6 @@ - diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml index d9eeb5fb290..19239be3b14 100644 --- a/core/che-core-api-dto-maven-plugin/pom.xml +++ b/core/che-core-api-dto-maven-plugin/pom.xml @@ -21,7 +21,7 @@ che-core-api-dto-maven-plugin maven-plugin - Che Core :: API :: DTO Maven Plugin + Che Core :: Commons :: API :: DTO Maven Plugin false diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml index 40456ac606a..ad61fe3deef 100644 --- a/core/che-core-api-dto/pom.xml +++ b/core/che-core-api-dto/pom.xml @@ -21,7 +21,7 @@ che-core-api-dto jar - Che Core :: API :: DTO + Che Core :: Commons :: API :: DTO false ${project.build.directory}/generated-test-sources/gen diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml index fb23057fd6c..441d86abbbd 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -21,7 +21,7 @@ che-core-api-model jar - Che Core :: API :: Model + Che Core :: Commons :: API :: Model com.google.guava diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml index 86dcc2ab92a..abaf8191e09 100644 --- a/core/che-core-db-vendor-h2/pom.xml +++ b/core/che-core-db-vendor-h2/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-db-vendor-h2 - Che Core :: DB :: Vendor H2 + Che Core :: Commons :: DB :: Vendor H2 com.google.guava diff --git a/core/che-core-db-vendor-mysql/pom.xml b/core/che-core-db-vendor-mysql/pom.xml index 82eb69cc835..e557ab3fdb2 100644 --- a/core/che-core-db-vendor-mysql/pom.xml +++ b/core/che-core-db-vendor-mysql/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-db-vendor-mysql - Che Core :: DB :: Vendor MySQL + Che Core :: Commons :: DB :: Vendor MySQL org.eclipse.che.core diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml index 1360ea9b53e..4a9d3463681 100644 --- a/core/che-core-db-vendor-postgresql/pom.xml +++ b/core/che-core-db-vendor-postgresql/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-db-vendor-postgresql - Che Core :: DB :: Vendor PostgreSQL + Che Core :: Commons :: DB :: Vendor PostgreSQL com.google.guava diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml index dccc2dd98a2..48b329449e4 100644 --- a/core/che-core-db/pom.xml +++ b/core/che-core-db/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-db - Che Core :: DB + Che Core :: Commons :: DB com.google.guava diff --git a/core/commons/che-core-commons-logback/pom.xml b/core/che-core-logback/pom.xml similarity index 91% rename from core/commons/che-core-commons-logback/pom.xml rename to core/che-core-logback/pom.xml index 6527b4d97a2..926ee1ed040 100644 --- a/core/commons/che-core-commons-logback/pom.xml +++ b/core/che-core-logback/pom.xml @@ -15,13 +15,13 @@ 4.0.0 - che-core-commons-parent + che-core-parent org.eclipse.che.core 7.13.0-SNAPSHOT - che-core-commons-logback + che-core-logback jar - Che Core :: Commons :: Commons Logback + Che Core :: Commons :: Logback ch.qos.logback diff --git a/core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/EnvironmentVariablesLogLevelPropagator.java b/core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/EnvironmentVariablesLogLevelPropagator.java similarity index 100% rename from core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/EnvironmentVariablesLogLevelPropagator.java rename to core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/EnvironmentVariablesLogLevelPropagator.java diff --git a/core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/filter/IdentityIdLoggerFilter.java b/core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/filter/IdentityIdLoggerFilter.java similarity index 100% rename from core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/filter/IdentityIdLoggerFilter.java rename to core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/filter/IdentityIdLoggerFilter.java diff --git a/core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/filter/RequestIdLoggerFilter.java b/core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/filter/RequestIdLoggerFilter.java similarity index 100% rename from core/commons/che-core-commons-logback/src/main/java/org/eclipse/che/commons/logback/filter/RequestIdLoggerFilter.java rename to core/che-core-logback/src/main/java/org/eclipse/che/commons/logback/filter/RequestIdLoggerFilter.java diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml index 30e0f1952d3..5ecb9c3dca7 100644 --- a/core/che-core-metrics-core/pom.xml +++ b/core/che-core-metrics-core/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-metrics-core - Che Core :: Metrics :: Core + Che Core :: Commons :: Metrics :: Core com.google.guava diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml index 1b381aa6027..dd187cb4036 100644 --- a/core/che-core-tracing-core/pom.xml +++ b/core/che-core-tracing-core/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-tracing-core - Che Core :: Tracing :: Core + Che Core :: Commons :: Tracing :: Core aopalliance diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml index e95f940d2ee..4de9db8f780 100644 --- a/core/che-core-tracing-metrics/pom.xml +++ b/core/che-core-tracing-metrics/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-tracing-metrics - Che Core :: Tracing :: Metrics + Che Core :: Commons :: Tracing :: Metrics com.google.inject diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml index 14a0538efb1..c883e3e5362 100644 --- a/core/che-core-tracing-web/pom.xml +++ b/core/che-core-tracing-web/pom.xml @@ -20,7 +20,7 @@ 7.13.0-SNAPSHOT che-core-tracing-web - Che Core :: Tracing :: Web + Che Core :: Commons :: Tracing :: Web com.google.guava diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml index 905e736206c..6ce50ab664d 100644 --- a/core/che-core-typescript-dto-maven-plugin/pom.xml +++ b/core/che-core-typescript-dto-maven-plugin/pom.xml @@ -21,7 +21,7 @@ che-core-typescript-dto-maven-plugin maven-plugin - Che Core :: API :: TypeScript DTO maven plugin + Che Core :: Commons :: API :: TypeScript DTO maven plugin com.google.code.gson diff --git a/core/commons/pom.xml b/core/commons/pom.xml index 33756e82a4b..527da0b9888 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -26,7 +26,6 @@ che-core-commons-annotations che-core-commons-lang - che-core-commons-logback che-core-commons-inject che-core-commons-json che-core-commons-xml diff --git a/core/pom.xml b/core/pom.xml index 129aca38bd1..19ce8734ff7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,6 +35,7 @@ che-core-db-vendor-h2 che-core-db-vendor-mysql che-core-db-vendor-postgresql + che-core-logback che-core-tracing-core che-core-tracing-web che-core-metrics-core diff --git a/multiuser/api/che-multiuser-api-jgroups/pom.xml b/infrastructures/infrastructure-distributed/pom.xml similarity index 91% rename from multiuser/api/che-multiuser-api-jgroups/pom.xml rename to infrastructures/infrastructure-distributed/pom.xml index 4ee8bffe423..c79104f2331 100644 --- a/multiuser/api/che-multiuser-api-jgroups/pom.xml +++ b/infrastructures/infrastructure-distributed/pom.xml @@ -15,13 +15,13 @@ 4.0.0 - che-multiuser-api - org.eclipse.che.multiuser + che-infrastructures-parent + org.eclipse.che.infrastructure 7.13.0-SNAPSHOT - che-multiuser-api-jgroups + infrastructure-distributed jar - Che Multiuser :: JGroups API Implementation + Infrastructure :: Distributed components com.google.guava diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/JGroupsServiceTermination.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/JGroupsServiceTermination.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/JGroupsServiceTermination.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/JGroupsServiceTermination.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/WorkspaceStopPropagator.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/WorkspaceStopPropagator.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/WorkspaceStopPropagator.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/WorkspaceStopPropagator.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/ReplicatedMapNotificationAdapter.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/ReplicatedMapNotificationAdapter.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/ReplicatedMapNotificationAdapter.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/ReplicatedMapNotificationAdapter.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/StatusChangeListener.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/StatusChangeListener.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/StatusChangeListener.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/cache/StatusChangeListener.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/lock/JGroupsWorkspaceLockService.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/lock/JGroupsWorkspaceLockService.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/lock/JGroupsWorkspaceLockService.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/lock/JGroupsWorkspaceLockService.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/subscription/DistributedRemoteSubscriptionStorage.java b/infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/subscription/DistributedRemoteSubscriptionStorage.java similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/main/java/org/eclipse/che/multiuser/api/distributed/subscription/DistributedRemoteSubscriptionStorage.java rename to infrastructures/infrastructure-distributed/src/main/java/org/eclipse/che/multiuser/api/distributed/subscription/DistributedRemoteSubscriptionStorage.java diff --git a/multiuser/api/che-multiuser-api-jgroups/src/test/resources/logback-test.xml b/infrastructures/infrastructure-distributed/src/test/resources/logback-test.xml similarity index 100% rename from multiuser/api/che-multiuser-api-jgroups/src/test/resources/logback-test.xml rename to infrastructures/infrastructure-distributed/src/test/resources/logback-test.xml diff --git a/multiuser/permission/che-multiuser-permission-infra-kubernetes/pom.xml b/infrastructures/infrastructure-permission/pom.xml similarity index 90% rename from multiuser/permission/che-multiuser-permission-infra-kubernetes/pom.xml rename to infrastructures/infrastructure-permission/pom.xml index 4af1303f9bc..b89f6b2656b 100644 --- a/multiuser/permission/che-multiuser-permission-infra-kubernetes/pom.xml +++ b/infrastructures/infrastructure-permission/pom.xml @@ -15,12 +15,12 @@ 4.0.0 - che-multiuser-permission - org.eclipse.che.multiuser + che-infrastructures-parent + org.eclipse.che.infrastructure 7.13.0-SNAPSHOT - che-multiuser-permission-infra-kubernetes - Che Multiuser :: Kubernetes Infrastructure Permissions + infrastructure-permission + Infrastructure :: Kubernetes Permissions javax.inject diff --git a/multiuser/permission/che-multiuser-permission-infra-kubernetes/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java b/infrastructures/infrastructure-permission/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java similarity index 100% rename from multiuser/permission/che-multiuser-permission-infra-kubernetes/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java rename to infrastructures/infrastructure-permission/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java diff --git a/multiuser/permission/che-multiuser-permission-infra-kubernetes/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java b/infrastructures/infrastructure-permission/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java similarity index 100% rename from multiuser/permission/che-multiuser-permission-infra-kubernetes/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java rename to infrastructures/infrastructure-permission/src/test/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilterTest.java diff --git a/multiuser/permission/che-multiuser-permission-infra-kubernetes/src/test/resources/logback-test.xml b/infrastructures/infrastructure-permission/src/test/resources/logback-test.xml similarity index 100% rename from multiuser/permission/che-multiuser-permission-infra-kubernetes/src/test/resources/logback-test.xml rename to infrastructures/infrastructure-permission/src/test/resources/logback-test.xml diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml index 6cf578e92dd..5c70705fa7a 100644 --- a/infrastructures/kubernetes/pom.xml +++ b/infrastructures/kubernetes/pom.xml @@ -18,7 +18,6 @@ che-infrastructures-parent org.eclipse.che.infrastructure 7.13.0-SNAPSHOT - ../pom.xml infrastructure-kubernetes Infrastructure :: Kubernetes diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml index 58479e52927..e7d46ae95c3 100644 --- a/infrastructures/openshift/pom.xml +++ b/infrastructures/openshift/pom.xml @@ -18,7 +18,6 @@ che-infrastructures-parent org.eclipse.che.infrastructure 7.13.0-SNAPSHOT - ../pom.xml infrastructure-openshift Infrastructure :: OpenShift diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml index 5dfacf7494f..7b69e20791f 100644 --- a/infrastructures/pom.xml +++ b/infrastructures/pom.xml @@ -23,10 +23,12 @@ org.eclipse.che.infrastructure che-infrastructures-parent pom - Che Infrastructures Parent + Infrastructure :: Infrastructures Parent openshift kubernetes infrastructure-metrics + infrastructure-distributed + infrastructure-permission diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml index 59043299152..30a62c47412 100644 --- a/multiuser/api/pom.xml +++ b/multiuser/api/pom.xml @@ -33,7 +33,6 @@ che-multiuser-api-resource che-multiuser-api-organization-shared che-multiuser-api-organization - che-multiuser-api-jgroups che-multiuser-api-workspace-activity diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml index 93642bf6068..40f019fb592 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml @@ -116,7 +116,7 @@ org.eclipse.che.core - che-core-commons-logback + che-core-logback org.eclipse.che.multiuser diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml index df5aa9cde45..fd8622d3b56 100644 --- a/multiuser/permission/pom.xml +++ b/multiuser/permission/pom.xml @@ -32,6 +32,5 @@ che-multiuser-permission-system che-multiuser-permission-resource che-multiuser-permission-logger - che-multiuser-permission-infra-kubernetes diff --git a/pom.xml b/pom.xml index 6eed4d04ca1..d1782cabe65 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ wsmaster multiuser infrastructures + wsmaster/integration-tests assembly tests/legacy-e2e @@ -882,11 +883,6 @@ che-core-commons-lang ${che.version} - - org.eclipse.che.core - che-core-commons-logback - ${che.version} - org.eclipse.che.core che-core-commons-mail @@ -932,6 +928,11 @@ che-core-db-vendor-postgresql ${che.version} + + org.eclipse.che.core + che-core-logback + ${che.version} + org.eclipse.che.core che-core-metrics-core @@ -973,6 +974,11 @@ ${che.dashboard.version} war + + org.eclipse.che.infrastructure + infrastructure-distributed + ${che.version} + org.eclipse.che.infrastructure infrastructure-kubernetes @@ -995,23 +1001,23 @@ ${che.version} - org.eclipse.che.multiuser - che-multiuser-api-authentication-commons + org.eclipse.che.infrastructure + infrastructure-permission ${che.version} org.eclipse.che.multiuser - che-multiuser-api-authorization + che-multiuser-api-authentication-commons ${che.version} org.eclipse.che.multiuser - che-multiuser-api-authorization-impl + che-multiuser-api-authorization ${che.version} org.eclipse.che.multiuser - che-multiuser-api-jgroups + che-multiuser-api-authorization-impl ${che.version} @@ -1108,11 +1114,6 @@ che-multiuser-permission-factory ${che.version} - - org.eclipse.che.multiuser - che-multiuser-permission-infra-kubernetes - ${che.version} - org.eclipse.che.multiuser che-multiuser-permission-logger diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml index 42f732f5c6a..3afdbeb85aa 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -34,6 +34,10 @@ com.google.inject guice + + com.google.inject.extensions + guice-persist + io.swagger swagger-annotations @@ -50,6 +54,10 @@ javax.validation validation-api + + javax.ws.rs + javax.ws.rs-api + org.eclipse.che.core che-core-api-core @@ -86,33 +94,21 @@ org.eclipse.che.core che-core-commons-test - - org.slf4j - slf4j-api - - - com.google.inject.extensions - guice-persist - provided - - - javax.servlet - javax.servlet-api - provided - - - javax.ws.rs - javax.ws.rs-api - provided - org.eclipse.che.core che-core-db - provided org.eclipse.persistence javax.persistence + + + org.slf4j + slf4j-api + + + javax.servlet + javax.servlet-api provided @@ -130,11 +126,6 @@ rest-assured test - - io.fabric8 - kubernetes-model - test - org.eclipse.che.core che-core-api-account @@ -155,11 +146,6 @@ che-core-sql-schema test - - org.eclipse.che.infrastructure - infrastructure-kubernetes - test - org.eclipse.persistence org.eclipse.persistence.core diff --git a/wsmaster/che-core-api-workspace-activity/pom.xml b/wsmaster/che-core-api-workspace-activity/pom.xml index c82751cdd24..740bc1b1cec 100644 --- a/wsmaster/che-core-api-workspace-activity/pom.xml +++ b/wsmaster/che-core-api-workspace-activity/pom.xml @@ -21,7 +21,7 @@ che-core-api-workspace-activity jar - Che Core :: Workspace Activity + Che Core :: API :: Workspace Activity tracking com.google.guava @@ -87,16 +87,6 @@ org.slf4j slf4j-api - - org.eclipse.che.multiuser - che-multiuser-api-permission - provided - - - org.eclipse.che.multiuser - che-multiuser-permission-workspace - provided - ch.qos.logback logback-classic diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index fc77c07e21c..d11d7c06b6e 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -22,7 +22,7 @@ che-master-parent pom - Che Master Parent + Che Core :: API :: Che Master Parent che-core-api-installer-shared che-core-api-auth-shared @@ -42,7 +42,6 @@ che-core-api-ssh-shared wsmaster-local che-core-sql-schema - integration-tests che-core-api-system che-core-api-system-shared che-core-api-logger-shared