fix pom

Change-Id: I159f5de10d16d018d63c020115a5231716826c99
Issue-ID: SDC-777
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 9cc5898..a1af441 100644 (file)
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -48,6 +48,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>compile</scope>
                </dependency>
 

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index f4918fd..d8603d1 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -517,6 +517,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
                <!-- testing end -->

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 73194b6..fe0cef7 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -553,12 +553,14 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.assertj</groupId>
                        <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 3c970d5..af4f76c 100644 (file)
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -118,6 +118,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index b51ebd3..cc3be33 100644 (file)
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -294,6 +294,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index e8c0c23..8b0786f 100644 (file)
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -178,6 +178,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 3373bf6..3057765 100644 (file)
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -181,6 +181,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/pom.xml b/pom.xml
index 25d58ca..26e44db 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -130,22 +130,6 @@
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
        </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.assertj</groupId>
-                               <artifactId>assertj-core</artifactId>
-                               <version>${assertj.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.mockito</groupId>
-                               <artifactId>mockito-core</artifactId>
-                               <version>${mockito.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <reporting>
                <plugins>
                        <plugin>
@@ -365,27 +349,6 @@
                        </properties>
                </profile>
 
-               <profile>
-                       <id>catalog-be</id>
-                       <activation>
-                               <activeByDefault>false</activeByDefault>
-                       </activation>
-                       <modules>
-                               <module>security-utils</module>
-                               <module>common-app-api</module>
-                               <module>common-be</module>
-                               <module>catalog-dao</module>
-                               <module>catalog-model</module>
-                               <module>catalog-be</module>
-                       </modules>
-                       <properties>
-                               <ecomp.version>1.2.7</ecomp.version>
-                               <artifact-generator-api.version>1710.0.0</artifact-generator-api.version>
-                               <artifact-generator-core.version>1710.0.0</artifact-generator-core.version>
-                               <dox-common-lib.version>1710.0.0</dox-common-lib.version>
-                               <sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.version>
-                       </properties>
-               </profile>
                <profile>
                        <id>onboarding</id>
                        <activation>

diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index e5eb6ac..59dc3fd 100644 (file)
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -47,6 +47,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>