fix: add activiti-cloud-api-dependencies-tests module

AlfrescoArchive · Nov 27, 2018 · 86f2944 · 86f2944
1 parent cca662d
commit 86f2944
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 56 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -6,6 +6,7 @@ pull_request_rules:
       - status-success=continuous-integration/travis-ci/pr
       - status-success=continuous-integration/travis-ci/push
       - status-success=license/cla
+      - label!=do-not-merge        
     actions:
       delete_head_branch: {}
       merge:

diff --git a/.updatebot.yml b/.updatebot.yml
@@ -4,8 +4,10 @@ github:
     repositories:
     - name: activiti-cloud-service-common
       branch: develop
+      useSinglePullRequest: true
     - name: activiti-cloud-acceptance-tests
       branch: develop
+      useSinglePullRequest: true
     - name: activiti-cloud-dependencies
       branch: develop
       useSinglePullRequest: true
diff --git a/activiti-cloud-api-dependencies/pom.xml b/activiti-cloud-api-dependencies/pom.xml
@@ -28,6 +28,20 @@
   <name>Activiti Cloud :: API Dependencies BOM (Bill Of Materials)</name>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.activiti.cloud.build</groupId>
+        <artifactId>activiti-cloud-dependencies-parent</artifactId>
+        <version>${activiti-cloud-build.version}</version>
+        <scope>import</scope>
+        <type>pom</type>       
+      </dependency>
+      <dependency>
+        <groupId>org.activiti.api</groupId>
+        <artifactId>activiti-api-dependencies</artifactId>
+        <version>${activiti-api.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>      
       <dependency>
         <groupId>org.activiti.cloud.api</groupId>
         <artifactId>activiti-cloud-api-model-shared</artifactId>

diff --git a/activiti-cloud-api-model-shared-impl/pom.xml b/activiti-cloud-api-model-shared-impl/pom.xml
@@ -4,8 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-model-shared-impl</artifactId>
   <name>Activiti Cloud API :: Model Shared Implementation</name>

diff --git a/activiti-cloud-api-model-shared/pom.xml b/activiti-cloud-api-model-shared/pom.xml
@@ -4,8 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-model-shared</artifactId>
   <name>Activiti Cloud API :: Model Shared</name>

diff --git a/activiti-cloud-api-process-model-impl/pom.xml b/activiti-cloud-api-process-model-impl/pom.xml
@@ -20,8 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-process-model-impl</artifactId>
   <name>Activiti Cloud API :: Process Model Implementation</name>

diff --git a/activiti-cloud-api-process-model/pom.xml b/activiti-cloud-api-process-model/pom.xml
@@ -20,8 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-process-model</artifactId>
   <name>Activiti Cloud API :: Process Model</name>

diff --git a/activiti-cloud-api-task-model-impl/pom.xml b/activiti-cloud-api-task-model-impl/pom.xml
@@ -5,8 +5,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-task-model-impl</artifactId>
   <name>Activiti Cloud API :: Task Model Implementation</name>

diff --git a/activiti-cloud-api-task-model/pom.xml b/activiti-cloud-api-task-model/pom.xml
@@ -20,8 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.activiti.cloud.api</groupId>
-    <artifactId>activiti-cloud-api</artifactId>
+    <artifactId>activiti-cloud-api-dependencies</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <relativePath>../activiti-cloud-api-dependencies</relativePath>
   </parent>
   <artifactId>activiti-cloud-api-task-model</artifactId>
   <name>Activiti Cloud API :: Task Model</name>

diff --git a/dependencies-tests/pom.xml b/dependencies-tests/pom.xml
@@ -0,0 +1,53 @@
+<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>
+    <groupId>org.activiti.cloud.api</groupId>
+    <artifactId>activiti-cloud-api</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>activiti-cloud-api-dependencies-tests</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Activiti Cloud API :: Dependencies BOM (Bill Of Materials) Tests</name>
+
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <enforceFail>true</enforceFail>    
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M2</version>
+        <executions>
+          <execution>
+            <id>enforce-dependency-convergence</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <fail>${enforceFail}</fail>
+              <rules>
+                <reactorModuleConvergence>
+                  <message>The reactor is not valid</message>
+                  <ignoreModuleDependencies>false</ignoreModuleDependencies>
+                </reactorModuleConvergence>              
+                <dependencyConvergence/>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <!-- disable parent execution which fails here -->
+            <id>enforce-plugin-versions</id>
+            <configuration>
+              <fail>false</fail>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
@@ -21,57 +21,8 @@
     <activiti-api.version>7.0.55</activiti-api.version>
   </properties>
 
-  <dependencyManagement>
-    <!-- This duplicates activiti-cloud-api-dependencies module but we can't import that module here as this is its parent
-         and we want to keep a standard Maven structure -->
-    <dependencies>
-      <dependency>
-        <groupId>org.activiti.cloud.build</groupId>
-        <artifactId>activiti-cloud-dependencies-parent</artifactId>
-        <version>${activiti-cloud-build.version}</version>
-        <scope>import</scope>
-        <type>pom</type>       
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.api</groupId>
-        <artifactId>activiti-api-dependencies</artifactId>
-        <version>${activiti-api.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-model-shared</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-model-shared-impl</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-process-model</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-task-model</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-process-model-impl</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.activiti.cloud.api</groupId>
-        <artifactId>activiti-cloud-api-task-model-impl</artifactId>
-        <version>${activiti-cloud-api.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <modules>
+    <module>dependencies-tests</module>
     <module>activiti-cloud-api-dependencies</module>
     <module>activiti-cloud-api-model-shared</module>
     <module>activiti-cloud-api-model-shared-impl</module>
@@ -80,6 +31,7 @@
     <module>activiti-cloud-api-task-model</module>
     <module>activiti-cloud-api-task-model-impl</module>
   </modules>
+
   <repositories>
     <repository>
       <id>alfresco</id>
@@ -91,12 +43,31 @@
     </repository>
   </repositories>
 
+  <!-- BoMs markers for dependency convergence tests -->
+  <dependencies>
+    <dependency>
+      <groupId>org.activiti.cloud.build</groupId>
+      <artifactId>activiti-cloud-parent</artifactId>
+      <version>${activiti-cloud-build.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti.api</groupId>
+      <artifactId>activiti-api-dependencies</artifactId>
+      <version>${activiti-api.version}</version>
+      <type>pom</type>
+    </dependency>      
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.8.2</version>
+        <configuration>
+          <deployAtEnd>true</deployAtEnd>
+        </configuration>
       </plugin>
     </plugins>
   </build>