fixed missing transitive dependencies for Activiti/Activiti#1790

AlfrescoArchive · Mar 9, 2018 · d9dd4ff · d9dd4ff
1 parent 878f21d
commit d9dd4ff
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
 
 # Enable integration tests
 script:
-  - mvn verify -B
+  - mvn verify -B -Pdependency-check
 
 # Send coverage data
 after_success:

diff --git a/activiti-cloud-services-runtime-bundle/activiti-cloud-services-connectors/pom.xml b/activiti-cloud-services-runtime-bundle/activiti-cloud-services-connectors/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-services-connectors</artifactId>
   <name>Activiti Cloud Services :: Connectors</name>
+  <properties>
+    <suppressionFile>${basedir}/../../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti.cloud</groupId>
@@ -42,6 +45,26 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.activiti.cloud</groupId>
+      <artifactId>activiti-cloud-services-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-bpmn-model</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/activiti-cloud-services-runtime-bundle/activiti-cloud-services-core/pom.xml b/activiti-cloud-services-runtime-bundle/activiti-cloud-services-core/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-services-core</artifactId>
   <name>Activiti Cloud Services :: Core</name>
+  <properties>
+    <suppressionFile>${basedir}/../../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti.cloud</groupId>
@@ -62,32 +65,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.hateoas</groupId>
-      <artifactId>spring-hateoas</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-stream</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/activiti-cloud-services-runtime-bundle/activiti-cloud-services-events/pom.xml b/activiti-cloud-services-runtime-bundle/activiti-cloud-services-events/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-services-events</artifactId>
   <name>Activiti Cloud Services :: Events</name>
+  <properties>
+    <suppressionFile>${basedir}/../../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti.cloud</groupId>

diff --git a/activiti-cloud-services-runtime-bundle/activiti-cloud-services-rest-impl/pom.xml b/activiti-cloud-services-runtime-bundle/activiti-cloud-services-rest-impl/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-services-rest-impl</artifactId>
   <name>Activiti Cloud Services :: REST Impl</name>
+  <properties>
+    <suppressionFile>${basedir}/../../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti.cloud</groupId>
@@ -34,6 +37,10 @@
       <groupId>org.activiti</groupId>
       <artifactId>activiti-engine</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-bpmn-model</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.activiti</groupId>
       <artifactId>activiti-json-converter</artifactId>
@@ -58,6 +65,10 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
@@ -76,6 +87,16 @@
       <artifactId>spring-restdocs-mockmvc</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/activiti-cloud-starter-configure/pom.xml b/activiti-cloud-starter-configure/pom.xml
@@ -10,11 +10,14 @@
   <artifactId>activiti-cloud-starter-configure</artifactId>
   <name>Activiti Cloud Starter :: Runtime Bundle Configure</name>
   <dependencies>
-    <!-- common -->
     <dependency>
       <groupId>org.activiti</groupId>
       <artifactId>activiti-spring</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-engine</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -64,7 +67,6 @@
       <artifactId>groovy</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- boot -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
@@ -89,7 +91,6 @@
       <artifactId>spring-boot-starter-security</artifactId>
       <optional>true</optional>
     </dependency>
-    <!-- embedded DB for testing -->
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

diff --git a/activiti-cloud-starter-runtime-bundle/pom.xml b/activiti-cloud-starter-runtime-bundle/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-starter-runtime-bundle</artifactId>
   <name>Activiti Cloud Starter :: Runtime Bundle</name>
+  <properties>
+    <suppressionFile>${basedir}/../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti</groupId>

diff --git a/activiti-cloud-starter-test/pom.xml b/activiti-cloud-starter-test/pom.xml
@@ -9,6 +9,9 @@
   </parent>
   <artifactId>activiti-cloud-starter-test</artifactId>
   <name>Activiti Cloud Starter :: Test</name>
+  <properties>
+    <suppressionFile>${basedir}/../dependency-check-suppression.xml</suppressionFile>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.activiti.cloud</groupId>

diff --git a/dependency-check-suppression.xml b/dependency-check-suppression.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.1.xsd">
+  <suppress>
+    <notes><![CDATA[
+   false positive on file name: spring-tuple-1.0.0.RELEASE.jar
+   ]]></notes>
+    <gav regex="true">^org\.springframework:spring-tuple:.*$</gav>
+    <cve>CVE-2011-2730</cve>
+  </suppress>
+  <suppress>
+    <notes><![CDATA[
+   false positive file name: jersey-apache-client4-1.19.1.jar
+   ]]></notes>
+    <gav regex="true">^com\.sun\.jersey\.contribs:jersey-apache-client4:.*$</gav>
+    <cve>CVE-2006-0550</cve>
+  </suppress>
+</suppressions>