Removed forced dependencies in common
Moved dependencies from "dependencies" to "dependencyManagement"
so that they aren't inherited unconditionally to child modules.
Organized and cleaned up dependencies, aligned versions.
Change-Id: I27c7792135ec5b7b2b5b49527bc0ac0d09b024b1
Issue-ID: SDC-1065
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
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 700513e..77e645e 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
@@ -1,49 +1,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <name>onap-configuration-management-test</name>
- <artifactId>onap-configuration-management-test</artifactId>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>onap-common-configuration-management</artifactId>
- <groupId>org.onap.sdc.common</groupId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <name>onap-configuration-management-test</name>
+ <artifactId>onap-configuration-management-test</artifactId>
- <dependencies>
- <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>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <parent>
+ <artifactId>onap-common-configuration-management</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn.surefire.version}</version>
- <configuration>
- <skipTests>true</skipTests>
- <systemPropertyVariables>
- <config.location>${project.basedir}/src/test/resources</config.location>
- <node.config.location>${user.home}/TestResources</node.config.location>
- </systemPropertyVariables>
- <includes>
- <include>**/TestCMSuite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <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>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${mvn.surefire.version}</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ <systemPropertyVariables>
+ <config.location>${project.basedir}/src/test/resources</config.location>
+ <node.config.location>${user.home}/TestResources</node.config.location>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/TestCMSuite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>