diff --git a/.mergify.yml b/.mergify.yml
index e2db394..9d1cfd8 100644
--- 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
index 82920dd..ec1c76c 100644
--- 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
index 0867d0f..5cbfda2 100755
--- a/activiti-cloud-api-dependencies/pom.xml
+++ b/activiti-cloud-api-dependencies/pom.xml
@@ -28,6 +28,20 @@
Activiti Cloud :: API Dependencies BOM (Bill Of Materials)
+
+ org.activiti.cloud.build
+ activiti-cloud-dependencies-parent
+ ${activiti-cloud-build.version}
+ import
+ pom
+
+
+ org.activiti.api
+ activiti-api-dependencies
+ ${activiti-api.version}
+ import
+ pom
+
org.activiti.cloud.api
activiti-cloud-api-model-shared
diff --git a/activiti-cloud-api-model-shared-impl/pom.xml b/activiti-cloud-api-model-shared-impl/pom.xml
index 15a14d5..dcef4b5 100644
--- a/activiti-cloud-api-model-shared-impl/pom.xml
+++ b/activiti-cloud-api-model-shared-impl/pom.xml
@@ -4,8 +4,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-model-shared-impl
Activiti Cloud API :: Model Shared Implementation
diff --git a/activiti-cloud-api-model-shared/pom.xml b/activiti-cloud-api-model-shared/pom.xml
index 160d0f8..6bef42a 100644
--- a/activiti-cloud-api-model-shared/pom.xml
+++ b/activiti-cloud-api-model-shared/pom.xml
@@ -4,8 +4,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-model-shared
Activiti Cloud API :: Model Shared
diff --git a/activiti-cloud-api-process-model-impl/pom.xml b/activiti-cloud-api-process-model-impl/pom.xml
index 2d006d3..6f46fdc 100644
--- a/activiti-cloud-api-process-model-impl/pom.xml
+++ b/activiti-cloud-api-process-model-impl/pom.xml
@@ -20,8 +20,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-process-model-impl
Activiti Cloud API :: Process Model Implementation
diff --git a/activiti-cloud-api-process-model/pom.xml b/activiti-cloud-api-process-model/pom.xml
index 92427b4..8177668 100644
--- a/activiti-cloud-api-process-model/pom.xml
+++ b/activiti-cloud-api-process-model/pom.xml
@@ -20,8 +20,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-process-model
Activiti Cloud API :: Process Model
diff --git a/activiti-cloud-api-task-model-impl/pom.xml b/activiti-cloud-api-task-model-impl/pom.xml
index 958b918..4b57c2d 100644
--- a/activiti-cloud-api-task-model-impl/pom.xml
+++ b/activiti-cloud-api-task-model-impl/pom.xml
@@ -5,8 +5,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-task-model-impl
Activiti Cloud API :: Task Model Implementation
diff --git a/activiti-cloud-api-task-model/pom.xml b/activiti-cloud-api-task-model/pom.xml
index 6e28324..35920cd 100644
--- a/activiti-cloud-api-task-model/pom.xml
+++ b/activiti-cloud-api-task-model/pom.xml
@@ -20,8 +20,9 @@
4.0.0
org.activiti.cloud.api
- activiti-cloud-api
+ activiti-cloud-api-dependencies
7.0.0-SNAPSHOT
+ ../activiti-cloud-api-dependencies
activiti-cloud-api-task-model
Activiti Cloud API :: Task Model
diff --git a/dependencies-tests/pom.xml b/dependencies-tests/pom.xml
new file mode 100644
index 0000000..98d8540
--- /dev/null
+++ b/dependencies-tests/pom.xml
@@ -0,0 +1,53 @@
+
+ 4.0.0
+
+ org.activiti.cloud.api
+ activiti-cloud-api
+ 7.0.0-SNAPSHOT
+
+ activiti-cloud-api-dependencies-tests
+ pom
+
+ Activiti Cloud API :: Dependencies BOM (Bill Of Materials) Tests
+
+
+ true
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 3.0.0-M2
+
+
+ enforce-dependency-convergence
+
+ enforce
+
+
+ ${enforceFail}
+
+
+ The reactor is not valid
+ false
+
+
+
+
+
+
+
+ enforce-plugin-versions
+
+ false
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8eb58c5..f5666a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,57 +21,8 @@
7.0.55
-
-
-
-
- org.activiti.cloud.build
- activiti-cloud-dependencies-parent
- ${activiti-cloud-build.version}
- import
- pom
-
-
- org.activiti.api
- activiti-api-dependencies
- ${activiti-api.version}
- import
- pom
-
-
- org.activiti.cloud.api
- activiti-cloud-api-model-shared
- ${activiti-cloud-api.version}
-
-
- org.activiti.cloud.api
- activiti-cloud-api-model-shared-impl
- ${activiti-cloud-api.version}
-
-
- org.activiti.cloud.api
- activiti-cloud-api-process-model
- ${activiti-cloud-api.version}
-
-
- org.activiti.cloud.api
- activiti-cloud-api-task-model
- ${activiti-cloud-api.version}
-
-
- org.activiti.cloud.api
- activiti-cloud-api-process-model-impl
- ${activiti-cloud-api.version}
-
-
- org.activiti.cloud.api
- activiti-cloud-api-task-model-impl
- ${activiti-cloud-api.version}
-
-
-
+ dependencies-tests
activiti-cloud-api-dependencies
activiti-cloud-api-model-shared
activiti-cloud-api-model-shared-impl
@@ -80,6 +31,7 @@
activiti-cloud-api-task-model
activiti-cloud-api-task-model-impl
+
alfresco
@@ -91,12 +43,31 @@
+
+
+
+ org.activiti.cloud.build
+ activiti-cloud-parent
+ ${activiti-cloud-build.version}
+ pom
+
+
+ org.activiti.api
+ activiti-api-dependencies
+ ${activiti-api.version}
+ pom
+
+
+
org.apache.maven.plugins
maven-deploy-plugin
2.8.2
+
+ true
+