diff options
| author |   vempo <vitaliy.emporopulo@amdocs.com> | 2018-07-08 11:29:54 +0300 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-07-08 10:08:23 +0000 |
| commit | 68945ddb6e7c376ffb5696dddffbb99b33e6dbcc (patch) | |
| tree | 41db35a02018804d61c4b296af1bffff4df5d90d /common | |
| parent | f2c47232959536b878b1db64a8a5ffb63a1d7f1f (diff) | |
Specified test scope for junit/testng/mockito
In some modules junit, testng, and mockito where included
with default scope. Also, fixed the versions to reference
a property from a parent pom.
Change-Id: I2477bc631a7593c7176087c9088d2c9f2c2a34ee
Issue-ID: SDC-1065
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common')
3 files changed, 38 insertions, 81 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index a05a95ee60..ad2be72c2a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>onap-configuration-management-core</name> - <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> <parent> diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml index 36065f3e57..64ed8a84b1 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>onap-configuration-management-test</name> - <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-test</artifactId> <parent> @@ -15,55 +14,20 @@ <dependencies> <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-configuration-management-core</artifactId> - <version>${project.version}</version> - </dependency> - + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>${junit.version}</version> + <scope>test</scope> </dependency> </dependencies> <build> <plugins> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin--> - <!--<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${mvn.surefire.version}</version> - </plugin>--> - <!-- any other plugins --> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${mvn.shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.guava:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin>--> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml index 48a16a3575..e3818934f4 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml @@ -17,51 +17,45 @@ <plugins> <!-- any other plugins --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${mvn.shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.guava:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${mvn.shade.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <excludes> + <exclude>com.google.guava:*</exclude> + </excludes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>compile</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-sdc-artifact-generator-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-sdc-artifact-generator-core</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> |