aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
authorvempo <vitaliy.emporopulo@amdocs.com>2018-07-23 19:07:37 +0300
committerOren Kleks <orenkle@amdocs.com>2018-08-02 05:31:27 +0000
commitdecd2dff3b5b8aff53be52c825e45186d5c16e99 (patch)
treec3f4e458780e8c3bf9b3349fcb4249d83495b575 /openecomp-be
parentc3fd2d7cdd80d40c8485a29125f0f3d335aad480 (diff)
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>
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml13
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml (renamed from openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback.xml)0
-rw-r--r--openecomp-be/lib/openecomp-common-lib/pom.xml15
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml11
-rw-r--r--openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml)0
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback.xml)0
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml (renamed from openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback.xml)0
-rw-r--r--openecomp-be/pom.xml107
11 files changed, 61 insertions, 112 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..278f2ac6ec
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="warn">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration> \ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml
index c1932e31e8..c1932e31e8 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback.xml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml
diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml
index 87f0482b80..28d81cbed7 100644
--- a/openecomp-be/lib/openecomp-common-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-common-lib/pom.xml
@@ -1,5 +1,6 @@
<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>
<groupId>org.openecomp.sdc.core</groupId>
@@ -27,28 +28,34 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1-m05</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.amdocs.zusammen</groupId>
<artifactId>zusammen-datatypes</artifactId>
<version>${zusammen.version}</version>
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
index 751b3a9be0..092338fb2d 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
@@ -2,14 +2,13 @@
<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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-item-permissions-lib</artifactId>
<version>1.3.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
<artifactId>openecomp-item-permissions-core</artifactId>
@@ -19,7 +18,11 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -50,14 +53,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- <version>${testng.version}</version>
</dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
index 4eb91f40ec..9ae7232901 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
@@ -2,9 +2,9 @@
<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>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-action-api</artifactId>
<parent>
@@ -38,7 +38,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml
index 03ce9d1243..03ce9d1243 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml
index 31672ca4d9..31672ca4d9 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback.xml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml
index b30857620a..a960e67898 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml
@@ -26,11 +26,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <!--
- Use latest version for proper testing of context propagation.
- Will not affect the application because the scope is "provided".
- -->
- <version>1.2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml
index d39c5c5cb7..b93d9566c7 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -56,17 +55,20 @@
<version>${http.core.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
- <version>3.4.0</version>
- <scope>test</scope>
+ <groupId>com.datastax.cassandra</groupId>
+ <artifactId>cassandra-driver-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml
index 03ce9d1243..03ce9d1243 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback.xml
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.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>