Rebalancing maven module execution order (eclipse-che#16497)

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
xiaochen2050 · May 6, 2020 · 93ba5ef · 93ba5ef
1 parent b880e30
commit 93ba5ef
Show file tree

Hide file tree

Showing 49 changed files with 84 additions and 111 deletions.
diff --git a/assembly/assembly-che-tomcat8/pom.xml b/assembly/assembly-che-tomcat8/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-che-tomcat8</artifactId>
     <packaging>jar</packaging>
-    <name>Che IDE :: Assemblies Che Tomcat8</name>
+    <name>Che Assembly :: Assemblies Che Tomcat8</name>
     <build>
         <finalName>assembly-che-tomcat8</finalName>
         <plugins>

diff --git a/assembly/assembly-dashboard-war/pom.xml b/assembly/assembly-dashboard-war/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-dashboard-war</artifactId>
     <packaging>war</packaging>
-    <name>Che IDE :: Dashboard Packaging</name>
+    <name>Che Assembly :: Dashboard war</name>
     <description>Packages Dashboard application as a Java web app</description>
     <inceptionYear>2018</inceptionYear>
     <dependencies>

diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-main</artifactId>
     <packaging>pom</packaging>
-    <name>Che IDE :: Assemblies Tomcat</name>
+    <name>Che Assembly :: Assemblies Che Server Tomcat</name>
     <dependencies>
         <dependency>
             <groupId>org.eclipse.che</groupId>

diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-root-war</artifactId>
     <packaging>war</packaging>
-    <name>Che IDE :: War Packaging</name>
+    <name>Che Assembly :: Root war</name>
     <description>Packages Che root web app</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-logback</artifactId>
+            <artifactId>che-core-logback</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>che-core-api-core</artifactId>
@@ -105,7 +105,7 @@
                                 <dep>net.logstash.logback:logstash-logback-encoder</dep>
                                 <dep>ch.qos.logback:logback-classic</dep>
                                 <dep>org.eclipse.che.core:che-core-commons-j2ee</dep>
-                                <dep>org.eclipse.che.core:che-core-commons-logback</dep>
+                                <dep>org.eclipse.che.core:che-core-logback</dep>
                             </ignoredUnusedDeclaredDependencies>
                         </configuration>
                     </execution>

diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-swagger-war</artifactId>
     <packaging>war</packaging>
-    <name>Che IDE :: Assemblies Swagger WAR</name>
+    <name>Che Assembly :: Swagger war</name>
     <build>
         <finalName>che-swagger-ui</finalName>
         <plugins>

diff --git a/assembly/assembly-workspace-loader-war/pom.xml b/assembly/assembly-workspace-loader-war/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-workspace-loader-war</artifactId>
     <packaging>war</packaging>
-    <name>Che Workspace Loader :: War Packaging</name>
+    <name>Che Assembly :: Workspace Loader war</name>
     <description>Packages Che Workspace Loader application as a Java web app</description>
     <inceptionYear>2018</inceptionYear>
     <dependencies>

diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>assembly-wsmaster-war</artifactId>
     <packaging>war</packaging>
-    <name>Che IDE :: Compiling WS Master WAR</name>
+    <name>Che Assembly :: WS Master war</name>
     <properties>
         <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -171,10 +171,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-logback</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-mail</artifactId>
@@ -203,6 +199,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-db-vendor-postgresql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-logback</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-metrics-core</artifactId>
@@ -227,6 +227,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>wsmaster-local</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.infrastructure</groupId>
+            <artifactId>infrastructure-distributed</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.infrastructure</groupId>
             <artifactId>infrastructure-kubernetes</artifactId>
@@ -239,6 +243,10 @@
             <groupId>org.eclipse.che.infrastructure</groupId>
             <artifactId>infrastructure-openshift</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.infrastructure</groupId>
+            <artifactId>infrastructure-permission</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-authentication-commons</artifactId>
@@ -251,10 +259,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-jgroups</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-organization</artifactId>
@@ -291,10 +295,6 @@
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-permission-factory</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-permission-infra-kubernetes</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-permission-logger</artifactId>

diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>che-core-api-core</artifactId>
     <packaging>jar</packaging>
-    <name>Che Core :: API :: Core</name>
+    <name>Che Core :: Commons :: API :: Core</name>
     <properties>
         <dto-generator-out-directory>${project.build.directory}/generated-sources/dto/</dto-generator-out-directory>
         <findbugs.failonerror>false</findbugs.failonerror>
@@ -317,7 +317,6 @@
                     </plugin>
                 </plugins>
             </build>
-
         </profile>
     </profiles>
 </project>
diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>che-core-api-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>Che Core :: API :: DTO Maven Plugin</name>
+    <name>Che Core :: Commons :: API :: DTO Maven Plugin</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
     </properties>

diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>che-core-api-dto</artifactId>
     <packaging>jar</packaging>
-    <name>Che Core :: API :: DTO</name>
+    <name>Che Core :: Commons :: API :: DTO</name>
     <properties>
         <findbugs.failonerror>false</findbugs.failonerror>
         <generated.test.sources.directory>${project.build.directory}/generated-test-sources/gen</generated.test.sources.directory>

diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>che-core-api-model</artifactId>
     <packaging>jar</packaging>
-    <name>Che Core :: API :: Model</name>
+    <name>Che Core :: Commons :: API :: Model</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-h2</artifactId>
-    <name>Che Core :: DB :: Vendor H2</name>
+    <name>Che Core :: Commons :: DB :: Vendor H2</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/core/che-core-db-vendor-mysql/pom.xml b/core/che-core-db-vendor-mysql/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-mysql</artifactId>
-    <name>Che Core :: DB :: Vendor MySQL</name>
+    <name>Che Core :: Commons :: DB :: Vendor MySQL</name>
     <dependencies>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>

diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-postgresql</artifactId>
-    <name>Che Core :: DB :: Vendor PostgreSQL</name>
+    <name>Che Core :: Commons :: DB :: Vendor PostgreSQL</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db</artifactId>
-    <name>Che Core :: DB</name>
+    <name>Che Core :: Commons :: DB</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/.../commons/che-core-commons-logback/pom.xml → core/che-core-logback/pom.xml b/.../commons/che-core-commons-logback/pom.xml → core/che-core-logback/pom.xml
@@ -15,13 +15,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>che-core-commons-parent</artifactId>
+        <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
         <version>7.13.0-SNAPSHOT</version>
     </parent>
-    <artifactId>che-core-commons-logback</artifactId>
+    <artifactId>che-core-logback</artifactId>
     <packaging>jar</packaging>
-    <name>Che Core :: Commons :: Commons Logback</name>
+    <name>Che Core :: Commons :: Logback</name>
     <dependencies>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/...vironmentVariablesLogLevelPropagator.java → ...vironmentVariablesLogLevelPropagator.java b/...vironmentVariablesLogLevelPropagator.java → ...vironmentVariablesLogLevelPropagator.java
diff --git a/...ogback/filter/IdentityIdLoggerFilter.java → ...ogback/filter/IdentityIdLoggerFilter.java b/...ogback/filter/IdentityIdLoggerFilter.java → ...ogback/filter/IdentityIdLoggerFilter.java
diff --git a/...logback/filter/RequestIdLoggerFilter.java → ...logback/filter/RequestIdLoggerFilter.java b/...logback/filter/RequestIdLoggerFilter.java → ...logback/filter/RequestIdLoggerFilter.java
diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-metrics-core</artifactId>
-    <name>Che Core :: Metrics :: Core</name>
+    <name>Che Core :: Commons :: Metrics :: Core</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-core</artifactId>
-    <name>Che Core :: Tracing :: Core</name>
+    <name>Che Core :: Commons :: Tracing :: Core</name>
     <dependencies>
         <dependency>
             <groupId>aopalliance</groupId>

diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-metrics</artifactId>
-    <name>Che Core :: Tracing :: Metrics</name>
+    <name>Che Core :: Commons :: Tracing :: Metrics</name>
     <dependencies>
         <dependency>
             <groupId>com.google.inject</groupId>

diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml
@@ -20,7 +20,7 @@
         <version>7.13.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-web</artifactId>
-    <name>Che Core :: Tracing :: Web</name>
+    <name>Che Core :: Commons :: Tracing :: Web</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <artifactId>che-core-typescript-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>Che Core :: API :: TypeScript DTO maven plugin</name>
+    <name>Che Core :: Commons :: API :: TypeScript DTO maven plugin</name>
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/core/commons/pom.xml b/core/commons/pom.xml
@@ -26,7 +26,6 @@
     <modules>
         <module>che-core-commons-annotations</module>
         <module>che-core-commons-lang</module>
-        <module>che-core-commons-logback</module>
         <module>che-core-commons-inject</module>
         <module>che-core-commons-json</module>
         <module>che-core-commons-xml</module>

diff --git a/core/pom.xml b/core/pom.xml
@@ -35,6 +35,7 @@
         <module>che-core-db-vendor-h2</module>
         <module>che-core-db-vendor-mysql</module>
         <module>che-core-db-vendor-postgresql</module>
+        <module>che-core-logback</module>
         <module>che-core-tracing-core</module>
         <module>che-core-tracing-web</module>
         <module>che-core-metrics-core</module>

diff --git a/...ser/api/che-multiuser-api-jgroups/pom.xml → ...ctures/infrastructure-distributed/pom.xml b/...ser/api/che-multiuser-api-jgroups/pom.xml → ...ctures/infrastructure-distributed/pom.xml
@@ -15,13 +15,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>che-multiuser-api</artifactId>
-        <groupId>org.eclipse.che.multiuser</groupId>
+        <artifactId>che-infrastructures-parent</artifactId>
+        <groupId>org.eclipse.che.infrastructure</groupId>
         <version>7.13.0-SNAPSHOT</version>
     </parent>
-    <artifactId>che-multiuser-api-jgroups</artifactId>
+    <artifactId>infrastructure-distributed</artifactId>
     <packaging>jar</packaging>
-    <name>Che Multiuser :: JGroups API Implementation</name>
+    <name>Infrastructure :: Distributed components</name>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/...istributed/JGroupsServiceTermination.java → ...istributed/JGroupsServiceTermination.java b/...istributed/JGroupsServiceTermination.java → ...istributed/JGroupsServiceTermination.java
diff --git a/.../distributed/WorkspaceStopPropagator.java → .../distributed/WorkspaceStopPropagator.java b/.../distributed/WorkspaceStopPropagator.java → .../distributed/WorkspaceStopPropagator.java
diff --git a/...ed/cache/JGroupsWorkspaceStatusCache.java → ...ed/cache/JGroupsWorkspaceStatusCache.java b/...ed/cache/JGroupsWorkspaceStatusCache.java → ...ed/cache/JGroupsWorkspaceStatusCache.java
diff --git a/...che/ReplicatedMapNotificationAdapter.java → ...che/ReplicatedMapNotificationAdapter.java b/...che/ReplicatedMapNotificationAdapter.java → ...che/ReplicatedMapNotificationAdapter.java
diff --git a/...stributed/cache/StatusChangeListener.java → ...stributed/cache/StatusChangeListener.java b/...stributed/cache/StatusChangeListener.java → ...stributed/cache/StatusChangeListener.java
diff --git a/...ted/lock/JGroupsWorkspaceLockService.java → ...ted/lock/JGroupsWorkspaceLockService.java b/...ted/lock/JGroupsWorkspaceLockService.java → ...ted/lock/JGroupsWorkspaceLockService.java
diff --git a/...DistributedRemoteSubscriptionStorage.java → ...DistributedRemoteSubscriptionStorage.java b/...DistributedRemoteSubscriptionStorage.java → ...DistributedRemoteSubscriptionStorage.java
diff --git a/...roups/src/test/resources/logback-test.xml → ...buted/src/test/resources/logback-test.xml b/...roups/src/test/resources/logback-test.xml → ...buted/src/test/resources/logback-test.xml
diff --git a/...iuser-permission-infra-kubernetes/pom.xml → ...uctures/infrastructure-permission/pom.xml b/...iuser-permission-infra-kubernetes/pom.xml → ...uctures/infrastructure-permission/pom.xml
@@ -15,12 +15,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>che-multiuser-permission</artifactId>
-        <groupId>org.eclipse.che.multiuser</groupId>
+        <artifactId>che-infrastructures-parent</artifactId>
+        <groupId>org.eclipse.che.infrastructure</groupId>
         <version>7.13.0-SNAPSHOT</version>
     </parent>
-    <artifactId>che-multiuser-permission-infra-kubernetes</artifactId>
-    <name>Che Multiuser :: Kubernetes Infrastructure Permissions</name>
+    <artifactId>infrastructure-permission</artifactId>
+    <name>Infrastructure :: Kubernetes Permissions</name>
     <dependencies>
         <dependency>
             <groupId>javax.inject</groupId>

diff --git a/...rnetes/BrokerServicePermissionFilter.java → ...rnetes/BrokerServicePermissionFilter.java b/...rnetes/BrokerServicePermissionFilter.java → ...rnetes/BrokerServicePermissionFilter.java
diff --git a/...es/BrokerServicePermissionFilterTest.java → ...es/BrokerServicePermissionFilterTest.java b/...es/BrokerServicePermissionFilterTest.java → ...es/BrokerServicePermissionFilterTest.java
diff --git a/...netes/src/test/resources/logback-test.xml → ...ssion/src/test/resources/logback-test.xml b/...netes/src/test/resources/logback-test.xml → ...ssion/src/test/resources/logback-test.xml
diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml
@@ -18,7 +18,6 @@
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
         <version>7.13.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>infrastructure-kubernetes</artifactId>
     <name>Infrastructure :: Kubernetes</name>

diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml
@@ -18,7 +18,6 @@
         <artifactId>che-infrastructures-parent</artifactId>
         <groupId>org.eclipse.che.infrastructure</groupId>
         <version>7.13.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>infrastructure-openshift</artifactId>
     <name>Infrastructure :: OpenShift</name>

diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml
@@ -23,10 +23,12 @@
     <groupId>org.eclipse.che.infrastructure</groupId>
     <artifactId>che-infrastructures-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Che Infrastructures Parent</name>
+    <name>Infrastructure :: Infrastructures Parent</name>
     <modules>
         <module>openshift</module>
         <module>kubernetes</module>
         <module>infrastructure-metrics</module>
+        <module>infrastructure-distributed</module>
+        <module>infrastructure-permission</module>
     </modules>
 </project>
diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml
@@ -33,7 +33,6 @@
         <module>che-multiuser-api-resource</module>
         <module>che-multiuser-api-organization-shared</module>
         <module>che-multiuser-api-organization</module>
-        <module>che-multiuser-api-jgroups</module>
         <module>che-multiuser-api-workspace-activity</module>
     </modules>
 </project>
diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
@@ -116,7 +116,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-logback</artifactId>
+            <artifactId>che-core-logback</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>

diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml
@@ -32,6 +32,5 @@
         <module>che-multiuser-permission-system</module>
         <module>che-multiuser-permission-resource</module>
         <module>che-multiuser-permission-logger</module>
-        <module>che-multiuser-permission-infra-kubernetes</module>
     </modules>
 </project>