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>
---
 openecomp-be/pom.xml | 107 ++++++++-------------------------------------------
 1 file changed, 17 insertions(+), 90 deletions(-)

(limited to 'openecomp-be/pom.xml')

diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index 492d0e0a28..e93576a803 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>openecomp-sdc</name>
-    <groupId>org.openecomp.sdc</groupId>
     <artifactId>openecomp-sdc</artifactId>
     <packaging>pom</packaging>
 
@@ -13,23 +12,15 @@
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-onboarding</artifactId>
         <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../onboarding</relativePath>
+        <relativePath>../onboarding/pom.xml</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <!-- Feature Toggle support libraries-->
         <dependency>
             <groupId>org.togglz</groupId>
             <artifactId>togglz-core</artifactId>
             <version>${togglz.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.togglz</groupId>
             <artifactId>togglz-testing</artifactId>
@@ -120,7 +111,8 @@
                     <generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation>
                     <buildState>
                         <project>${project}</project>
-                        <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat</compileStateFilePath>
+                        <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat
+                        </compileStateFilePath>
                     </buildState>
                 </configuration>
             </plugin>
@@ -194,10 +186,15 @@
                     <pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation>
                     <pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile>
                     <persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates>
-                    <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat</pmdCurrentStateFilePath>
+                    <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat
+                    </pmdCurrentStateFilePath>
                     <pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile>
-                    <compiledFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</compiledFilesList>
-                    <compiledTestFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst</compiledTestFilesList>
+                    <compiledFilesList>
+                        ${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+                    </compiledFilesList>
+                    <compiledTestFilesList>
+                        ${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+                    </compiledTestFilesList>
                 </configuration>
             </plugin>
             <plugin>
@@ -219,9 +216,12 @@
                 <version>${mvn.license.version}</version>
                 <configuration>
                     <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
+                    <processStartTag>============LICENSE_START=======================================================
+                    </processStartTag>
+                    <processEndTag>============LICENSE_END=========================================================
+                    </processEndTag>
+                    <sectionDelimiter>================================================================================
+                    </sectionDelimiter>
                     <licenseName>apache_v2</licenseName>
                     <inceptionYear>2017</inceptionYear>
                     <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
@@ -288,72 +288,6 @@
         </plugins>
     </build>
 
-    <!--Added to resolve blackduck operational risks for indirect dependencies referred -->
-    <dependencyManagement>
-        <dependencies>
-            <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>${commons.beanutils.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.beust/jcommander -->
-            <dependency>
-                <groupId>com.beust</groupId>
-                <artifactId>jcommander</artifactId>
-                <version>${jcommander.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient -->
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpasyncclient</artifactId>
-                <version>${httpasyncclient.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.beanshell/bsh -->
-            <dependency>
-                <groupId>org.beanshell</groupId>
-                <artifactId>bsh</artifactId>
-                <version>${bsh.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/commons-digester/commons-digester -->
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>${commons.digester.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.fasterxml/classmate -->
-            <dependency>
-                <groupId>com.fasterxml</groupId>
-                <artifactId>classmate</artifactId>
-                <version>${classmate.version}</version>
-            </dependency>
-            <!--1702 -->
-            <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${groovy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.janino</groupId>
-                <artifactId>janino</artifactId>
-                <version>${janino.version}</version>
-                <scope>provided</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <modules>
         <module>/api</module>
         <module>/lib</module>
@@ -362,13 +296,6 @@
         <module>/backend</module>
     </modules>
     <profiles>
-        <!--<profile>-->
-        <!--<id>docker-staging</id>-->
-        <!--<properties>-->
-        <!--<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>-->
-        <!--<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>-->
-        <!--</properties>-->
-        <!--</profile>-->
 
         <profile>
             <id>docker</id>
-- 
cgit 1.2.3-korg