diff options
| -rw-r--r-- | asdctool/pom.xml | 9 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 3 | ||||
| -rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java | 4 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 5 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 3 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | test-apis-ci/pom.xml | 1 | ||||
| -rw-r--r-- | ui-ci/pom.xml | 1 |
9 files changed, 18 insertions, 19 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 0ccf87098d..9a0a546d17 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -208,8 +208,7 @@ <!-- groovy --> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> + <artifactId>groovy</artifactId> <scope>compile</scope> </dependency> @@ -509,12 +508,6 @@ <scope>test</scope> </dependency> <!-- testing end --> - - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <version>2.4.8</version> - </dependency> </dependencies> <build> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index b4f59368c3..bfa8e10991 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -282,8 +282,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> + <artifactId>groovy</artifactId> <scope>compile</scope> </dependency> diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java index 04b62dd941..85e4cb2e5b 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java @@ -19,9 +19,9 @@ import org.openecomp.sdc.exception.ResponseFormat; import java.util.Set; -import static groovy.util.GroovyTestCase.assertEquals; -import static junit.framework.Assert.assertNotNull; import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.when; diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index a4bd9a0036..7f02fe65e1 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -249,6 +249,10 @@ Modifications copyright (c) 2018 Nokia <artifactId>commons-collections</artifactId> <groupId>commons-collections</groupId> </exclusion> + <exclusion> + <artifactId>groovy</artifactId> + <groupId>org.codehaus.groovy</groupId> + </exclusion> </exclusions> </dependency> @@ -315,7 +319,6 @@ Modifications copyright (c) 2018 Nokia <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>2.4.8</version> </dependency> </dependencies> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 3322185eab..d0ede07f22 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -43,8 +43,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> + <artifactId>groovy</artifactId> <scope>compile</scope> </dependency> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 58c4f4fa70..ddb5454ac1 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -118,6 +118,10 @@ <artifactId>commons-collections</artifactId> <groupId>commons-collections</groupId> </exclusion> + <exclusion> + <artifactId>groovy</artifactId> + <groupId>org.codehaus.groovy</groupId> + </exclusion> </exclusions> </dependency> @@ -254,7 +258,6 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>2.4.8</version> </dependency> </dependencies> @@ -68,7 +68,6 @@ Modifications copyright (c) 2018 Nokia <slf4j-api.version>1.7.25</slf4j-api.version> <commons-codec>1.10</commons-codec> <commons-logging>1.2</commons-logging> - <groovy.version>2.4.13</groovy.version> <janino.version>3.0.6</janino.version> <!-- aspects --> @@ -185,6 +184,11 @@ Modifications copyright (c) 2018 Nokia <artifactId>commons-lang3</artifactId> <version>${lang3.version}</version> </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>2.4.13</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 2918c62962..e6a6e263a8 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -381,7 +381,6 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>2.4.8</version> </dependency> </dependencies> diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index e20fe644be..c1ea1396af 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -255,7 +255,6 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>2.4.8</version> </dependency> </dependencies> |