diff options
| author |   Michael Lando <ml636r@att.com> | 2017-12-25 20:07:37 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-12-25 19:06:44 +0000 |
| commit | ce868e6a5ffd8b2e70799b6cd69e1cfce9887a61 (patch) | |
| tree | 7f3c3bc584dd61445d764bc818da0b803822fad9 | |
| parent | 7b9ef5920d732106337338e65dd92feda1d05731 (diff) | |
fix pom
Change-Id: I159f5de10d16d018d63c020115a5231716826c99
Issue-ID: SDC-777
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | asdc-tests/pom.xml | 1 | ||||
| -rw-r--r-- | asdctool/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 2 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 1 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 37 | ||||
| -rw-r--r-- | test-apis-ci/pom.xml | 1 |
9 files changed, 9 insertions, 37 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 9cc5898fcc..a1af441320 100644 --- 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 f4918fd954..d8603d189d 100644 --- 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 73194b66d3..fe0cef7827 100644 --- 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 3c970d5fe7..af4f76c4de 100644 --- 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 b51ebd3087..cc3be33ea3 100644 --- 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 e8c0c2378e..8b0786f71d 100644 --- 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 3373bf610f..30577653ff 100644 --- 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> @@ -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> @@ -366,27 +350,6 @@ </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> <activeByDefault>false</activeByDefault> diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index e5eb6ace5e..59dc3fd433 100644 --- 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> |