From decd2dff3b5b8aff53be52c825e45186d5c16e99 Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Mon, 23 Jul 2018 19:07:37 +0300
Subject: 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>
---
 .../onap-sdc-artifact-generator-test/pom.xml       | 103 ++++++++++-----------
 1 file changed, 51 insertions(+), 52 deletions(-)

(limited to 'common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test')

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 1b33108237..7ac9596931 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
@@ -1,61 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
-	<artifactId>onap-sdc-artifact-generator-test</artifactId>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<artifactId>onap-common-lib</artifactId>
-		<groupId>org.onap.sdc.common</groupId>
-		<version>1.3.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
+    <artifactId>onap-sdc-artifact-generator-test</artifactId>
 
-	<build>
-		<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>
-		</plugins>
-	</build>
+    <parent>
+        <artifactId>onap-common-lib</artifactId>
+        <groupId>org.onap.sdc.common</groupId>
+        <version>1.3.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
 
+    <build>
+        <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>
+        </plugins>
+    </build>
 
-	<dependencies>
-		<dependency>
-			<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>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </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>
-- 
cgit 1.2.3-korg